diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json
index cd9abd8b0d..33c7ade795 100644
--- a/resources/profiles/OrcaFilamentLibrary.json
+++ b/resources/profiles/OrcaFilamentLibrary.json
@@ -584,6 +584,10 @@
 			"name": "Generic PE @System",
 			"sub_path": "filament/Generic PE @System.json"
 		},
+		{
+			"name": "Generic PE-CF @base",
+			"sub_path": "filament/Generic PE-CF @base.json"
+		},
 		{
 			"name": "Generic PE-CF @System",
 			"sub_path": "filament/Generic PE-CF @System.json"
@@ -672,10 +676,18 @@
 			"name": "Generic PETG @System",
 			"sub_path": "filament/Generic PETG @System.json"
 		},
+		{
+			"name": "Generic PETG HF @base",
+			"sub_path": "filament/Generic PETG HF @base.json"
+		},
 		{
 			"name": "Generic PETG HF @System",
 			"sub_path": "filament/Generic PETG HF @System.json"
 		},
+		{
+			"name": "Generic PETG-CF @base",
+			"sub_path": "filament/Generic PETG-CF @base.json"
+		},
 		{
 			"name": "Generic PETG-CF @System",
 			"sub_path": "filament/Generic PETG-CF @System.json"
@@ -864,6 +876,10 @@
 			"name": "Generic PLA High Speed @System",
 			"sub_path": "filament/Generic PLA High Speed @System.json"
 		},
+		{
+			"name": "Generic PLA Matte @base",
+			"sub_path": "filament/Generic PLA Matte @base.json"
+		},
 		{
 			"name": "Generic PLA Matte @System",
 			"sub_path": "filament/Generic PLA Matte @System.json"
@@ -1072,10 +1088,18 @@
 			"name": "Generic PP @System",
 			"sub_path": "filament/Generic PP @System.json"
 		},
+		{
+			"name": "Generic PP-CF @base",
+			"sub_path": "filament/Generic PP-CF @base.json"
+		},
 		{
 			"name": "Generic PP-CF @System",
 			"sub_path": "filament/Generic PP-CF @System.json"
 		},
+		{
+			"name": "Generic PP-GF @base",
+			"sub_path": "filament/Generic PP-GF @base.json"
+		},
 		{
 			"name": "Generic PP-GF @System",
 			"sub_path": "filament/Generic PP-GF @System.json"
@@ -1264,6 +1288,10 @@
 			"name": "Elegoo ASA @System",
 			"sub_path": "filament/Elegoo/Elegoo ASA @System.json"
 		},
+		{
+			"name": "Elegoo ASA-CF @base",
+			"sub_path": "filament/Elegoo/Elegoo ASA-CF @base.json"
+		},
 		{
 			"name": "Elegoo ASA-CF @System",
 			"sub_path": "filament/Elegoo/Elegoo ASA-CF @System.json"
@@ -1356,6 +1384,10 @@
 			"name": "Elegoo PC @System",
 			"sub_path": "filament/Elegoo/Elegoo PC @System.json"
 		},
+		{
+			"name": "Elegoo PC-FR @base",
+			"sub_path": "filament/Elegoo/Elegoo PC-FR @base.json"
+		},
 		{
 			"name": "Elegoo PC-FR @System",
 			"sub_path": "filament/Elegoo/Elegoo PC-FR @System.json"
@@ -1412,6 +1444,10 @@
 			"name": "Elas PETG Basic @System",
 			"sub_path": "filament/Elas/Elas PETG Basic @System.json"
 		},
+		{
+			"name": "Elegoo PET-CF @base",
+			"sub_path": "filament/Elegoo/Elegoo PET-CF @base.json"
+		},
 		{
 			"name": "Elegoo PET-CF @System",
 			"sub_path": "filament/Elegoo/Elegoo PET-CF @System.json"
@@ -1420,26 +1456,50 @@
 			"name": "Elegoo PETG @System",
 			"sub_path": "filament/Elegoo/Elegoo PETG @System.json"
 		},
+		{
+			"name": "Elegoo PETG HF @base",
+			"sub_path": "filament/Elegoo/Elegoo PETG HF @base.json"
+		},
 		{
 			"name": "Elegoo PETG HF @System",
 			"sub_path": "filament/Elegoo/Elegoo PETG HF @System.json"
 		},
+		{
+			"name": "Elegoo PETG PRO @base",
+			"sub_path": "filament/Elegoo/Elegoo PETG PRO @base.json"
+		},
 		{
 			"name": "Elegoo PETG PRO @System",
 			"sub_path": "filament/Elegoo/Elegoo PETG PRO @System.json"
 		},
+		{
+			"name": "Elegoo PETG Translucent @base",
+			"sub_path": "filament/Elegoo/Elegoo PETG Translucent @base.json"
+		},
 		{
 			"name": "Elegoo PETG Translucent @System",
 			"sub_path": "filament/Elegoo/Elegoo PETG Translucent @System.json"
 		},
