diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json
index b21ceab973..ba144d211a 100644
--- a/resources/profiles/BBL.json
+++ b/resources/profiles/BBL.json
@@ -297,14 +297,6 @@
             "name": "fdm_filament_hips",
             "sub_path": "filament/fdm_filament_hips.json"
         },
-        {
-            "name": "Generic HIPS @base",
-            "sub_path": "filament/Generic HIPS @base.json"
-        },
-        {
-            "name": "Bambu TPU 95A @base",
-            "sub_path": "filament/Bambu TPU 95A @base.json"
-        },
         {
             "name": "Bambu PLA Matte @base",
             "sub_path": "filament/Bambu PLA Matte @base.json"
@@ -337,34 +329,10 @@
             "name": "Bambu PLA Silk @base",
             "sub_path": "filament/Bambu PLA Silk @base.json"
         },
-        {
-            "name": "Bambu PETG Basic @base",
-            "sub_path": "filament/Bambu PETG Basic @base.json"
-        },
-        {
-            "name": "Bambu ABS @base",
-            "sub_path": "filament/Bambu ABS @base.json"
-        },
         {
             "name": "Bambu Support W @base",
             "sub_path": "filament/Bambu Support W @base.json"
         },
-        {
-            "name": "Bambu Support G @base",
-            "sub_path": "filament/Bambu Support G @base.json"
-        },
-        {
-            "name": "Bambu PA-CF @base",
-            "sub_path": "filament/Bambu PA-CF @base.json"
-        },
-        {
-            "name": "Bambu PET-CF @base",
-            "sub_path": "filament/Bambu PET-CF @base.json"
-        },
-        {
-            "name": "Bambu PC @base",
-            "sub_path": "filament/Bambu PC @base.json"
-        },
         {
             "name": "eSUN PLA+ @base",
             "sub_path": "filament/eSUN PLA+ @base.json"
@@ -381,121 +349,93 @@
             "name": "Generic PLA @base",
             "sub_path": "filament/Generic PLA @base.json"
         },
-        {
-            "name": "Generic PLA",
-            "sub_path": "filament/Generic PLA.json"
-        },
         {
             "name": "Generic PLA Silk @base",
             "sub_path": "filament/Generic PLA Silk @base.json"
         },
-        {
-            "name": "Generic PLA Silk",
-            "sub_path": "filament/Generic PLA Silk.json"
-        },
-        {
-            "name": "Generic PLA @0.2 nozzle",
-            "sub_path": "filament/Generic PLA @0.2 nozzle.json"
-        },
         {
             "name": "Generic PLA-CF @base",
             "sub_path": "filament/Generic PLA-CF @base.json"
         },
         {
-            "name": "Generic PLA-CF",
-            "sub_path": "filament/Generic PLA-CF.json"
+            "name": "Bambu PLA-CF @base",
+            "sub_path": "filament/Bambu PLA-CF @base.json"
         },
         {
-            "name": "Generic PETG @base",
-            "sub_path": "filament/Generic PETG @base.json"
+            "name": "Bambu Support For PLA @base",
+            "sub_path": "filament/Bambu Support For PLA @base.json"
         },
         {
-            "name": "Generic PETG",
-            "sub_path": "filament/Generic PETG.json"
+            "name": "Bambu PLA Aero @base",
+            "sub_path": "filament/Bambu PLA Aero @base.json"
         },
         {
-            "name": "Generic ABS @base",
-            "sub_path": "filament/Generic ABS @base.json"
-        },
-        {
-            "name": "Generic ABS",
-            "sub_path": "filament/Generic ABS.json"
-        },
-        {
-            "name": "Generic ABS @0.2 nozzle",
-            "sub_path": "filament/Generic ABS @0.2 nozzle.json"
+            "name": "Bambu TPU 95A @base",
+            "sub_path": "filament/Bambu TPU 95A @base.json"
         },
         {
             "name": "Generic TPU",
             "sub_path": "filament/Generic TPU.json"
         },
         {
-            "name": "Generic ASA @base",
-            "sub_path": "filament/Generic ASA @base.json"
+            "name": "Generic TPU @BBL P1P",
+            "sub_path": "filament/P1P/Generic TPU @BBL P1P.json"
         },
         {
-            "name": "Generic ASA @0.2 nozzle",
-            "sub_path": "filament/Generic ASA @0.2 nozzle.json"
+            "name": "Bambu PETG Basic @base",
+            "sub_path": "filament/Bambu PETG Basic @base.json"
         },
         {
-            "name": "Generic ASA",
-            "sub_path": "filament/Generic ASA.json"
+            "name": "Bambu PET-CF @base",
+            "sub_path": "filament/Bambu PET-CF @base.json"
         },
         {
-            "name": "Generic PC @base",
-            "sub_path": "filament/Generic PC @base.json"
-        },
-        {
-            "name": "Generic PC @0.2 nozzle",
-            "sub_path": "filament/Generic PC @0.2 nozzle.json"
-        },
-        {
-            "name": "Generic PC",
-            "sub_path": "filament/Generic PC.json"
-        },
-        {
-            "name": "Generic PVA @base",
-            "sub_path": "filament/Generic PVA @base.json"
+            "name": "Generic PETG @base",
+            "sub_path": "filament/Generic PETG @base.json"
         },
         {
             "name": "Generic PETG-CF @base",
             "sub_path": "filament/Generic PETG-CF @base.json"
         },