+		{
+			"name": "Elegoo PETG-CF @base",
+			"sub_path": "filament/Elegoo/Elegoo PETG-CF @base.json"
+		},
 		{
 			"name": "Elegoo PETG-CF @System",
 			"sub_path": "filament/Elegoo/Elegoo PETG-CF @System.json"
 		},
+		{
+			"name": "Elegoo PETG-GF @base",
+			"sub_path": "filament/Elegoo/Elegoo PETG-GF @base.json"
+		},
 		{
 			"name": "Elegoo PETG-GF @System",
 			"sub_path": "filament/Elegoo/Elegoo PETG-GF @System.json"
 		},
+		{
+			"name": "Elegoo Rapid PETG @base",
+			"sub_path": "filament/Elegoo/Elegoo Rapid PETG @base.json"
+		},
 		{
 			"name": "Elegoo Rapid PETG @System",
 			"sub_path": "filament/Elegoo/Elegoo Rapid PETG @System.json"
@@ -1592,54 +1652,106 @@
 			"name": "Elegoo PLA @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA @System.json"
 		},
+		{
+			"name": "Elegoo PLA Basic @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Basic @base.json"
+		},
 		{
 			"name": "Elegoo PLA Basic @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Basic @System.json"
 		},
+		{
+			"name": "Elegoo PLA Galaxy @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Galaxy @base.json"
+		},
 		{
 			"name": "Elegoo PLA Galaxy @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Galaxy @System.json"
 		},
+		{
+			"name": "Elegoo PLA Glow @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Glow @base.json"
+		},
 		{
 			"name": "Elegoo PLA Glow @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Glow @System.json"
 		},
+		{
+			"name": "Elegoo PLA Marble @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Marble @base.json"
+		},
 		{
 			"name": "Elegoo PLA Marble @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Marble @System.json"
 		},
+		{
+			"name": "Elegoo PLA Matte @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Matte @base.json"
+		},
 		{
 			"name": "Elegoo PLA Matte @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Matte @System.json"
 		},
+		{
+			"name": "Elegoo PLA PRO @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA PRO @base.json"
+		},
 		{
 			"name": "Elegoo PLA PRO @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA PRO @System.json"
 		},
+		{
+			"name": "Elegoo PLA Silk @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Silk @base.json"
+		},
 		{
 			"name": "Elegoo PLA Silk @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Silk @System.json"
 		},
+		{
+			"name": "Elegoo PLA Sparkle @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Sparkle @base.json"
+		},
 		{
 			"name": "Elegoo PLA Sparkle @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Sparkle @System.json"
 		},
+		{
+			"name": "Elegoo PLA Translucent2 @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Translucent2 @base.json"
+		},
 		{
 			"name": "Elegoo PLA Translucent2 @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Translucent2 @System.json"
 		},
+		{
+			"name": "Elegoo PLA Wood @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA Wood @base.json"
+		},
 		{
 			"name": "Elegoo PLA Wood @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA Wood @System.json"
 		},
+		{
+			"name": "Elegoo PLA+ @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA+ @base.json"
+		},
 		{
 			"name": "Elegoo PLA+ @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA+ @System.json"
 		},
+		{
+			"name": "Elegoo PLA-CF @base",
+			"sub_path": "filament/Elegoo/Elegoo PLA-CF @base.json"
+		},
 		{
 			"name": "Elegoo PLA-CF @System",
 			"sub_path": "filament/Elegoo/Elegoo PLA-CF @System.json"
 		},
+		{
+			"name": "Elegoo Rapid PLA+ @base",
+			"sub_path": "filament/Elegoo/Elegoo Rapid PLA+ @base.json"
+		},
 		{
 			"name": "Elegoo Rapid PLA+ @System",
 			"sub_path": "filament/Elegoo/Elegoo Rapid PLA+ @System.json"
@@ -1760,6 +1872,10 @@
 			"name": "Panchroma PLA UV Shift @System",
 			"sub_path": "filament/Polymaker/Panchroma PLA UV Shift @System.json"
 		},
+		{
+			"name": "PolyLite Dual PLA @base",
+			"sub_path": "filament/Polymaker/PolyLite Dual PLA @base.json"
+		},
 		{
 			"name": "PolyLite Dual PLA @System",
 			"sub_path": "filament/Polymaker/PolyLite Dual PLA @System.json"
@@ -1904,6 +2020,10 @@
 			"name": "DREMC TPU 95A @System",
 			"sub_path": "filament/DREMC/DREMC TPU 95A @System.json"
 		},