-        {
-            "name": "Generic PETG-CF @BBL X1C",
-            "sub_path": "filament/Generic PETG-CF @BBL X1C.json"
-        },
-        {
-            "name": "Generic PETG-CF @BBL P1P",
-            "sub_path": "filament/P1P/Generic PETG-CF @BBL P1P.json"
-        },
         {
             "name": "Bambu PETG-CF @base",
             "sub_path": "filament/Bambu PETG-CF @base.json"
         },
         {
-            "name": "Bambu PETG-CF @BBL X1C",
-            "sub_path": "filament/Bambu PETG-CF @BBL X1C.json"
+            "name": "Bambu ABS @base",
+            "sub_path": "filament/Bambu ABS @base.json"
         },
         {
-            "name": "Bambu PETG-CF @BBL X1C 0.4 nozzle",
-            "sub_path": "filament/Bambu PETG-CF @BBL X1C 0.4 nozzle.json"
+            "name": "Generic ABS @base",
+            "sub_path": "filament/Generic ABS @base.json"
         },
         {
-            "name": "Bambu PETG-CF @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PETG-CF @BBL P1P.json"
+            "name": "Bambu PC @base",
+            "sub_path": "filament/Bambu PC @base.json"
         },
         {
-            "name": "Bambu PETG-CF @BBL P1P 0.4 nozzle",
-            "sub_path": "filament/P1P/Bambu PETG-CF @BBL P1P 0.4 nozzle.json"
+            "name": "Generic PC @base",
+            "sub_path": "filament/Generic PC @base.json"
         },
         {
-            "name": "Generic PVA @0.2 nozzle",
-            "sub_path": "filament/Generic PVA @0.2 nozzle.json"
+            "name": "Generic ASA @base",
+            "sub_path": "filament/Generic ASA @base.json"
         },
         {
-            "name": "Generic PVA",
-            "sub_path": "filament/Generic PVA.json"
+            "name": "Bambu ASA @base",
+            "sub_path": "filament/Bambu ASA @base.json"
+        },
+        {
+            "name": "Generic PVA @base",
+            "sub_path": "filament/Generic PVA @base.json"
+        },
+        {
+            "name": "Bambu Support G @base",
+            "sub_path": "filament/Bambu Support G @base.json"
+        },
+        {
+            "name": "Bambu PA-CF @base",
+            "sub_path": "filament/Bambu PA-CF @base.json"
         },
         {
             "name": "Generic PA",
@@ -506,12 +446,24 @@
             "sub_path": "filament/Generic PA-CF.json"
         },
         {
-            "name": "Bambu TPU 95A @BBL X1C",
-            "sub_path": "filament/Bambu TPU 95A @BBL X1C.json"
+            "name": "Bambu PAHT-CF @base",
+            "sub_path": "filament/Bambu PAHT-CF @base.json"
         },
         {
-            "name": "Bambu TPU 95A @BBL X1",
-            "sub_path": "filament/Bambu TPU 95A @BBL X1.json"
+            "name": "Generic PA-CF @BBL P1P",
+            "sub_path": "filament/P1P/Generic PA-CF @BBL P1P.json"
+        },
+        {
+            "name": "Generic PA @BBL P1P",
+            "sub_path": "filament/P1P/Generic PA @BBL P1P.json"
+        },
+        {
+            "name": "Bambu Support For PA/PET @base",
+            "sub_path": "filament/Bambu Support For PA PET @base.json"
+        },
+        {
+            "name": "Generic HIPS @base",
+            "sub_path": "filament/Generic HIPS @base.json"
         },
         {
             "name": "Bambu PLA Matte @BBL X1C",
@@ -529,6 +481,14 @@
             "name": "Bambu PLA Matte @BBL X1",
             "sub_path": "filament/Bambu PLA Matte @BBL X1.json"
         },
+        {
+            "name": "Bambu PLA Matte @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Bambu PLA Matte @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PLA Matte @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PLA Matte @BBL P1P.json"
+        },
         {
             "name": "Bambu PLA Basic @BBL X1C",
             "sub_path": "filament/Bambu PLA Basic @BBL X1C.json"
@@ -545,6 +505,14 @@
             "name": "Bambu PLA Basic @BBL X1",
             "sub_path": "filament/Bambu PLA Basic @BBL X1.json"
         },
+        {
+            "name": "Bambu PLA Basic @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Bambu PLA Basic @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PLA Basic @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PLA Basic @BBL P1P.json"
+        },
         {
             "name": "Bambu PLA Tough @BBL X1C",
             "sub_path": "filament/Bambu PLA Tough @BBL X1C.json"
@@ -557,6 +525,14 @@
             "name": "Bambu PLA Tough @BBL X1",
             "sub_path": "filament/Bambu PLA Tough @BBL X1.json"
         },
+        {
+            "name": "Bambu PLA Tough @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Bambu PLA Tough @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PLA Tough @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PLA Tough @BBL P1P.json"
+        },
         {
             "name": "Bambu PLA Marble @BBL X1",
             "sub_path": "filament/Bambu PLA Marble @BBL X1.json"
@@ -565,6 +541,10 @@
             "name": "Bambu PLA Marble @BBL X1C",
             "sub_path": "filament/Bambu PLA Marble @BBL X1C.json"
         },
+        {
+            "name": "Bambu PLA Marble @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PLA Marble @BBL P1P.json"
+        },
         {
             "name": "Bambu PLA Sparkle @BBL X1",
             "sub_path": "filament/Bambu PLA Sparkle @BBL X1.json"
@@ -573,6 +553,30 @@
             "name": "Bambu PLA Sparkle @BBL X1C",
             "sub_path": "filament/Bambu PLA Sparkle @BBL X1C.json"
         },
+        {
+            "name": "Bambu PLA Sparkle @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PLA Sparkle @BBL P1P.json"
+        },
+        {
+            "name": "Bambu PLA Metal @BBL X1C 0.2 nozzle",
+            "sub_path": "filament/Bambu PLA Metal @BBL X1C 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PLA Metal @BBL X1",
+            "sub_path": "filament/Bambu PLA Metal @BBL X1.json"
+        },
+        {
+            "name": "Bambu PLA Metal @BBL X1C",
+            "sub_path": "filament/Bambu PLA Metal @BBL X1C.json"
+        },
+        {
+            "name": "Bambu PLA Metal @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Bambu PLA Metal @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PLA Metal @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PLA Metal @BBL P1P.json"
+        },
         {
             "name": "Bambu PLA Silk @BBL X1",
             "sub_path": "filament/Bambu PLA Silk @BBL X1.json"
@@ -593,30 +597,6 @@
             "name": "Bambu PLA Silk @BBL P1P 0.2 nozzle",
             "sub_path": "filament/P1P/Bambu PLA Silk @BBL P1P 0.2 nozzle.json"
         },
-        {
-            "name": "Bambu PETG Basic @BBL X1C",
-            "sub_path": "filament/Bambu PETG Basic @BBL X1C.json"
-        },
-        {
-            "name": "Bambu PETG Basic @BBL X1C 0.2 nozzle",
-            "sub_path": "filament/Bambu PETG Basic @BBL X1C 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu PETG Basic @BBL X1C 0.8 nozzle",
-            "sub_path": "filament/Bambu PETG Basic @BBL X1C 0.8 nozzle.json"
-        },
-        {
-            "name": "Bambu ABS @BBL X1C",
-            "sub_path": "filament/Bambu ABS @BBL X1C.json"
-        },
-        {
-            "name": "Bambu ABS @BBL X1C 0.2 nozzle",
-            "sub_path": "filament/Bambu ABS @BBL X1C 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu ABS @BBL X1C 0.8 nozzle",
-            "sub_path": "filament/Bambu ABS @BBL X1C 0.8 nozzle.json"
-        },
         {
             "name": "Bambu Support W @BBL X1C",
             "sub_path": "filament/Bambu Support W @BBL X1C.json"
@@ -630,28 +610,12 @@
             "sub_path": "filament/Bambu Support W @BBL X1.json"
         },
         {
-            "name": "Bambu Support G @BBL X1C",
-            "sub_path": "filament/Bambu Support G @BBL X1C.json"
+            "name": "Bambu Support W @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Bambu Support W @BBL P1P 0.2 nozzle.json"
         },
         {
-            "name": "Bambu PA-CF @BBL X1C",
-            "sub_path": "filament/Bambu PA-CF @BBL X1C.json"
-        },
-        {
-            "name": "Bambu PC @BBL X1C",
-            "sub_path": "filament/Bambu PC @BBL X1C.json"
-        },
-        {
-            "name": "Bambu PC @BBL X1C 0.2 nozzle",
-            "sub_path": "filament/Bambu PC @BBL X1C 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu PC @BBL X1C 0.8 nozzle",
-            "sub_path": "filament/Bambu PC @BBL X1C 0.8 nozzle.json"
-        },
-        {
-            "name": "Bambu PC @BBL X1C 0.6 nozzle",
-            "sub_path": "filament/Bambu PC @BBL X1C 0.6 nozzle.json"
+            "name": "Bambu Support W @BBL P1P",
+            "sub_path": "filament/P1P/Bambu Support W @BBL P1P.json"
         },
         {
             "name": "eSUN PLA+ @BBL X1C",
@@ -673,14 +637,6 @@
             "name": "eSUN PLA+ @BBL P1P 0.2 nozzle",
             "sub_path": "filament/P1P/eSUN PLA+ @BBL P1P 0.2 nozzle.json"
         },
-        {
-            "name": "PolyLite PLA @BBL X1C",
-            "sub_path": "filament/PolyLite PLA @BBL X1C.json"
-        },
-        {
-            "name": "PolyLite PLA @BBL X1",
-            "sub_path": "filament/PolyLite PLA @BBL X1.json"
-        },
         {
             "name": "PolyTerra PLA @BBL X1C",
             "sub_path": "filament/PolyTerra PLA @BBL X1C.json"
@@ -690,76 +646,28 @@
             "sub_path": "filament/PolyTerra PLA @BBL X1.json"
         },
         {
-            "name": "PolyTerra PLA @BBL X1C 0.2 nozzle",
-            "sub_path": "filament/PolyTerra PLA @BBL X1C 0.2 nozzle.json"
+            "name": "PolyTerra PLA @BBL P1P",
+            "sub_path": "filament/P1P/PolyTerra PLA @BBL P1P.json"
         },
         {
-            "name": "PolyLite PLA @BBL X1C 0.2 nozzle",
-            "sub_path": "filament/PolyLite PLA @BBL X1C 0.2 nozzle.json"
+            "name": "PolyLite PLA @BBL X1C",
+            "sub_path": "filament/PolyLite PLA @BBL X1C.json"
         },
         {
-            "name": "Bambu Support G @BBL P1P",
-            "sub_path": "filament/P1P/Bambu Support G @BBL P1P.json"
+            "name": "PolyLite PLA @BBL X1",
+            "sub_path": "filament/PolyLite PLA @BBL X1.json"
         },
         {
-            "name": "Bambu ABS @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Bambu ABS @BBL P1P 0.2 nozzle.json"
+            "name": "PolyLite PLA @BBL P1P",
+            "sub_path": "filament/P1P/PolyLite PLA @BBL P1P.json"
         },
         {
-            "name": "Bambu PLA Matte @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Bambu PLA Matte @BBL P1P 0.2 nozzle.json"
+            "name": "Generic PLA",
+            "sub_path": "filament/Generic PLA.json"
         },
         {
-            "name": "Bambu PLA Matte @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PLA Matte @BBL P1P.json"
-        },
-        {
-            "name": "Bambu PLA Basic @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Bambu PLA Basic @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu PLA Basic @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PLA Basic @BBL P1P.json"
-        },
-        {
-            "name": "Bambu PLA Tough @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Bambu PLA Tough @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu PLA Tough @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PLA Tough @BBL P1P.json"
-        },
-        {
-            "name": "Bambu PLA Marble @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PLA Marble @BBL P1P.json"
-        },
-        {
-            "name": "Bambu PLA Sparkle @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PLA Sparkle @BBL P1P.json"
-        },
-        {
-            "name": "Bambu ABS @BBL P1P",
-            "sub_path": "filament/P1P/Bambu ABS @BBL P1P.json"
-        },
-        {
-            "name": "Bambu PC @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PC @BBL P1P.json"
-        },
-        {
-            "name": "Bambu PC @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Bambu PC @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu Support W @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Bambu Support W @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu TPU 95A @BBL P1P",
-            "sub_path": "filament/P1P/Bambu TPU 95A @BBL P1P.json"
-        },
-        {
-            "name": "Bambu Support W @BBL P1P",
-            "sub_path": "filament/P1P/Bambu Support W @BBL P1P.json"
+            "name": "Generic PLA @0.2 nozzle",
+            "sub_path": "filament/Generic PLA @0.2 nozzle.json"
         },
         {
             "name": "Generic PLA @BBL P1P 0.2 nozzle",
@@ -769,53 +677,21 @@
             "name": "Generic PLA @BBL P1P",
             "sub_path": "filament/P1P/Generic PLA @BBL P1P.json"
         },