+		{
+			"name": "Elegoo Rapid TPU 95A @base",
+			"sub_path": "filament/Elegoo/Elegoo Rapid TPU 95A @base.json"
+		},
 		{
 			"name": "Elegoo Rapid TPU 95A @System",
 			"sub_path": "filament/Elegoo/Elegoo Rapid TPU 95A @System.json"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json
index d6ca0d695b..961b8aa903 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json	
@@ -3,7 +3,7 @@
 	"name": "Elas ASA @base",
 	"inherits": "fdm_filament_asa",
 	"from": "system",
-	"filament_id": "OGFB01",
+	"filament_id": "OFT3TqB6",
 	"instantiation": "false",
 	"description": "When printing this filament, there's a risk of warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
 	"activate_air_filtration": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json
index 478210bb7d..145e0472ae 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json	
@@ -3,7 +3,7 @@
 	"name": "Elas PETG Basic @base",
 	"inherits": "fdm_filament_pet",
 	"from": "system",
-	"filament_id": "OGFG00",
+	"filament_id": "OFw4OHWE",
 	"instantiation": "false",
 	"description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.",
 	"complete_print_exhaust_fan_speed": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json
index abfa611aa3..64e0f025b8 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json	
@@ -3,7 +3,7 @@
 	"name": "Elas PLA Basic @base",
 	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "OGFA00",
+	"filament_id": "OFbgt3u3",
 	"instantiation": "false",
 	"activate_air_filtration": [
 		"0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json
index 38313d1d55..faba40142f 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json	
@@ -3,7 +3,7 @@
 	"name": "Elas PLA Pro @base",
 	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "OGFA00",
+	"filament_id": "OFrgQ1Ns",
 	"instantiation": "false",
 	"activate_air_filtration": [
 		"0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json
index 13266c87b5..13ef86c2d9 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo ASA-CF @System",
-	"inherits": "Elegoo ASA @base",
+	"inherits": "Elegoo ASA-CF @base",
 	"from": "system",
 	"setting_id": "XT1aUl4pe9t0Ijwg",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json
new file mode 100644
index 0000000000..ff15b78c5d
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo ASA-CF @base",
+	"inherits": "Elegoo ASA @base",
+	"from": "system",
+	"filament_id": "OFpwg2Qh",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json
index 1fecee514c..7d2ab85058 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PC-FR @System",
-	"inherits": "Elegoo PC @base",
+	"inherits": "Elegoo PC-FR @base",
 	"from": "system",
 	"setting_id": "JcopkaXZ7YyLjIcw",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json
new file mode 100644
index 0000000000..1f6564cbf1
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PC-FR @base",
+	"inherits": "Elegoo PC @base",
+	"from": "system",
+	"filament_id": "OF79FFkO",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json
index 0c1c4265b7..b7191e482b 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PET-CF @System",
-	"inherits": "Elegoo PETG @base",
+	"inherits": "Elegoo PET-CF @base",
 	"from": "system",
 	"setting_id": "oloKoC4Bs8dXatMU",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json
new file mode 100644
index 0000000000..9e669f1e14
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PET-CF @base",
+	"inherits": "Elegoo PETG @base",
+	"from": "system",
+	"filament_id": "OFJIImD5",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json
index 35b941684a..d912550c88 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PETG HF @System",
-	"inherits": "Elegoo PETG @base",
+	"inherits": "Elegoo PETG HF @base",
 	"from": "system",
 	"setting_id": "d6gNuzrG00SXvMth",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json
new file mode 100644
index 0000000000..2e3e74ef22
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PETG HF @base",
+	"inherits": "Elegoo PETG @base",
+	"from": "system",
+	"filament_id": "OFzrWlH5",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json
index c16448b1e4..aa30920b7c 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PETG PRO @System",
-	"inherits": "Elegoo PETG @base",
+	"inherits": "Elegoo PETG PRO @base",
 	"from": "system",
 	"setting_id": "fdfCAYQEoYa9DN6I",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json
new file mode 100644
index 0000000000..4b63edb4ed
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PETG PRO @base",
+	"inherits": "Elegoo PETG @base",
+	"from": "system",
+	"filament_id": "OF102WKM",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json
index 0346a8eef0..edb04a6dce 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PETG Translucent @System",
-	"inherits": "Elegoo PETG @base",
+	"inherits": "Elegoo PETG Translucent @base",
 	"from": "system",
 	"setting_id": "80Auuv3K7l8IptF3",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json
new file mode 100644
index 0000000000..10b46e8f76
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PETG Translucent @base",
+	"inherits": "Elegoo PETG @base",
+	"from": "system",
+	"filament_id": "OFenGPBR",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json
index 81e5b99afc..03de8dad0f 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PETG-CF @System",
-	"inherits": "Elegoo PETG @base",
+	"inherits": "Elegoo PETG-CF @base",
 	"from": "system",
 	"setting_id": "bXRJMaXxB3V49x7R",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json
new file mode 100644
index 0000000000..20897108cd
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PETG-CF @base",
+	"inherits": "Elegoo PETG @base",
+	"from": "system",
+	"filament_id": "OFIGHU7W",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json
index 48cd287ba6..f315756987 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PETG-GF @System",
-	"inherits": "Elegoo PETG @base",
+	"inherits": "Elegoo PETG-GF @base",
 	"from": "system",
 	"setting_id": "9NXaejLGh1VFX8bg",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json
new file mode 100644
index 0000000000..1b62b3aeaa
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PETG-GF @base",
+	"inherits": "Elegoo PETG @base",
+	"from": "system",
+	"filament_id": "OFMQJToc",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json
index cdff566915..15d6f46a3f 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Basic @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Basic @base",
 	"from": "system",
 	"setting_id": "qHDFHECwAInvpuk2",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json
new file mode 100644
index 0000000000..d361721096
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Basic @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFICPchn",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json
index 6874695462..6fd7f8f606 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Galaxy @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Galaxy @base",
 	"from": "system",
 	"setting_id": "WXEEksjWsTbRyCPh",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json
new file mode 100644
index 0000000000..a36b51384a
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Galaxy @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OF0M6QAQ",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json
index 1cd70e904b..9c4c2075b8 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Glow @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Glow @base",
 	"from": "system",
 	"setting_id": "yFdF2YmEMeCHiPxl",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json
new file mode 100644
index 0000000000..b839aca5dc
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Glow @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFutwD6f",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json
index 825a6c0dd9..755e42e758 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Marble @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Marble @base",
 	"from": "system",
 	"setting_id": "kq7NS8IhIV4cBI1C",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json
new file mode 100644
index 0000000000..7fc24ca532
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Marble @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OF4fgpse",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json
index e1361a4b5b..a05c57216e 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Matte @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Matte @base",
 	"from": "system",
 	"setting_id": "UykE255l5V0oS0Ca",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json
new file mode 100644
index 0000000000..07c0dcf1ef
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Matte @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFQkWxJy",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json
index 3526f87a69..fbc18fac42 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA PRO @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA PRO @base",
 	"from": "system",
 	"setting_id": "62GiUVVZd8kx21vw",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json
new file mode 100644
index 0000000000..368f6b89d9
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA PRO @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFsKqcQW",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json
index 475354ca02..79ae01da5b 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Silk @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Silk @base",
 	"from": "system",
 	"setting_id": "VkXguNj79KADxuYn",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json
new file mode 100644
index 0000000000..a19d767778
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Silk @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFs6lLH7",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json
index fc4070bbe7..c7c030ff5a 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Sparkle @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Sparkle @base",
 	"from": "system",
 	"setting_id": "VwZIFCojZLQLPrI1",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json
new file mode 100644
index 0000000000..cdf18ad328
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Sparkle @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OF8HQmJD",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json
index 178976527f..28993f13b4 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Translucent2 @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Translucent2 @base",
 	"from": "system",
 	"setting_id": "q0koYRlO9X8xLXPM",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json
new file mode 100644
index 0000000000..00d0e20932
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Translucent2 @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OF9qvJxV",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json
index abae441db5..a428f5605e 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA Wood @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA Wood @base",
 	"from": "system",
 	"setting_id": "pMgazYJG8tyTpAVE",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json
new file mode 100644
index 0000000000..934992440e
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA Wood @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFQhLoxN",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json
index b2bd83416d..2315cd2ac4 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA+ @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA+ @base",
 	"from": "system",
 	"setting_id": "q7NpDtaD9dTq1HIZ",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json
new file mode 100644
index 0000000000..23ae2c1ddb
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA+ @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFDNiRTx",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json
index 4ec26c71ba..9b79f54799 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo PLA-CF @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo PLA-CF @base",
 	"from": "system",
 	"setting_id": "cYxM93L2KZBnAuWu",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json
new file mode 100644
index 0000000000..3115358207
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo PLA-CF @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFqh1Ngp",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json
index 92b7cb43ef..7fd3f8d160 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo Rapid PETG @System",
-	"inherits": "Elegoo PETG @base",
+	"inherits": "Elegoo Rapid PETG @base",
 	"from": "system",
 	"setting_id": "uUQSVOvP8tAaDqvB",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json
new file mode 100644
index 0000000000..afdb0eda7a
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo Rapid PETG @base",
+	"inherits": "Elegoo PETG @base",
+	"from": "system",
+	"filament_id": "OFVLuVmD",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json
index f19e51bcf3..4f3ee82ced 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo Rapid PLA+ @System",
-	"inherits": "Elegoo PLA @base",
+	"inherits": "Elegoo Rapid PLA+ @base",
 	"from": "system",
 	"setting_id": "HZ4nP67iAG7a243e",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json
new file mode 100644
index 0000000000..21c1b99c63
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo Rapid PLA+ @base",
+	"inherits": "Elegoo PLA @base",
+	"from": "system",
+	"filament_id": "OFD5e0sH",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json
index 2006a6494b..3d15ba541c 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Elegoo Rapid TPU 95A @System",
-	"inherits": "Elegoo TPU @base",
+	"inherits": "Elegoo Rapid TPU 95A @base",
 	"from": "system",
 	"setting_id": "WXLuO112bsdM37MI",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json
new file mode 100644
index 0000000000..299f0cee8d
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Elegoo Rapid TPU 95A @base",
+	"inherits": "Elegoo TPU @base",
+	"from": "system",
+	"filament_id": "OFmeQjRP",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @System.json
index 27ee56eb4b..8013a04973 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PE-CF @System",
-	"inherits": "fdm_filament_pe",
+	"inherits": "Generic PE-CF @base",
 	"from": "system",
 	"setting_id": "prroSXONXxaahNkq",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json
new file mode 100644
index 0000000000..74aea8b342
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Generic PE-CF @base",
+	"inherits": "fdm_filament_pe",
+	"from": "system",
+	"filament_id": "OFJfx0Cl",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json
index e402cdf775..d755bf0aab 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PETG HF @System",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Generic PETG HF @base",
 	"from": "system",
 	"setting_id": "wNH8CohYIh9y6ayx",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json
new file mode 100644
index 0000000000..f8de64e2a8
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Generic PETG HF @base",
+	"inherits": "fdm_filament_pet",
+	"from": "system",
+	"filament_id": "OFfB1QKi",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json
index 5ee99ffed9..1f4578ee06 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PETG-CF @System",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Generic PETG-CF @base",
 	"from": "system",
 	"setting_id": "aRVqy4a3X1UTIKem",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json
new file mode 100644
index 0000000000..21b93a089d
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Generic PETG-CF @base",
+	"inherits": "fdm_filament_pet",
+	"from": "system",
+	"filament_id": "OFDCk0cz",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json
index d3a6d4813c..253a41f2ae 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PLA Matte @System",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Generic PLA Matte @base",
 	"from": "system",
 	"setting_id": "RFs9eCKYOMUSmvZf",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json
new file mode 100644
index 0000000000..931ec3ea7e
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Generic PLA Matte @base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"filament_id": "OFJsqMzx",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json
index 65420e9dae..af36744f57 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PP-CF @System",
-	"inherits": "fdm_filament_pp",
+	"inherits": "Generic PP-CF @base",
 	"from": "system",
 	"setting_id": "TDHYN3fs5wwakgsM",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json
new file mode 100644
index 0000000000..f1898eb1f6
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Generic PP-CF @base",
+	"inherits": "fdm_filament_pp",
+	"from": "system",
+	"filament_id": "OFRS2Ggt",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json
index 931ee4b7b3..b4a4a94c9e 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PP-GF @System",
-	"inherits": "fdm_filament_pp",
+	"inherits": "Generic PP-GF @base",
 	"from": "system",
 	"setting_id": "xfVrCZ7ySzkpdzX0",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json
new file mode 100644
index 0000000000..2544bac78a
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Generic PP-GF @base",
+	"inherits": "fdm_filament_pp",
+	"from": "system",
+	"filament_id": "OFMCMXSG",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @System.json
index 4d17382a38..ab02a798fc 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @System.json	
@@ -2,7 +2,7 @@
 	"type": "filament",
 	"name": "PolyLite Dual PLA @System",
 	"renamed_from": "PolyLite Dual PLA",
-	"inherits": "PolyLite PLA @base",
+	"inherits": "PolyLite Dual PLA @base",
 	"from": "system",
 	"setting_id": "ShKfsLXZ1EJ4HgKf",
 	"instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json
new file mode 100644
index 0000000000..fc31b9bc35
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json	
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "PolyLite Dual PLA @base",
+	"inherits": "PolyLite PLA @base",
+	"from": "system",
+	"filament_id": "OFsNZcid",
+	"instantiation": "false"
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json
index a627a10a4d..cef96aa7fc 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json	
@@ -3,7 +3,7 @@
 	"name": "eSUN PLA-Basic @base",
 	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "OGFL04",
+	"filament_id": "OFZhdVnP",
 	"instantiation": "false",
 	"filament_cost": [
 		"11.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json
index 40c314585c..1b6302372c 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json	
@@ -3,7 +3,7 @@
 	"name": "eSUN PLA-Marble @base",
 	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "OGFL06",
+	"filament_id": "OFXmQgno",
 	"instantiation": "false",
 	"filament_cost": [
 		"28.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json
index 85c6049935..e4c42a3a5b 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json	
@@ -3,7 +3,7 @@
 	"name": "eSUN PLA-Matte @base",
 	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "OGFL05",
+	"filament_id": "OF3GKs2i",
 	"instantiation": "false",
 	"filament_cost": [
 		"14.99"
diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json
index 462098d581..9ebc007f87 100644
--- a/scripts/filament_id_snapshot.json
+++ b/scripts/filament_id_snapshot.json
@@ -826,10 +826,33 @@
   "OrcaFilamentLibrary/Elas PETG Basic @base",
   "OrcaFilamentLibrary/Elas PLA Basic @base",
   "OrcaFilamentLibrary/Elas PLA Pro @base",
+  "OrcaFilamentLibrary/Elegoo ASA-CF @base",
   "OrcaFilamentLibrary/Elegoo PAHT @base",
   "OrcaFilamentLibrary/Elegoo PC @base",
+  "OrcaFilamentLibrary/Elegoo PC-FR @base",
+  "OrcaFilamentLibrary/Elegoo PET-CF @base",
   "OrcaFilamentLibrary/Elegoo PETG @base",
+  "OrcaFilamentLibrary/Elegoo PETG HF @base",
+  "OrcaFilamentLibrary/Elegoo PETG PRO @base",
+  "OrcaFilamentLibrary/Elegoo PETG Translucent @base",
+  "OrcaFilamentLibrary/Elegoo PETG-CF @base",
+  "OrcaFilamentLibrary/Elegoo PETG-GF @base",
   "OrcaFilamentLibrary/Elegoo PLA @base",
+  "OrcaFilamentLibrary/Elegoo PLA Basic @base",
+  "OrcaFilamentLibrary/Elegoo PLA Galaxy @base",
+  "OrcaFilamentLibrary/Elegoo PLA Glow @base",
+  "OrcaFilamentLibrary/Elegoo PLA Marble @base",
+  "OrcaFilamentLibrary/Elegoo PLA Matte @base",
+  "OrcaFilamentLibrary/Elegoo PLA PRO @base",
+  "OrcaFilamentLibrary/Elegoo PLA Silk @base",
+  "OrcaFilamentLibrary/Elegoo PLA Sparkle @base",
+  "OrcaFilamentLibrary/Elegoo PLA Translucent2 @base",
+  "OrcaFilamentLibrary/Elegoo PLA Wood @base",
+  "OrcaFilamentLibrary/Elegoo PLA+ @base",
+  "OrcaFilamentLibrary/Elegoo PLA-CF @base",
+  "OrcaFilamentLibrary/Elegoo Rapid PETG @base",
+  "OrcaFilamentLibrary/Elegoo Rapid PLA+ @base",
+  "OrcaFilamentLibrary/Elegoo Rapid TPU 95A @base",
   "OrcaFilamentLibrary/Eolas Prints PETG @System",
   "OrcaFilamentLibrary/Eolas Prints PETG Transition @System",
   "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant @System",
@@ -924,8 +947,14 @@
   "OrcaFilamentLibrary/FilAr PLA-mate Verde",
   "OrcaFilamentLibrary/FilAr PLA-mate Violeta",
   "OrcaFilamentLibrary/Generic PA-CF @System",
+  "OrcaFilamentLibrary/Generic PE-CF @base",
+  "OrcaFilamentLibrary/Generic PETG HF @base",
+  "OrcaFilamentLibrary/Generic PETG-CF @base",
   "OrcaFilamentLibrary/Generic PLA High Speed @System",
+  "OrcaFilamentLibrary/Generic PLA Matte @base",
   "OrcaFilamentLibrary/Generic PLA-CF @System",
+  "OrcaFilamentLibrary/Generic PP-CF @base",
+  "OrcaFilamentLibrary/Generic PP-GF @base",
   "OrcaFilamentLibrary/Generic PPA-GF @System",
   "OrcaFilamentLibrary/GreenGate3D PETG @base",
   "OrcaFilamentLibrary/NIT PETG @base",
@@ -955,6 +984,7 @@
   "OrcaFilamentLibrary/Panchroma PLA Temp Shift @base",
   "OrcaFilamentLibrary/Panchroma PLA Translucent @base",
   "OrcaFilamentLibrary/Panchroma PLA UV Shift @base",
+  "OrcaFilamentLibrary/PolyLite Dual PLA @base",
   "OrcaFilamentLibrary/PolyLite PETG @base",
   "OrcaFilamentLibrary/PolyLite PLA @base",
   "OrcaFilamentLibrary/PolyLite PLA Pro @base",
@@ -4561,54 +4591,144 @@
    "OrcaFilamentLibrary/Elegoo ABS"
   ],
   "OEASAB00": [
-   "OrcaFilamentLibrary/Elegoo ASA",
-   "OrcaFilamentLibrary/Elegoo ASA-CF"
+   "OrcaFilamentLibrary/Elegoo ASA"
   ],
   "OEPAHTB0": [
    "OrcaFilamentLibrary/Elegoo PAHT-CF"
   ],
   "OEPCB00": [
-   "OrcaFilamentLibrary/Elegoo PC",
-   "OrcaFilamentLibrary/Elegoo PC-FR"
+   "OrcaFilamentLibrary/Elegoo PC"
   ],
   "OEPETGB0": [
-   "OrcaFilamentLibrary/Elegoo PET-CF",
-   "OrcaFilamentLibrary/Elegoo PETG",
-   "OrcaFilamentLibrary/Elegoo PETG HF",
-   "OrcaFilamentLibrary/Elegoo PETG PRO",
-   "OrcaFilamentLibrary/Elegoo PETG Translucent",
-   "OrcaFilamentLibrary/Elegoo PETG-CF",
-   "OrcaFilamentLibrary/Elegoo PETG-GF",
-   "OrcaFilamentLibrary/Elegoo Rapid PETG"
+   "OrcaFilamentLibrary/Elegoo PETG"
   ],
   "OEPLAB00": [
-   "OrcaFilamentLibrary/Elegoo PLA",
-   "OrcaFilamentLibrary/Elegoo PLA Basic",
-   "OrcaFilamentLibrary/Elegoo PLA Galaxy",
-   "OrcaFilamentLibrary/Elegoo PLA Glow",
-   "OrcaFilamentLibrary/Elegoo PLA Marble",
-   "OrcaFilamentLibrary/Elegoo PLA Matte",
-   "OrcaFilamentLibrary/Elegoo PLA PRO",
-   "OrcaFilamentLibrary/Elegoo PLA Silk",
-   "OrcaFilamentLibrary/Elegoo PLA Sparkle",
-   "OrcaFilamentLibrary/Elegoo PLA Translucent2",
-   "OrcaFilamentLibrary/Elegoo PLA Wood",
-   "OrcaFilamentLibrary/Elegoo PLA+",
-   "OrcaFilamentLibrary/Elegoo PLA-CF",
-   "OrcaFilamentLibrary/Elegoo Rapid PLA+"
+   "OrcaFilamentLibrary/Elegoo PLA"
   ],
   "OETPUB00": [
-   "OrcaFilamentLibrary/Elegoo Rapid TPU 95A",
    "OrcaFilamentLibrary/Elegoo TPU 95A"
   ],
+  "OF0M6QAQ": [
+   "OrcaFilamentLibrary/Elegoo PLA Galaxy"
+  ],
+  "OF102WKM": [
+   "OrcaFilamentLibrary/Elegoo PETG PRO"
+  ],
+  "OF3GKs2i": [
+   "OrcaFilamentLibrary/eSUN PLA-Matte"
+  ],
+  "OF4fgpse": [
+   "OrcaFilamentLibrary/Elegoo PLA Marble"
+  ],
+  "OF79FFkO": [
+   "OrcaFilamentLibrary/Elegoo PC-FR"
+  ],
+  "OF8HQmJD": [
+   "OrcaFilamentLibrary/Elegoo PLA Sparkle"
+  ],
+  "OF9qvJxV": [
+   "OrcaFilamentLibrary/Elegoo PLA Translucent2"
+  ],
+  "OFD5e0sH": [
+   "OrcaFilamentLibrary/Elegoo Rapid PLA+"
+  ],
+  "OFDCk0cz": [
+   "Flashforge/Flashforge PET-CF",
+   "Flashforge/Flashforge PETG-CF",
+   "Flashforge/FusRock S-Multi",
+   "OrcaFilamentLibrary/Generic PETG-CF"
+  ],
+  "OFDNiRTx": [
+   "OrcaFilamentLibrary/Elegoo PLA+"
+  ],
+  "OFICPchn": [
+   "OrcaFilamentLibrary/Elegoo PLA Basic"
+  ],
+  "OFIGHU7W": [
+   "OrcaFilamentLibrary/Elegoo PETG-CF"
+  ],
+  "OFJIImD5": [
+   "OrcaFilamentLibrary/Elegoo PET-CF"
+  ],
+  "OFJfx0Cl": [
+   "OrcaFilamentLibrary/Generic PE-CF"
+  ],
+  "OFJsqMzx": [
+   "OrcaFilamentLibrary/Generic PLA Matte"
+  ],
   "OFLSBS99": [
    "OrcaFilamentLibrary/Generic SBS"
   ],
-  "OGFA00": [
-   "OrcaFilamentLibrary/Bambu PLA Basic",
-   "OrcaFilamentLibrary/Elas PLA Basic",
+  "OFMCMXSG": [
+   "OrcaFilamentLibrary/Generic PP-GF"
+  ],
+  "OFMQJToc": [
+   "OrcaFilamentLibrary/Elegoo PETG-GF"
+  ],
+  "OFQhLoxN": [
+   "OrcaFilamentLibrary/Elegoo PLA Wood"
+  ],
+  "OFQkWxJy": [
+   "OrcaFilamentLibrary/Elegoo PLA Matte"
+  ],
+  "OFRS2Ggt": [
+   "OrcaFilamentLibrary/Generic PP-CF"
+  ],
+  "OFT3TqB6": [
+   "OrcaFilamentLibrary/Elas ASA"
+  ],
+  "OFVLuVmD": [
+   "OrcaFilamentLibrary/Elegoo Rapid PETG"
+  ],
+  "OFXmQgno": [
+   "OrcaFilamentLibrary/eSUN PLA-Marble"
+  ],
+  "OFZhdVnP": [
+   "OrcaFilamentLibrary/eSUN PLA-Basic"
+  ],
+  "OFbgt3u3": [
+   "OrcaFilamentLibrary/Elas PLA Basic"
+  ],
+  "OFenGPBR": [
+   "OrcaFilamentLibrary/Elegoo PETG Translucent"
+  ],
+  "OFfB1QKi": [
+   "Flashforge/Flashforge HS PETG",
+   "OrcaFilamentLibrary/Generic PETG HF"
+  ],
+  "OFmeQjRP": [
+   "OrcaFilamentLibrary/Elegoo Rapid TPU 95A"
+  ],
+  "OFpwg2Qh": [
+   "OrcaFilamentLibrary/Elegoo ASA-CF"
+  ],
+  "OFqh1Ngp": [
+   "OrcaFilamentLibrary/Elegoo PLA-CF"
+  ],
+  "OFrgQ1Ns": [
    "OrcaFilamentLibrary/Elas PLA Pro"
   ],
+  "OFs6lLH7": [
+   "OrcaFilamentLibrary/Elegoo PLA Silk"
+  ],
+  "OFsKqcQW": [
+   "OrcaFilamentLibrary/Elegoo PLA PRO"
+  ],
+  "OFsNZcid": [
+   "OrcaFilamentLibrary/PolyLite Dual PLA"
+  ],
+  "OFutwD6f": [
+   "OrcaFilamentLibrary/Elegoo PLA Glow"
+  ],
+  "OFw4OHWE": [
+   "OrcaFilamentLibrary/Elas PETG Basic"
+  ],
+  "OFzrWlH5": [
+   "OrcaFilamentLibrary/Elegoo PETG HF"
+  ],
+  "OGFA00": [
+   "OrcaFilamentLibrary/Bambu PLA Basic"
+  ],
   "OGFA01": [
    "OrcaFilamentLibrary/Bambu PLA Matte"
   ],
@@ -4655,8 +4775,7 @@
    "OrcaFilamentLibrary/Bambu ABS"
   ],
   "OGFB01": [
-   "OrcaFilamentLibrary/Bambu ASA",
-   "OrcaFilamentLibrary/Elas ASA"
+   "OrcaFilamentLibrary/Bambu ASA"
   ],
   "OGFB02": [
    "OrcaFilamentLibrary/Bambu ASA-Aero"
@@ -4696,8 +4815,7 @@
    "OrcaFilamentLibrary/Generic PC"
   ],
   "OGFG00": [
-   "OrcaFilamentLibrary/Bambu PETG Basic",
-   "OrcaFilamentLibrary/Elas PETG Basic"
+   "OrcaFilamentLibrary/Bambu PETG Basic"
   ],
   "OGFG01": [
    "OrcaFilamentLibrary/Bambu PETG Translucent"
@@ -4715,21 +4833,14 @@
    "OrcaFilamentLibrary/Generic PCTG"
   ],
   "OGFG99": [
-   "Flashforge/Flashforge HS PETG",
-   "Flashforge/Flashforge PET-CF",
    "Flashforge/Flashforge PETG Pro",
    "Flashforge/Flashforge PETG Transparent",
-   "Flashforge/Flashforge PETG-CF",
-   "Flashforge/FusRock S-Multi",
-   "OrcaFilamentLibrary/Generic PETG",
-   "OrcaFilamentLibrary/Generic PETG HF",
-   "OrcaFilamentLibrary/Generic PETG-CF"
+   "OrcaFilamentLibrary/Generic PETG"
   ],
   "OGFGG300": [
    "OrcaFilamentLibrary/GreenGate3D PETG"
   ],
   "OGFL00": [
-   "OrcaFilamentLibrary/PolyLite Dual PLA",
    "OrcaFilamentLibrary/PolyLite PLA"
   ],
   "OGFL00-1": [
@@ -4745,16 +4856,13 @@
    "OrcaFilamentLibrary/eSUN PLA+"
   ],
   "OGFL04": [
-   "OrcaFilamentLibrary/Overture PLA",
-   "OrcaFilamentLibrary/eSUN PLA-Basic"
+   "OrcaFilamentLibrary/Overture PLA"
   ],
   "OGFL05": [
-   "OrcaFilamentLibrary/Overture Matte PLA",
-   "OrcaFilamentLibrary/eSUN PLA-Matte"
+   "OrcaFilamentLibrary/Overture Matte PLA"
   ],
   "OGFL06": [
-   "OrcaFilamentLibrary/Fiberon PETG-ESD",
-   "OrcaFilamentLibrary/eSUN PLA-Marble"
+   "OrcaFilamentLibrary/Fiberon PETG-ESD"
   ],
   "OGFL50": [
    "OrcaFilamentLibrary/Fiberon PA6-CF"
@@ -4796,8 +4904,7 @@
    "Flashforge/Flashforge PLA Galaxy",
    "Flashforge/Flashforge PLA Luminous",
    "Flashforge/Generic PLA",
-   "OrcaFilamentLibrary/Generic PLA",
-   "OrcaFilamentLibrary/Generic PLA Matte"
+   "OrcaFilamentLibrary/Generic PLA"
   ],
   "OGFLC99": [
    "OrcaFilamentLibrary/Generic CoPE"
@@ -4841,13 +4948,10 @@
    "OrcaFilamentLibrary/Numakers PLA+"
   ],
   "OGFP97": [
-   "OrcaFilamentLibrary/Generic PP",
-   "OrcaFilamentLibrary/Generic PP-CF",
-   "OrcaFilamentLibrary/Generic PP-GF"
+   "OrcaFilamentLibrary/Generic PP"
   ],
   "OGFP99": [
-   "OrcaFilamentLibrary/Generic PE",
-   "OrcaFilamentLibrary/Generic PE-CF"
+   "OrcaFilamentLibrary/Generic PE"
   ],
   "OGFPM001": [
    "OrcaFilamentLibrary/Panchroma PLA"