+        {
+            "name": "Generic PLA Silk",
+            "sub_path": "filament/Generic PLA Silk.json"
+        },
         {
             "name": "Generic PLA Silk @BBL P1P",
             "sub_path": "filament/P1P/Generic PLA Silk @BBL P1P.json"
         },
         {
-            "name": "Generic ABS @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Generic ABS @BBL P1P 0.2 nozzle.json"
+            "name": "Generic PLA-CF",
+            "sub_path": "filament/Generic PLA-CF.json"
         },
         {
-            "name": "Generic ABS @BBL P1P",
-            "sub_path": "filament/P1P/Generic ABS @BBL P1P.json"
-        },
-        {
-            "name": "Generic ASA @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Generic ASA @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Generic ASA @BBL P1P",
-            "sub_path": "filament/P1P/Generic ASA @BBL P1P.json"
-        },
-        {
-            "name": "Generic PC @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Generic PC @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Generic PC @BBL P1P",
-            "sub_path": "filament/P1P/Generic PC @BBL P1P.json"
-        },
-        {
-            "name": "Generic PETG @0.2 nozzle",
-            "sub_path": "filament/Generic PETG @0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu PLA Metal @BBL X1C 0.2 nozzle",
-            "sub_path": "filament/Bambu PLA Metal @BBL X1C 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu PLA Metal @BBL X1",
-            "sub_path": "filament/Bambu PLA Metal @BBL X1.json"
-        },
-        {
-            "name": "Bambu PLA Metal @BBL X1C",
-            "sub_path": "filament/Bambu PLA Metal @BBL X1C.json"
-        },
-        {
-            "name": "Bambu PLA-CF @base",
-            "sub_path": "filament/Bambu PLA-CF @base.json"
+            "name": "Generic PLA-CF @BBL P1P",
+            "sub_path": "filament/P1P/Generic PLA-CF @BBL P1P.json"
         },
         {
             "name": "Bambu PLA-CF @BBL X1C 0.8 nozzle",
@@ -825,98 +701,14 @@
             "name": "Bambu PLA-CF @BBL X1C",
             "sub_path": "filament/Bambu PLA-CF @BBL X1C.json"
         },
-        {
-            "name": "Bambu PAHT-CF @base",
-            "sub_path": "filament/Bambu PAHT-CF @base.json"
-        },
-        {
-            "name": "Bambu PAHT-CF @BBL X1C",
-            "sub_path": "filament/Bambu PAHT-CF @BBL X1C.json"
-        },
-        {
-            "name": "Generic PETG @BBL P1P",
-            "sub_path": "filament/P1P/Generic PETG @BBL P1P.json"
-        },
-        {
-            "name": "Generic PVA @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Generic PVA @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Generic PVA @BBL P1P",
-            "sub_path": "filament/P1P/Generic PVA @BBL P1P.json"
-        },
-        {
-            "name": "Generic TPU @BBL P1P",
-            "sub_path": "filament/P1P/Generic TPU @BBL P1P.json"
-        },
-        {
-            "name": "PolyLite PLA @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/PolyLite PLA @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "PolyLite PLA @BBL P1P",
-            "sub_path": "filament/P1P/PolyLite PLA @BBL P1P.json"
-        },
-        {
-            "name": "PolyTerra PLA @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/PolyTerra PLA @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "PolyTerra PLA @BBL P1P",
-            "sub_path": "filament/P1P/PolyTerra PLA @BBL P1P.json"
-        },
-        {
-            "name": "Bambu PA-CF @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PA-CF @BBL P1P.json"
-        },
-        {
-            "name": "Generic PA-CF @BBL P1P",
-            "sub_path": "filament/P1P/Generic PA-CF @BBL P1P.json"
-        },
-        {
-            "name": "Generic PA @BBL P1P",
-            "sub_path": "filament/P1P/Generic PA @BBL P1P.json"
-        },
-        {
-            "name": "Generic PETG @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Generic PETG @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu PAHT-CF @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PAHT-CF @BBL P1P.json"
-        },
-        {
-            "name": "Bambu PLA Metal @BBL P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Bambu PLA Metal @BBL P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Bambu PLA Metal @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PLA Metal @BBL P1P.json"
-        },
         {
             "name": "Bambu PLA-CF @BBL P1P",
             "sub_path": "filament/P1P/Bambu PLA-CF @BBL P1P.json"
         },
-        {
-            "name": "Generic PLA-CF @BBL P1P",
-            "sub_path": "filament/P1P/Generic PLA-CF @BBL P1P.json"
-        },
         {
             "name": "Bambu PLA-CF @BBL P1P 0.8 nozzle",
             "sub_path": "filament/P1P/Bambu PLA-CF @BBL P1P 0.8 nozzle.json"
         },
-        {
-            "name": "Bambu PET-CF @BBL X1C",
-            "sub_path": "filament/Bambu PET-CF @BBL X1C.json"
-        },
-        {
-            "name": "Bambu PET-CF @BBL P1P",
-            "sub_path": "filament/P1P/Bambu PET-CF @BBL P1P.json"
-        },
-        {
-            "name": "Bambu Support For PLA @base",
-            "sub_path": "filament/Bambu Support For PLA @base.json"
-        },
         {
             "name": "Bambu Support For PLA @BBL X1C 0.2 nozzle",
             "sub_path": "filament/Bambu Support For PLA @BBL X1C 0.2 nozzle.json"
@@ -933,22 +725,6 @@
             "name": "Bambu Support For PLA @BBL P1P",
             "sub_path": "filament/P1P/Bambu Support For PLA @BBL P1P.json"
         },
-        {
-            "name": "Bambu Support For PA/PET @base",
-            "sub_path": "filament/Bambu Support For PA PET @base.json"
-        },
-        {
-            "name": "Bambu Support For PA/PET @BBL P1P",
-            "sub_path": "filament/P1P/Bambu Support For PA PET @BBL P1P.json"
-        },
-        {
-            "name": "Bambu Support For PA/PET @BBL X1C",
-            "sub_path": "filament/Bambu Support For PA PET @BBL X1C.json"
-        },
-        {
-            "name": "Bambu PLA Aero @base",
-            "sub_path": "filament/Bambu PLA Aero @base.json"
-        },
         {
             "name": "Bambu PLA Aero @BBL X1",
             "sub_path": "filament/Bambu PLA Aero @BBL X1.json"
@@ -962,8 +738,168 @@
             "sub_path": "filament/P1P/Bambu PLA Aero @BBL P1P.json"
         },
         {
-            "name": "Bambu ASA @base",
-            "sub_path": "filament/Bambu ASA @base.json"
+            "name": "Bambu TPU 95A @BBL X1C",
+            "sub_path": "filament/Bambu TPU 95A @BBL X1C.json"
+        },
+        {
+            "name": "Bambu TPU 95A @BBL X1",
+            "sub_path": "filament/Bambu TPU 95A @BBL X1.json"
+        },
+        {
+            "name": "Bambu TPU 95A @BBL P1P",
+            "sub_path": "filament/P1P/Bambu TPU 95A @BBL P1P.json"
+        },
+        {
+            "name": "Bambu PETG Basic @BBL X1C",
+            "sub_path": "filament/Bambu PETG Basic @BBL X1C.json"
+        },
+        {
+            "name": "Bambu PETG Basic @BBL X1C 0.2 nozzle",
+            "sub_path": "filament/Bambu PETG Basic @BBL X1C 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PETG Basic @BBL X1C 0.8 nozzle",
+            "sub_path": "filament/Bambu PETG Basic @BBL X1C 0.8 nozzle.json"
+        },
+        {
+            "name": "Bambu PET-CF @BBL X1C",
+            "sub_path": "filament/Bambu PET-CF @BBL X1C.json"
+        },
+        {
+            "name": "Bambu PET-CF @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PET-CF @BBL P1P.json"
+        },
+        {
+            "name": "Generic PETG",
+            "sub_path": "filament/Generic PETG.json"
+        },
+        {
+            "name": "Generic PETG @0.2 nozzle",
+            "sub_path": "filament/Generic PETG @0.2 nozzle.json"
+        },
+        {
+            "name": "Generic PETG @BBL P1P",
+            "sub_path": "filament/P1P/Generic PETG @BBL P1P.json"
+        },
+        {
+            "name": "Generic PETG @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Generic PETG @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Generic PETG-CF @BBL X1C",
+            "sub_path": "filament/Generic PETG-CF @BBL X1C.json"
+        },
+        {
+            "name": "Generic PETG-CF @BBL P1P",
+            "sub_path": "filament/P1P/Generic PETG-CF @BBL P1P.json"
+        },
+        {
+            "name": "Bambu PETG-CF @BBL X1C",
+            "sub_path": "filament/Bambu PETG-CF @BBL X1C.json"
+        },
+        {
+            "name": "Bambu PETG-CF @BBL X1C 0.4 nozzle",
+            "sub_path": "filament/Bambu PETG-CF @BBL X1C 0.4 nozzle.json"
+        },
+        {
+            "name": "Bambu PETG-CF @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PETG-CF @BBL P1P.json"
+        },
+        {
+            "name": "Bambu PETG-CF @BBL P1P 0.4 nozzle",
+            "sub_path": "filament/P1P/Bambu PETG-CF @BBL P1P 0.4 nozzle.json"
+        },
+        {
+            "name": "Bambu ABS @BBL X1C",
+            "sub_path": "filament/Bambu ABS @BBL X1C.json"
+        },
+        {
+            "name": "Bambu ABS @BBL X1C 0.2 nozzle",
+            "sub_path": "filament/Bambu ABS @BBL X1C 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu ABS @BBL X1C 0.8 nozzle",
+            "sub_path": "filament/Bambu ABS @BBL X1C 0.8 nozzle.json"
+        },
+        {
+            "name": "Bambu ABS @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Bambu ABS @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu ABS @BBL P1P",
+            "sub_path": "filament/P1P/Bambu ABS @BBL P1P.json"
+        },
+        {
+            "name": "Generic ABS",
+            "sub_path": "filament/Generic ABS.json"
+        },
+        {
+            "name": "Generic ABS @0.2 nozzle",
+            "sub_path": "filament/Generic ABS @0.2 nozzle.json"
+        },
+        {
+            "name": "Generic ABS @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Generic ABS @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Generic ABS @BBL P1P",
+            "sub_path": "filament/P1P/Generic ABS @BBL P1P.json"
+        },
+        {
+            "name": "Bambu PC @BBL X1C",
+            "sub_path": "filament/Bambu PC @BBL X1C.json"
+        },
+        {
+            "name": "Bambu PC @BBL X1C 0.2 nozzle",
+            "sub_path": "filament/Bambu PC @BBL X1C 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PC @BBL X1C 0.8 nozzle",
+            "sub_path": "filament/Bambu PC @BBL X1C 0.8 nozzle.json"
+        },
+        {
+            "name": "Bambu PC @BBL X1C 0.6 nozzle",
+            "sub_path": "filament/Bambu PC @BBL X1C 0.6 nozzle.json"
+        },
+        {
+            "name": "Bambu PC @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PC @BBL P1P.json"
+        },
+        {
+            "name": "Bambu PC @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Bambu PC @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Generic PC @0.2 nozzle",
+            "sub_path": "filament/Generic PC @0.2 nozzle.json"
+        },
+        {
+            "name": "Generic PC",
+            "sub_path": "filament/Generic PC.json"
+        },
+        {
+            "name": "Generic PC @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Generic PC @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Generic PC @BBL P1P",
+            "sub_path": "filament/P1P/Generic PC @BBL P1P.json"
+        },
+        {
+            "name": "Generic ASA @0.2 nozzle",
+            "sub_path": "filament/Generic ASA @0.2 nozzle.json"
+        },
+        {
+            "name": "Generic ASA",
+            "sub_path": "filament/Generic ASA.json"
+        },
+        {
+            "name": "Generic ASA @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Generic ASA @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Generic ASA @BBL P1P",
+            "sub_path": "filament/P1P/Generic ASA @BBL P1P.json"
         },
         {
             "name": "Bambu ASA @BBL X1 0.2 nozzle",
@@ -985,6 +921,54 @@
             "name": "Bambu ASA @BBL X1C 0.4 nozzle",
             "sub_path": "filament/Bambu ASA @BBL X1C 0.4 nozzle.json"
         },
+        {
+            "name": "Generic PVA @0.2 nozzle",
+            "sub_path": "filament/Generic PVA @0.2 nozzle.json"
+        },
+        {
+            "name": "Generic PVA",
+            "sub_path": "filament/Generic PVA.json"
+        },
+        {
+            "name": "Generic PVA @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/Generic PVA @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Generic PVA @BBL P1P",
+            "sub_path": "filament/P1P/Generic PVA @BBL P1P.json"
+        },
+        {
+            "name": "Bambu Support G @BBL X1C",
+            "sub_path": "filament/Bambu Support G @BBL X1C.json"
+        },
+        {
+            "name": "Bambu Support G @BBL P1P",
+            "sub_path": "filament/P1P/Bambu Support G @BBL P1P.json"
+        },
+        {
+            "name": "Bambu PA-CF @BBL X1C",
+            "sub_path": "filament/Bambu PA-CF @BBL X1C.json"
+        },
+        {
+            "name": "Bambu PA-CF @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PA-CF @BBL P1P.json"
+        },
+        {
+            "name": "Bambu PAHT-CF @BBL X1C",
+            "sub_path": "filament/Bambu PAHT-CF @BBL X1C.json"
+        },
+        {
+            "name": "Bambu PAHT-CF @BBL P1P",
+            "sub_path": "filament/P1P/Bambu PAHT-CF @BBL P1P.json"
+        },
+        {
+            "name": "Bambu Support For PA/PET @BBL P1P",
+            "sub_path": "filament/P1P/Bambu Support For PA PET @BBL P1P.json"
+        },
+        {
+            "name": "Bambu Support For PA/PET @BBL X1C",
+            "sub_path": "filament/Bambu Support For PA PET @BBL X1C.json"
+        },
         {
             "name": "Generic HIPS @BBL X1C",
             "sub_path": "filament/Generic HIPS @BBL X1C.json"
@@ -992,6 +976,46 @@
         {
             "name": "Generic HIPS @BBL X1C 0.2 nozzle",
             "sub_path": "filament/Generic HIPS @BBL X1C 0.2 nozzle.json"
+        },
+        {
+            "name": "PolyTerra PLA @BBL X1C 0.2 nozzle",
+            "sub_path": "filament/PolyTerra PLA @BBL X1C 0.2 nozzle.json"
+        },
+        {
+            "name": "PolyTerra PLA @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/PolyTerra PLA @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "PolyLite PLA @BBL X1C 0.2 nozzle",
+            "sub_path": "filament/PolyLite PLA @BBL X1C 0.2 nozzle.json"
+        },
+        {
+            "name": "PolyLite PLA @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/P1P/PolyLite PLA @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PC @BBL P1S",
+            "sub_path": "filament/Bambu PC @BBL P1S.json"
+        },
+        {
+            "name": "Bambu PC @BBL P1S 0.2 nozzle",
+            "sub_path": "filament/Bambu PC @BBL P1S 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu PC @BBL P1S 0.8 nozzle",
+            "sub_path": "filament/Bambu PC @BBL P1S 0.8 nozzle.json"
+        },
+        {
+            "name": "Bambu PC @BBL P1S 0.6 nozzle",
+            "sub_path": "filament/Bambu PC @BBL P1S 0.6 nozzle.json"
+        },
+        {
+            "name": "Generic PC @BBL P1S 0.2 nozzle",
+            "sub_path": "filament/Generic PC @BBL P1S 0.2 nozzle.json"
+        },
+        {
+            "name": "Generic PC @BBL P1S",
+            "sub_path": "filament/Generic PC @BBL P1S.json"
         }
     ],
     "machine_list": [
diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.2 nozzle.json b/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.2 nozzle.json
new file mode 100644
index 0000000000..b7efca74c9
--- /dev/null
+++ b/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.2 nozzle.json	
@@ -0,0 +1,29 @@
+{
+    "type": "filament",
+    "setting_id": "GFSC00_06",
+    "name": "Bambu PC @BBL P1S 0.2 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Bambu PC @BBL X1C 0.2 nozzle",
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Bambu Lab P1S 0.2 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.6 nozzle.json b/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.6 nozzle.json
new file mode 100644
index 0000000000..e90462b303
--- /dev/null
+++ b/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.6 nozzle.json	
@@ -0,0 +1,29 @@
+{
+    "type": "filament",
+    "setting_id": "GFSC00_08",
+    "name": "Bambu PC @BBL P1S 0.6 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Bambu PC @BBL X1C 0.6 nozzle",
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Bambu Lab P1S 0.6 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.8 nozzle.json
new file mode 100644
index 0000000000..a7724f8624
--- /dev/null
+++ b/resources/profiles/BBL/filament/Bambu PC @BBL P1S 0.8 nozzle.json	
@@ -0,0 +1,29 @@
+{
+    "type": "filament",
+    "setting_id": "GFSC00_07",
+    "name": "Bambu PC @BBL P1S 0.8 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Bambu PC @BBL X1C 0.8 nozzle",
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Bambu Lab P1S 0.8 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL P1S.json b/resources/profiles/BBL/filament/Bambu PC @BBL P1S.json
new file mode 100644
index 0000000000..41bfa2346f
--- /dev/null
+++ b/resources/profiles/BBL/filament/Bambu PC @BBL P1S.json	
@@ -0,0 +1,29 @@
+{
+    "type": "filament",
+    "setting_id": "GFSC00_05",
+    "name": "Bambu PC @BBL P1S",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Bambu PC @BBL X1C",
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Bambu Lab P1S 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.2 nozzle.json
index 686116f6d8..6afdd4352b 100644
--- a/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.2 nozzle.json	
+++ b/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.2 nozzle.json	
@@ -13,7 +13,6 @@
     ],
     "compatible_printers": [
         "Bambu Lab X1 Carbon 0.2 nozzle",
-        "Bambu Lab X1 0.2 nozzle",
-        "Bambu Lab P1S 0.2 nozzle"
+        "Bambu Lab X1 0.2 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.6 nozzle.json b/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.6 nozzle.json
index 3612ac4e6d..360b0465b9 100644
--- a/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.6 nozzle.json	
+++ b/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.6 nozzle.json	
@@ -10,7 +10,6 @@
     ],
     "compatible_printers": [
         "Bambu Lab X1 Carbon 0.6 nozzle",
-        "Bambu Lab X1 0.6 nozzle",
-        "Bambu Lab P1S 0.6 nozzle"
+        "Bambu Lab X1 0.6 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.8 nozzle.json
index 55cd8691bf..f067ceab0a 100644
--- a/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.8 nozzle.json	
+++ b/resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.8 nozzle.json	
@@ -10,7 +10,6 @@
     ],
     "compatible_printers": [
         "Bambu Lab X1 Carbon 0.8 nozzle",
-        "Bambu Lab X1 0.8 nozzle",
-        "Bambu Lab P1S 0.8 nozzle"
+        "Bambu Lab X1 0.8 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PC @BBL X1C.json
index 8d42fcbe71..047a71fe82 100644
--- a/resources/profiles/BBL/filament/Bambu PC @BBL X1C.json	
+++ b/resources/profiles/BBL/filament/Bambu PC @BBL X1C.json	
@@ -7,7 +7,6 @@
     "inherits": "Bambu PC @base",
     "compatible_printers": [
         "Bambu Lab X1 Carbon 0.4 nozzle",
-        "Bambu Lab X1 0.4 nozzle",
-        "Bambu Lab P1S 0.4 nozzle"
+        "Bambu Lab X1 0.4 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Generic PC @0.2 nozzle.json b/resources/profiles/BBL/filament/Generic PC @0.2 nozzle.json
index ece4e59957..1563dd5c8a 100644
--- a/resources/profiles/BBL/filament/Generic PC @0.2 nozzle.json	
+++ b/resources/profiles/BBL/filament/Generic PC @0.2 nozzle.json	
@@ -10,7 +10,6 @@
     ],
     "compatible_printers": [
         "Bambu Lab X1 Carbon 0.2 nozzle",
-        "Bambu Lab X1 0.2 nozzle",
-        "Bambu Lab P1S 0.2 nozzle"
+        "Bambu Lab X1 0.2 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Generic PC @BBL P1S 0.2 nozzle.json b/resources/profiles/BBL/filament/Generic PC @BBL P1S 0.2 nozzle.json
new file mode 100644
index 0000000000..e4abf728d2
--- /dev/null
+++ b/resources/profiles/BBL/filament/Generic PC @BBL P1S 0.2 nozzle.json	
@@ -0,0 +1,29 @@
+{
+    "type": "filament",
+    "setting_id": "GFSC99_03",
+    "name": "Generic PC @BBL P1S 0.2 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Generic PC @0.2 nozzle",
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Bambu Lab P1S 0.2 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Generic PC @BBL P1S.json b/resources/profiles/BBL/filament/Generic PC @BBL P1S.json
new file mode 100644
index 0000000000..b50a8a32aa
--- /dev/null
+++ b/resources/profiles/BBL/filament/Generic PC @BBL P1S.json	
@@ -0,0 +1,31 @@
+{
+    "type": "filament",
+    "setting_id": "GFSC99_04",
+    "name": "Generic PC @BBL P1S",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Generic PC",
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Bambu Lab P1S 0.4 nozzle",
+        "Bambu Lab P1S 0.6 nozzle",
+        "Bambu Lab P1S 0.8 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/BBL/filament/Generic PC.json b/resources/profiles/BBL/filament/Generic PC.json
index 07532d56f8..156ee20981 100644
--- a/resources/profiles/BBL/filament/Generic PC.json	
+++ b/resources/profiles/BBL/filament/Generic PC.json	
@@ -11,9 +11,6 @@
         "Bambu Lab X1 Carbon 0.8 nozzle",
         "Bambu Lab X1 0.4 nozzle",
         "Bambu Lab X1 0.6 nozzle",
-        "Bambu Lab X1 0.8 nozzle",
-        "Bambu Lab P1S 0.4 nozzle",
-        "Bambu Lab P1S 0.6 nozzle",
-        "Bambu Lab P1S 0.8 nozzle"
+        "Bambu Lab X1 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/BBL/filament/P1P/Bambu PC @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/P1P/Bambu PC @BBL P1P 0.2 nozzle.json
index 9939eb446c..39d4674257 100644
--- a/resources/profiles/BBL/filament/P1P/Bambu PC @BBL P1P 0.2 nozzle.json	
+++ b/resources/profiles/BBL/filament/P1P/Bambu PC @BBL P1P 0.2 nozzle.json	
@@ -5,18 +5,36 @@
     "from": "system",
     "instantiation": "true",
     "inherits": "Bambu PC @base",
-    "filament_max_volumetric_speed": [
-        "1"
+    "eng_plate_temp": [
+        "100"
     ],
-    "nozzle_temperature": [
-        "260"
+    "eng_plate_temp_initial_layer": [
+        "100"
     ],
     "fan_max_speed": [
         "20"
     ],
+    "filament_max_volumetric_speed": [
+        "1"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "nozzle_temperature": [
+        "260"
+    ],
     "reduce_fan_stop_start_freq": [
         "0"
     ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
     "compatible_printers": [
         "Bambu Lab P1P 0.2 nozzle"
     ]
diff --git a/resources/profiles/BBL/filament/P1P/Bambu PC @BBL P1P.json b/resources/profiles/BBL/filament/P1P/Bambu PC @BBL P1P.json
index b535c8d0ea..e35afa31e8 100644
--- a/resources/profiles/BBL/filament/P1P/Bambu PC @BBL P1P.json	
+++ b/resources/profiles/BBL/filament/P1P/Bambu PC @BBL P1P.json	
@@ -5,12 +5,30 @@
     "from": "system",
     "instantiation": "true",
     "inherits": "Bambu PC @base",
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
     "fan_max_speed": [
         "20"
     ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
     "reduce_fan_stop_start_freq": [
         "0"
     ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
     "compatible_printers": [
         "Bambu Lab P1P 0.4 nozzle",
         "Bambu Lab P1P 0.6 nozzle",
diff --git a/resources/profiles/BBL/filament/P1P/Generic PC @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/P1P/Generic PC @BBL P1P 0.2 nozzle.json
index e5d8b1c39d..74af74bfd7 100644
--- a/resources/profiles/BBL/filament/P1P/Generic PC @BBL P1P 0.2 nozzle.json	
+++ b/resources/profiles/BBL/filament/P1P/Generic PC @BBL P1P 0.2 nozzle.json	
@@ -5,15 +5,33 @@
     "from": "system",
     "instantiation": "true",
     "inherits": "Generic PC @base",
-    "filament_max_volumetric_speed": [
-        "1"
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
     ],
     "fan_max_speed": [
         "20"
     ],
+    "filament_max_volumetric_speed": [
+        "1"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
     "reduce_fan_stop_start_freq": [
         "0"
     ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
     "compatible_printers": [
         "Bambu Lab P1P 0.2 nozzle"
     ]
diff --git a/resources/profiles/BBL/filament/P1P/Generic PC @BBL P1P.json b/resources/profiles/BBL/filament/P1P/Generic PC @BBL P1P.json
index 8bfba92151..0ffa7b73b3 100644
--- a/resources/profiles/BBL/filament/P1P/Generic PC @BBL P1P.json	
+++ b/resources/profiles/BBL/filament/P1P/Generic PC @BBL P1P.json	
@@ -5,12 +5,30 @@
     "from": "system",
     "instantiation": "true",
     "inherits": "Generic PC @base",
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
     "fan_max_speed": [
         "20"
     ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
     "reduce_fan_stop_start_freq": [
         "0"
     ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
     "compatible_printers": [
         "Bambu Lab P1P 0.4 nozzle",
         "Bambu Lab P1P 0.6 nozzle",