diff --git a/resources/profiles/Custom.json b/resources/profiles/Custom.json
index eefaf7912fe..e9f6d5bc323 100644
--- a/resources/profiles/Custom.json
+++ b/resources/profiles/Custom.json
@@ -5,11 +5,11 @@
     "description": "My configurations",
     "machine_model_list": [
         {
-            "name": "MyKlipper",
+            "name": "Generaic Klipper Printer",
             "sub_path": "machine/MyKlipper.json"
         },
         {
-            "name": "MyMarlin",
+            "name": "Generic Marlin Printer",
             "sub_path": "machine/MyMarlin.json"
         }
     ],
diff --git a/resources/profiles/Custom/filament/My Generic ABS.json b/resources/profiles/Custom/filament/My Generic ABS.json
index acc3e5215d1..972f4ddcca0 100644
--- a/resources/profiles/Custom/filament/My Generic ABS.json	
+++ b/resources/profiles/Custom/filament/My Generic ABS.json	
@@ -13,9 +13,7 @@
         "12"
     ],
     "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic ASA.json b/resources/profiles/Custom/filament/My Generic ASA.json
index 1de19ac1f40..51304d26ae2 100644
--- a/resources/profiles/Custom/filament/My Generic ASA.json	
+++ b/resources/profiles/Custom/filament/My Generic ASA.json	
@@ -13,9 +13,7 @@
         "12"
     ],
     "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic PA-CF.json b/resources/profiles/Custom/filament/My Generic PA-CF.json
index 182dff20797..e2b12590dad 100644
--- a/resources/profiles/Custom/filament/My Generic PA-CF.json	
+++ b/resources/profiles/Custom/filament/My Generic PA-CF.json	
@@ -19,9 +19,7 @@
         "8"
     ],
 "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic PA.json b/resources/profiles/Custom/filament/My Generic PA.json
index 251cc7a8a36..6f4f15592fc 100644
--- a/resources/profiles/Custom/filament/My Generic PA.json	
+++ b/resources/profiles/Custom/filament/My Generic PA.json	
@@ -16,9 +16,7 @@
         "12"
     ],
 "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic PC.json b/resources/profiles/Custom/filament/My Generic PC.json
index 2033235e91b..2bb3b68ff08 100644
--- a/resources/profiles/Custom/filament/My Generic PC.json	
+++ b/resources/profiles/Custom/filament/My Generic PC.json	
@@ -13,9 +13,7 @@
         "0.94"
     ],
 "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic PETG.json b/resources/profiles/Custom/filament/My Generic PETG.json
index 4ad5202782f..35c9957cd65 100644
--- a/resources/profiles/Custom/filament/My Generic PETG.json	
+++ b/resources/profiles/Custom/filament/My Generic PETG.json	
@@ -43,9 +43,7 @@
         "; filament start gcode\n"
     ],
     "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic PLA-CF.json b/resources/profiles/Custom/filament/My Generic PLA-CF.json
index ed18b270f96..ea9dffb366c 100644
--- a/resources/profiles/Custom/filament/My Generic PLA-CF.json	
+++ b/resources/profiles/Custom/filament/My Generic PLA-CF.json	
@@ -19,9 +19,7 @@
         "7"
     ],
 "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic PLA.json b/resources/profiles/Custom/filament/My Generic PLA.json
index 7518e0da087..0c9dcc4144f 100644
--- a/resources/profiles/Custom/filament/My Generic PLA.json	
+++ b/resources/profiles/Custom/filament/My Generic PLA.json	
@@ -16,9 +16,7 @@
         "8"
     ],
     "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic PVA.json b/resources/profiles/Custom/filament/My Generic PVA.json
index aa4685c7ff6..546acc85c0f 100644
--- a/resources/profiles/Custom/filament/My Generic PVA.json	
+++ b/resources/profiles/Custom/filament/My Generic PVA.json	
@@ -19,9 +19,7 @@
         "10"
     ],
     "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/filament/My Generic TPU.json b/resources/profiles/Custom/filament/My Generic TPU.json
index 7db0fa80e77..a6a6fc4f162 100644
--- a/resources/profiles/Custom/filament/My Generic TPU.json	
+++ b/resources/profiles/Custom/filament/My Generic TPU.json	
@@ -10,9 +10,7 @@
         "3.2"
     ],
     "compatible_printers": [
-
       "MyKlipper 0.4 nozzle",
-      "MyMarlin 0.4 nozzle",
-      "OrcaArena 0.4 nozzle"
+      "MyMarlin 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json
index ea82f3f8dba..6a185da8a6d 100644
--- a/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json	
+++ b/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json	
@@ -5,7 +5,7 @@
   "from": "system",
   "instantiation": "true",
   "inherits": "fdm_klipper_common",
-  "printer_model": "MyKlipper",
+  "printer_model": "Generaic Klipper Printer",
   "nozzle_diameter": [
     "0.4"
   ],
diff --git a/resources/profiles/Custom/machine/MyKlipper.json b/resources/profiles/Custom/machine/MyKlipper.json
index 3a89008b21b..401e7f63df4 100644
--- a/resources/profiles/Custom/machine/MyKlipper.json
+++ b/resources/profiles/Custom/machine/MyKlipper.json
@@ -1,6 +1,6 @@
 {
     "type": "machine_model",
-    "name": "MyKlipper",
+    "name": "Generaic Klipper Printer",
     "model_id": "my_klipper_01",
     "nozzle_diameter": "0.4",
     "machine_tech": "FFF",
diff --git a/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json b/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json
index 347d5a049ab..422bc8854e9 100644
--- a/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json	
+++ b/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json	
@@ -5,7 +5,7 @@
   "from": "system",
   "instantiation": "true",
   "inherits": "fdm_machine_common",
-  "printer_model": "MyMarlin",
+  "printer_model": "Generic Marlin Printer",
   "gcode_flavor": "marlin",
   "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-34.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y105 F3000 ; park print head\nM84 ; disable motors",
   "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 ; home all\nG1 Y1.0 Z0.3 F1000 ; move print head up\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG92 E0.0\n; initial load\nG1 X205.0 E19 F1000\nG1 Y1.6\nG1 X5.0 E19 F1000\nG92 E0.0\n; intro line\nG1 Y2.0 Z0.2 F1000\nG1 X65.0 E9.0 F1000\nG1 X105.0 E12.5 F1000\nG92 E0.0",
diff --git a/resources/profiles/Custom/machine/MyMarlin.json b/resources/profiles/Custom/machine/MyMarlin.json
index 2a29bf49240..7f9314f9faf 100644
--- a/resources/profiles/Custom/machine/MyMarlin.json
+++ b/resources/profiles/Custom/machine/MyMarlin.json
@@ -1,6 +1,6 @@
 {
     "type": "machine_model",
-    "name": "MyMarlin",
+    "name": "Generic Marlin Printer",
     "model_id": "my_marlin_01",
     "nozzle_diameter": "0.4",
     "machine_tech": "FFF",
diff --git a/resources/profiles/Custom/machine/fdm_klipper_common.json b/resources/profiles/Custom/machine/fdm_klipper_common.json
index 42e2262a54b..610d1e92685 100644
--- a/resources/profiles/Custom/machine/fdm_klipper_common.json
+++ b/resources/profiles/Custom/machine/fdm_klipper_common.json
@@ -74,7 +74,7 @@
     "0"
   ],
   "max_layer_height": [
-    "0.28"
+    "0.32"
   ],
   "min_layer_height": [
     "0.08"
@@ -120,7 +120,6 @@
   "silent_mode": "0",
   "single_extruder_multi_material": "1",
   "change_filament_gcode": "",
-  "machine_pause_gcode": "PAUSE",
   "wipe": [
     "1"
   ],
@@ -135,6 +134,7 @@
   "machine_end_gcode": "PRINT_END",
   "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
   "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+  "machine_pause_gcode": "PAUSE",
   "scan_first_layer": "0",
   "nozzle_type": "undefine",
   "auxiliary_fan": "0"
diff --git a/resources/profiles/Custom/machine/fdm_machine_common.json b/resources/profiles/Custom/machine/fdm_machine_common.json
index 11128c1dbcc..76cfe3d36c7 100644
--- a/resources/profiles/Custom/machine/fdm_machine_common.json
+++ b/resources/profiles/Custom/machine/fdm_machine_common.json
@@ -112,5 +112,8 @@
     ],
     "default_print_profile": "",
     "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
-    "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end"
+    "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end",
+    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
+    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+    "machine_pause_gcode": "M601"
 }
diff --git a/resources/profiles/OrcaArena.json b/resources/profiles/OrcaArena.json
index df227683688..e1dc5d09c66 100644
--- a/resources/profiles/OrcaArena.json
+++ b/resources/profiles/OrcaArena.json
@@ -91,58 +91,10 @@
             "name": "0.30mm Standard @Arena X1C 0.6 nozzle",
             "sub_path": "process/0.30mm Standard @Arena X1C 0.6 nozzle.json"
         },
-        {
-            "name": "0.30mm Standard @Arena X1 0.6 nozzle",
-            "sub_path": "process/0.30mm Standard @Arena X1 0.6 nozzle.json"
-        },
         {
             "name": "0.40mm Standard @Arena X1C 0.8 nozzle",
             "sub_path": "process/0.40mm Standard @Arena X1C 0.8 nozzle.json"
         },
-        {
-            "name": "0.40mm Standard @Arena X1 0.8 nozzle",
-            "sub_path": "process/0.40mm Standard @Arena X1 0.8 nozzle.json"
-        },
-        {
-            "name":"0.10mm Standard @Arena P1P 0.2 nozzle",
-            "sub_path":"process/0.10mm Standard @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"0.20mm Standard @Arena P1P",
-            "sub_path":"process/0.20mm Standard @Arena P1P.json"
-        },
-        {
-            "name":"0.30mm Standard @Arena P1P 0.6 nozzle",
-            "sub_path":"process/0.30mm Standard @Arena P1P 0.6 nozzle.json"
-        },
-        {
-            "name":"0.08mm Extra Fine @Arena P1P",
-            "sub_path":"process/0.08mm Extra Fine @Arena P1P.json"
-        },
-        {
-            "name":"0.12mm Fine @Arena P1P",
-            "sub_path":"process/0.12mm Fine @Arena P1P.json"
-        },
-        {
-            "name":"0.16mm Optimal @Arena P1P",
-            "sub_path":"process/0.16mm Optimal @Arena P1P.json"
-        },
-        {
-            "name":"0.20mm Strength @Arena P1P",
-            "sub_path":"process/0.20mm Strength @Arena P1P.json"
-        },
-        {
-            "name":"0.24mm Draft @Arena P1P",
-            "sub_path":"process/0.24mm Draft @Arena P1P.json"
-        },
-        {
-            "name":"0.28mm Extra Draft @Arena P1P",
-            "sub_path":"process/0.28mm Extra Draft @Arena P1P.json"
-        },
-        {
-            "name":"0.40mm Standard @Arena P1P 0.8 nozzle",
-            "sub_path":"process/0.40mm Standard @Arena P1P 0.8 nozzle.json"
-        },
         {
             "name": "fdm_process_bbl_0.06_nozzle_0.2",
             "sub_path": "process/fdm_process_bbl_0.06_nozzle_0.2.json"
@@ -441,10 +393,6 @@
             "name": "Generic PETG-CF @Arena X1C",
             "sub_path": "filament/Generic PETG-CF @Arena X1C.json"
         },
-        {
-            "name": "Generic PETG-CF @Arena P1P",
-            "sub_path": "filament/P1P/Generic PETG-CF @Arena P1P.json"
-        },
         {
             "name": "Arena PETG-CF @base",
             "sub_path": "filament/Arena PETG-CF @base.json"
@@ -453,10 +401,6 @@
             "name": "Arena PETG-CF @Arena X1C",
             "sub_path": "filament/Arena PETG-CF @Arena X1C.json"
         },
-        {
-            "name": "Arena PETG-CF @Arena P1P",
-            "sub_path": "filament/P1P/Arena PETG-CF @Arena P1P.json"
-        },
         {
             "name": "Generic PVA @0.2 nozzle",
             "sub_path": "filament/Generic PVA @0.2 nozzle.json"
@@ -477,10 +421,6 @@
             "name": "Arena TPU 95A @Arena X1C",
             "sub_path": "filament/Arena TPU 95A @Arena X1C.json"
         },
-        {
-            "name": "Arena TPU 95A @Arena X1",
-            "sub_path": "filament/Arena TPU 95A @Arena X1.json"
-        },
         {
             "name": "Arena PLA Matte @Arena X1C",
             "sub_path": "filament/Arena PLA Matte @Arena X1C.json"
@@ -493,10 +433,6 @@
             "name": "Arena PLA Matte @Arena X1C 0.8 nozzle",
             "sub_path": "filament/Arena PLA Matte @Arena X1C 0.8 nozzle.json"
         },
-        {
-            "name": "Arena PLA Matte @Arena X1",
-            "sub_path": "filament/Arena PLA Matte @Arena X1.json"
-        },
         {
             "name": "Arena PLA Basic @Arena X1C",
             "sub_path": "filament/Arena PLA Basic @Arena X1C.json"
@@ -509,10 +445,6 @@
             "name": "Arena PLA Basic @Arena X1C 0.8 nozzle",
             "sub_path": "filament/Arena PLA Basic @Arena X1C 0.8 nozzle.json"
         },
-        {
-            "name": "Arena PLA Basic @Arena X1",
-            "sub_path": "filament/Arena PLA Basic @Arena X1.json"
-        },
         {
             "name": "Arena PLA Tough @Arena X1C",
             "sub_path": "filament/Arena PLA Tough @Arena X1C.json"
@@ -521,30 +453,14 @@
             "name": "Arena PLA Tough @Arena X1C 0.2 nozzle",
             "sub_path": "filament/Arena PLA Tough @Arena X1C 0.2 nozzle.json"
         },
-        {
-            "name": "Arena PLA Tough @Arena X1",
-            "sub_path": "filament/Arena PLA Tough @Arena X1.json"
-        },
-        {
-            "name": "Arena PLA Marble @Arena X1",
-            "sub_path": "filament/Arena PLA Marble @Arena X1.json"
-        },
         {
             "name": "Arena PLA Marble @Arena X1C",
             "sub_path": "filament/Arena PLA Marble @Arena X1C.json"
         },
-        {
-            "name": "Arena PLA Sparkle @Arena X1",
-            "sub_path": "filament/Arena PLA Sparkle @Arena X1.json"
-        },
         {
             "name": "Arena PLA Sparkle @Arena X1C",
             "sub_path": "filament/Arena PLA Sparkle @Arena X1C.json"
         },
-        {
-            "name": "Arena PLA Silk @Arena X1",
-            "sub_path": "filament/Arena PLA Silk @Arena X1.json"
-        },
         {
             "name": "Arena PLA Silk @Arena X1C 0.2 nozzle",
             "sub_path": "filament/Arena PLA Silk @Arena X1C 0.2 nozzle.json"
@@ -553,14 +469,6 @@
             "name": "Arena PLA Silk @Arena X1C",
             "sub_path": "filament/Arena PLA Silk @Arena X1C.json"
         },
-        {
-            "name": "Arena PLA Silk @Arena P1P",
-            "sub_path": "filament/P1P/Arena PLA Silk @Arena P1P.json"
-        },
-        {
-            "name": "Arena PLA Silk @Arena P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Arena PLA Silk @Arena P1P 0.2 nozzle.json"
-        },
         {
             "name": "Arena PETG Basic @Arena X1C",
             "sub_path": "filament/Arena PETG Basic @Arena X1C.json"
@@ -593,10 +501,6 @@
             "name": "Arena Support W @Arena X1C 0.2 nozzle",
             "sub_path": "filament/Arena Support W @Arena X1C 0.2 nozzle.json"
         },
-        {
-            "name": "Arena Support W @Arena X1",
-            "sub_path": "filament/Arena Support W @Arena X1.json"
-        },
         {
             "name": "Arena Support G @Arena X1C",
             "sub_path": "filament/Arena Support G @Arena X1C.json"
@@ -625,18 +529,10 @@
             "name": "PolyLite PLA @Arena X1C",
             "sub_path": "filament/PolyLite PLA @Arena X1C.json"
         },
-        {
-            "name": "PolyLite PLA @Arena X1",
-            "sub_path": "filament/PolyLite PLA @Arena X1.json"
-        },
         {
             "name": "PolyTerra PLA @Arena X1C",
             "sub_path": "filament/PolyTerra PLA @Arena X1C.json"
         },
-        {
-            "name": "PolyTerra PLA @Arena X1",
-            "sub_path": "filament/PolyTerra PLA @Arena X1.json"
-        },
         {
             "name": "PolyTerra PLA @Arena X1C 0.2 nozzle",
             "sub_path": "filament/PolyTerra PLA @Arena X1C 0.2 nozzle.json"
@@ -645,106 +541,6 @@
             "name": "PolyLite PLA @Arena X1C 0.2 nozzle",
             "sub_path": "filament/PolyLite PLA @Arena X1C 0.2 nozzle.json"
         },
-        {
-            "name":"Arena Support G @Arena P1P",
-            "sub_path":"filament/P1P/Arena Support G @Arena P1P.json"
-        },
-        {
-            "name": "Arena ABS @Arena P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Arena ABS @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Arena PLA Matte @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/Arena PLA Matte @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Arena PLA Matte @Arena P1P",
-            "sub_path":"filament/P1P/Arena PLA Matte @Arena P1P.json"
-        },
-        {
-            "name":"Arena PLA Basic @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/Arena PLA Basic @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Arena PLA Basic @Arena P1P",
-            "sub_path":"filament/P1P/Arena PLA Basic @Arena P1P.json"
-        },
-        {
-            "name":"Arena PLA Tough @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/Arena PLA Tough @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Arena PLA Tough @Arena P1P",
-            "sub_path":"filament/P1P/Arena PLA Tough @Arena P1P.json"
-        },
-        {
-            "name":"Arena PLA Marble @Arena P1P",
-            "sub_path":"filament/P1P/Arena PLA Marble @Arena P1P.json"
-        },
-        {
-            "name":"Arena PLA Sparkle @Arena P1P",
-            "sub_path":"filament/P1P/Arena PLA Sparkle @Arena P1P.json"
-        },
-        {
-            "name": "Arena ABS @Arena P1P",
-            "sub_path": "filament/P1P/Arena ABS @Arena P1P.json"
-        },
-        {
-            "name": "Arena PC @Arena P1P",
-            "sub_path": "filament/P1P/Arena PC @Arena P1P.json"
-        },
-        {
-            "name": "Arena PC @Arena P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Arena PC @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Arena Support W @Arena P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Arena Support W @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Arena TPU 95A @Arena P1P",
-            "sub_path":"filament/P1P/Arena TPU 95A @Arena P1P.json"
-        },
-        {
-            "name": "Arena Support W @Arena P1P",
-            "sub_path": "filament/P1P/Arena Support W @Arena P1P.json"
-        },
-        {
-            "name":"Generic PLA @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/Generic PLA @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Generic PLA @Arena P1P",
-            "sub_path":"filament/P1P/Generic PLA @Arena P1P.json"
-        },
-        {
-            "name":"Generic PLA Silk @Arena P1P",
-            "sub_path":"filament/P1P/Generic PLA Silk @Arena P1P.json"
-        },
-        {
-            "name": "Generic ABS @Arena P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Generic ABS @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Generic ABS @Arena P1P",
-            "sub_path": "filament/P1P/Generic ABS @Arena P1P.json"
-        },
-        {
-            "name": "Generic ASA @Arena P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Generic ASA @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Generic ASA @Arena P1P",
-            "sub_path": "filament/P1P/Generic ASA @Arena P1P.json"
-        },
-        {
-            "name": "Generic PC @Arena P1P 0.2 nozzle",
-            "sub_path": "filament/P1P/Generic PC @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name": "Generic PC @Arena P1P",
-            "sub_path": "filament/P1P/Generic PC @Arena P1P.json"
-        },
         {
             "name":"Generic PETG @0.2 nozzle",
             "sub_path":"filament/Generic PETG @0.2 nozzle.json"
@@ -753,10 +549,6 @@
             "name":"Arena PLA Metal @Arena X1C 0.2 nozzle",
             "sub_path":"filament/Arena PLA Metal @Arena X1C 0.2 nozzle.json"
         },
-        {
-            "name":"Arena PLA Metal @Arena X1",
-            "sub_path":"filament/Arena PLA Metal @Arena X1.json"
-        },
         {
             "name":"Arena PLA Metal @Arena X1C",
             "sub_path":"filament/Arena PLA Metal @Arena X1C.json"
@@ -780,86 +572,6 @@
         {
             "name":"Arena PAHT-CF @Arena X1C",
             "sub_path":"filament/Arena PAHT-CF @Arena X1C.json"
-        },
-        {
-            "name": "Generic PETG @Arena P1P",
-            "sub_path": "filament/P1P/Generic PETG @Arena P1P.json"
-        },
-        {
-            "name":"Generic PVA @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/Generic PVA @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Generic PVA @Arena P1P",
-            "sub_path":"filament/P1P/Generic PVA @Arena P1P.json"
-        },
-        {
-            "name":"Generic TPU @Arena P1P",
-            "sub_path":"filament/P1P/Generic TPU @Arena P1P.json"
-        },
-        {
-            "name":"PolyLite PLA @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/PolyLite PLA @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"PolyLite PLA @Arena P1P",
-            "sub_path":"filament/P1P/PolyLite PLA @Arena P1P.json"
-        },
-        {
-            "name":"PolyTerra PLA @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/PolyTerra PLA @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"PolyTerra PLA @Arena P1P",
-            "sub_path":"filament/P1P/PolyTerra PLA @Arena P1P.json"
-        },
-        {
-            "name":"Arena PA-CF @Arena P1P",
-            "sub_path":"filament/P1P/Arena PA-CF @Arena P1P.json"
-        },
-        {
-            "name":"Generic PA-CF @Arena P1P",
-            "sub_path":"filament/P1P/Generic PA-CF @Arena P1P.json"
-        },
-        {
-            "name":"Generic PA @Arena P1P",
-            "sub_path":"filament/P1P/Generic PA @Arena P1P.json"
-        },
-        {
-            "name":"Generic PETG @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/Generic PETG @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Arena PAHT-CF @Arena P1P",
-            "sub_path":"filament/P1P/Arena PAHT-CF @Arena P1P.json"
-        },
-        {
-            "name":"Arena PLA Metal @Arena P1P 0.2 nozzle",
-            "sub_path":"filament/P1P/Arena PLA Metal @Arena P1P 0.2 nozzle.json"
-        },
-        {
-            "name":"Arena PLA Metal @Arena P1P",
-            "sub_path":"filament/P1P/Arena PLA Metal @Arena P1P.json"
-        },
-        {
-            "name":"Arena PLA-CF @Arena P1P",
-            "sub_path":"filament/P1P/Arena PLA-CF @Arena P1P.json"
-        },
-        {
-            "name":"Generic PLA-CF @Arena P1P",
-            "sub_path":"filament/P1P/Generic PLA-CF @Arena P1P.json"
-        },
-        {
-            "name":"Arena PLA-CF @Arena P1P 0.8 nozzle",
-            "sub_path":"filament/P1P/Arena PLA-CF @Arena P1P 0.8 nozzle.json"
-        },
-        {
-            "name": "Arena PET-CF @Arena X1C",
-            "sub_path": "filament/Arena PET-CF @Arena X1C.json"
-        },
-        {
-            "name": "Arena PET-CF @Arena P1P",
-            "sub_path": "filament/P1P/Arena PET-CF @Arena P1P.json"
         }
     ],
     "machine_list": [
diff --git a/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C 0.2 nozzle.json
index 5a06ff3d481..1f9ad3d80fd 100644
--- a/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C 0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "2"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C 0.8 nozzle.json b/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C 0.8 nozzle.json
index 1298959165a..ed86f94cfdf 100644
--- a/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C 0.8 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C 0.8 nozzle.json	
@@ -15,7 +15,6 @@
         "10"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C.json
index bd3f1d957cf..12b97cd8969 100644
--- a/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena ABS @Arena X1C.json	
@@ -10,8 +10,6 @@
     ],
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 0.6 nozzle"
+      "Orca Arena X1 Carbon 0.6 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PA-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena PA-CF @Arena X1C.json
index e129f98769e..aafb020af45 100644
--- a/resources/profiles/OrcaArena/filament/Arena PA-CF @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PA-CF @Arena X1C.json	
@@ -29,9 +29,6 @@
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PAHT-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena PAHT-CF @Arena X1C.json
index 6d097ccb4fa..f5163d5c44c 100644
--- a/resources/profiles/OrcaArena/filament/Arena PAHT-CF @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PAHT-CF @Arena X1C.json	
@@ -8,9 +8,6 @@
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.2 nozzle.json
index d7e90f75a84..3deffd93d25 100644
--- a/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.2 nozzle.json	
@@ -12,7 +12,6 @@
         "260"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.6 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.6 nozzle.json
index 443047a319b..617080d1d25 100644
--- a/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.6 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.6 nozzle.json	
@@ -9,7 +9,6 @@
         "260"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 0.6 nozzle"
+      "Orca Arena X1 Carbon 0.6 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.8 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.8 nozzle.json
index b3ee2581c1c..69dadb3c4de 100644
--- a/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.8 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C 0.8 nozzle.json	
@@ -9,7 +9,6 @@
         "260"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C.json
index 824f75243d4..bca6edfb24c 100644
--- a/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PC @Arena X1C.json	
@@ -6,7 +6,6 @@
     "instantiation": "true",
     "inherits": "Arena PC @base",
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle"
+      "Orca Arena X1 Carbon 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PET-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena PET-CF @Arena X1C.json
index 02e978defe9..2da1c701117 100644
--- a/resources/profiles/OrcaArena/filament/Arena PET-CF @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PET-CF @Arena X1C.json	
@@ -19,10 +19,7 @@
     ],
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C 0.2 nozzle.json
index 9eee236d9a7..616ed706143 100644
--- a/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C 0.2 nozzle.json	
@@ -9,8 +9,6 @@
     "1"
   ],
   "compatible_printers": [
-    "Orca Arena X1 Carbon 0.2 nozzle",
-    "Orca Arena X1 0.2 nozzle",
-    "Orca Arena P1P 0.2 nozzle"
+    "Orca Arena X1 Carbon 0.2 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C 0.8 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C 0.8 nozzle.json
index 71664535b85..96b4176928f 100644
--- a/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C 0.8 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C 0.8 nozzle.json	
@@ -16,10 +16,6 @@
   ],
   "compatible_printers": [
     "Orca Arena X1 Carbon 0.6 nozzle",
-    "Orca Arena X1 0.6 nozzle",
-    "Orca Arena P1P 0.6 nozzle",
-    "Orca Arena X1 Carbon 0.8 nozzle",
-    "Orca Arena X1 0.8 nozzle",
-    "Orca Arena P1P 0.8 nozzle"
+    "Orca Arena X1 Carbon 0.8 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C.json
index 38df9b1a24f..5169049047e 100644
--- a/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PETG Basic @Arena X1C.json	
@@ -9,8 +9,6 @@
     "14"
   ],
   "compatible_printers": [
-    "Orca Arena X1 Carbon 0.4 nozzle",
-    "Orca Arena X1 0.4 nozzle",
-    "Orca Arena P1P 0.4 nozzle"
+    "Orca Arena X1 Carbon 0.4 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PETG-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena PETG-CF @Arena X1C.json
index aad74d17e3e..a9f47536157 100644
--- a/resources/profiles/OrcaArena/filament/Arena PETG-CF @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PETG-CF @Arena X1C.json	
@@ -7,10 +7,7 @@
   "inherits": "Arena PETG-CF @base",
   "compatible_printers": [
     "Orca Arena X1 Carbon 0.4 nozzle",
-    "Orca Arena X1 0.4 nozzle",
     "Orca Arena X1 Carbon 0.6 nozzle",
-    "Orca Arena X1 Carbon 0.8 nozzle",
-    "Orca Arena X1 0.6 nozzle",
-    "Orca Arena X1 0.8 nozzle"
+    "Orca Arena X1 Carbon 0.8 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1.json
index 2c2ae14d288..3ccf84cbc1d 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1.json	
@@ -12,8 +12,7 @@
         "8"
     ],
     "compatible_printers": [
-        "Orca Arena X1 0.4 nozzle",
-        "Orca Arena X1 0.6 nozzle",
+          
         "Orca Arena X1 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1C 0.2 nozzle.json
index 4d2039c184e..0815e6d2593 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1C 0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "2"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Impact @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena PLA Impact @Arena X1C.json
index 5f522418d8a..7de8bd9a141 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Impact @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Impact @Arena X1C.json	
@@ -9,7 +9,6 @@
         "23.2"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle"
+      "Orca Arena X1 Carbon 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Marble @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Marble @Arena X1.json
index a2c70bb6ed3..04cc65cc1b6 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Marble @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Marble @Arena X1.json	
@@ -9,8 +9,6 @@
         "8"
     ],
     "compatible_printers": [
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
       "Orca Arena X1 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1.json
index 6352583f1e6..3d2ef8ff723 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1.json	
@@ -12,8 +12,6 @@
         "8"
     ],
     "compatible_printers": [
-        "Orca Arena X1 0.4 nozzle",
-        "Orca Arena X1 0.6 nozzle",
-        "Orca Arena X1 0.8 nozzle"
+          "Orca Arena X1 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1C 0.2 nozzle.json
index 170bad64ce3..c17e8f097a5 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1C 0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "2"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1.json
index dca6d638514..c0f14fba95d 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1.json	
@@ -12,8 +12,6 @@
         "8"
     ],
     "compatible_printers": [
-        "Orca Arena X1 0.4 nozzle",
-        "Orca Arena X1 0.6 nozzle",
-        "Orca Arena X1 0.8 nozzle"
+          "Orca Arena X1 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1C 0.2 nozzle.json
index 4879e013298..2816922e338 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1C 0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "2"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1.json
index 2c841174365..1f22d4fae55 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1.json	
@@ -12,8 +12,6 @@
     "8"
   ],
   "compatible_printers": [
-    "Orca Arena X1 0.4 nozzle",
-    "Orca Arena X1 0.6 nozzle",
-    "Orca Arena X1 0.8 nozzle"
+    "Orca Arena X1 0.4 nozzle"
   ]
 }
\ No newline at end of file
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1C 0.2 nozzle.json
index ec1d6f08c79..cd8325e683b 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1C 0.2 nozzle.json	
@@ -9,7 +9,6 @@
       "2"
   ],
   "compatible_printers": [
-    "Orca Arena X1 Carbon 0.2 nozzle",
-    "Orca Arena X1 0.2 nozzle"
+    "Orca Arena X1 Carbon 0.2 nozzle"
   ]
 }
\ No newline at end of file
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @Arena X1.json
index 5bb2a215323..4b06eac3596 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @Arena X1.json	
@@ -9,8 +9,6 @@
         "8"
     ],
     "compatible_printers": [
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+    "Orca Arena X1 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1.json
index abd64efc9a5..d31e6befb87 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1.json	
@@ -12,8 +12,6 @@
         "8"
     ],
     "compatible_printers": [
-        "Orca Arena X1 0.4 nozzle",
-        "Orca Arena X1 0.6 nozzle",
-        "Orca Arena X1 0.8 nozzle"
+          "Orca Arena X1 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1C 0.2 nozzle.json
index 374ba187f7d..b86e0ba9a6b 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1C 0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "2"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA-CF @Arena X1C 0.8 nozzle.json b/resources/profiles/OrcaArena/filament/Arena PLA-CF @Arena X1C 0.8 nozzle.json
index 53261ff5ba3..6462541f433 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA-CF @Arena X1C 0.8 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA-CF @Arena X1C 0.8 nozzle.json	
@@ -16,8 +16,6 @@
     ],
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena PLA-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena PLA-CF @Arena X1C.json
index cafa42e39e8..4d9e1004bb2 100644
--- a/resources/profiles/OrcaArena/filament/Arena PLA-CF @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena PLA-CF @Arena X1C.json	
@@ -15,7 +15,6 @@
       "230"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle"
+      "Orca Arena X1 Carbon 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena Support G @Arena X1C.json b/resources/profiles/OrcaArena/filament/Arena Support G @Arena X1C.json
index 13c2e3568de..538caaeee9a 100644
--- a/resources/profiles/OrcaArena/filament/Arena Support G @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Arena Support G @Arena X1C.json	
@@ -8,9 +8,6 @@
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1.json
index 4b8f0897f78..95ce73c17b5 100644
--- a/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1.json	
@@ -6,8 +6,6 @@
     "instantiation": "true",
     "inherits": "Arena Support W @base",
     "compatible_printers": [
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+    "Orca Arena X1 0.8 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1C 0.2 nozzle.json
index d8fe244c1b3..041328b4c74 100644
--- a/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1C 0.2 nozzle.json	
@@ -15,7 +15,6 @@
         "240"
     ],
     "compatible_printers": [
-        "Orca Arena X1 Carbon 0.2 nozzle",
-        "Orca Arena X1 0.2 nozzle"
+        "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/OrcaArena/filament/Arena TPU 95A @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena TPU 95A @Arena X1.json
index e5165f16599..36e72800cec 100644
--- a/resources/profiles/OrcaArena/filament/Arena TPU 95A @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/Arena TPU 95A @Arena X1.json	
@@ -9,8 +9,6 @@
         "3.6"
     ],
     "compatible_printers": [
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+    "Orca Arena X1 0.8 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json
index 09402bddb74..bccc573e80d 100644
--- a/resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "2"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic ABS.json b/resources/profiles/OrcaArena/filament/Generic ABS.json
index 65e508d1a4e..e37b104d620 100644
--- a/resources/profiles/OrcaArena/filament/Generic ABS.json	
+++ b/resources/profiles/OrcaArena/filament/Generic ABS.json	
@@ -7,10 +7,7 @@
     "inherits": "Generic ABS @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json
index c70490a6182..667287b51b8 100644
--- a/resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "2"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic ASA.json b/resources/profiles/OrcaArena/filament/Generic ASA.json
index 62e9fa7555e..1155e485ac5 100644
--- a/resources/profiles/OrcaArena/filament/Generic ASA.json	
+++ b/resources/profiles/OrcaArena/filament/Generic ASA.json	
@@ -7,10 +7,7 @@
     "inherits": "Generic ASA @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PA-CF.json b/resources/profiles/OrcaArena/filament/Generic PA-CF.json
index d01983316cc..24756fe1c67 100644
--- a/resources/profiles/OrcaArena/filament/Generic PA-CF.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PA-CF.json	
@@ -39,9 +39,6 @@
     "compatible_printers": [
         "Orca Arena X1 Carbon 0.4 nozzle",
         "Orca Arena X1 Carbon 0.6 nozzle",
-        "Orca Arena X1 Carbon 0.8 nozzle",
-        "Orca Arena X1 0.4 nozzle",
-        "Orca Arena X1 0.6 nozzle",
-        "Orca Arena X1 0.8 nozzle"
+        "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PA.json b/resources/profiles/OrcaArena/filament/Generic PA.json
index e29ff7fc95a..ae32f871137 100644
--- a/resources/profiles/OrcaArena/filament/Generic PA.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PA.json	
@@ -21,9 +21,6 @@
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json
index a7a523fcf47..1e4998246ff 100644
--- a/resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "1"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PC.json b/resources/profiles/OrcaArena/filament/Generic PC.json
index e6c94248eb0..6e40cc6a44e 100644
--- a/resources/profiles/OrcaArena/filament/Generic PC.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PC.json	
@@ -8,9 +8,6 @@
   "compatible_printers": [
     "Orca Arena X1 Carbon 0.4 nozzle",
     "Orca Arena X1 Carbon 0.6 nozzle",
-    "Orca Arena X1 Carbon 0.8 nozzle",
-    "Orca Arena X1 0.4 nozzle",
-    "Orca Arena X1 0.6 nozzle",
-    "Orca Arena X1 0.8 nozzle"
+    "Orca Arena X1 Carbon 0.8 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json
index d04a375f812..ff6d76438da 100644
--- a/resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json	
@@ -9,7 +9,6 @@
       "1"
     ],
     "compatible_printers": [
-        "Orca Arena X1 Carbon 0.2 nozzle",
-        "Orca Arena X1 0.2 nozzle"
+        "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json
index 74752ae8c95..f4e0c713d42 100644
--- a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json	
@@ -7,10 +7,7 @@
   "inherits": "Generic PETG-CF @base",
   "compatible_printers": [
     "Orca Arena X1 Carbon 0.4 nozzle",
-    "Orca Arena X1 0.4 nozzle",
     "Orca Arena X1 Carbon 0.6 nozzle",
-    "Orca Arena X1 Carbon 0.8 nozzle",
-    "Orca Arena X1 0.6 nozzle",
-    "Orca Arena X1 0.8 nozzle"
+    "Orca Arena X1 Carbon 0.8 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PETG.json b/resources/profiles/OrcaArena/filament/Generic PETG.json
index 66cb830c19d..6c180bd2d2d 100644
--- a/resources/profiles/OrcaArena/filament/Generic PETG.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PETG.json	
@@ -7,10 +7,7 @@
     "inherits": "Generic PETG @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json
index 201f3f9dcb6..6695ad062d0 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json	
@@ -12,7 +12,6 @@
       "; filament start gcode\n{if  (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA Silk.json b/resources/profiles/OrcaArena/filament/Generic PLA Silk.json
index c834c9b058e..80d06431a2c 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA Silk.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PLA Silk.json	
@@ -13,10 +13,7 @@
     ],
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA-CF.json b/resources/profiles/OrcaArena/filament/Generic PLA-CF.json
index 217ba7c055a..fe217605ca4 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA-CF.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PLA-CF.json	
@@ -8,9 +8,6 @@
     "compatible_printers": [
         "Orca Arena X1 Carbon 0.4 nozzle",
         "Orca Arena X1 Carbon 0.6 nozzle",
-        "Orca Arena X1 Carbon 0.8 nozzle",
-        "Orca Arena X1 0.4 nozzle",
-        "Orca Arena X1 0.6 nozzle",
-        "Orca Arena X1 0.8 nozzle"
+        "Orca Arena X1 Carbon 0.8 nozzle"
       ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA.json b/resources/profiles/OrcaArena/filament/Generic PLA.json
index 7fb5ff27b3e..d8d2983ad13 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PLA.json	
@@ -7,10 +7,7 @@
     "inherits": "Generic PLA @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json
index 33f022a43c1..9988ae406a3 100644
--- a/resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "0.5"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic PVA.json b/resources/profiles/OrcaArena/filament/Generic PVA.json
index 5783312558f..1d6dd63cdfd 100644
--- a/resources/profiles/OrcaArena/filament/Generic PVA.json	
+++ b/resources/profiles/OrcaArena/filament/Generic PVA.json	
@@ -7,10 +7,7 @@
     "inherits": "Generic PVA @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
-      "Orca Arena X1 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
-      "Orca Arena X1 Carbon 0.8 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle"
+      "Orca Arena X1 Carbon 0.8 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/Generic TPU.json b/resources/profiles/OrcaArena/filament/Generic TPU.json
index 93aa793de97..3c6b2e90e64 100644
--- a/resources/profiles/OrcaArena/filament/Generic TPU.json	
+++ b/resources/profiles/OrcaArena/filament/Generic TPU.json	
@@ -13,9 +13,6 @@
       "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}"
     ],
     "compatible_printers": [
-      "Orca Arena X1 0.4 nozzle",
-      "Orca Arena X1 0.6 nozzle",
-      "Orca Arena X1 0.8 nozzle",
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
       "Orca Arena X1 Carbon 0.8 nozzle"
diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PET-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PET-CF @Arena P1P.json
index f3e909bd2ac..4164c8a68e3 100644
--- a/resources/profiles/OrcaArena/filament/P1P/Arena PET-CF @Arena P1P.json	
+++ b/resources/profiles/OrcaArena/filament/P1P/Arena PET-CF @Arena P1P.json	
@@ -18,8 +18,6 @@
       "2"
   ],
   "compatible_printers": [
-    "Orca Arena P1P 0.4 nozzle",
-    "Orca Arena P1P 0.6 nozzle",
-    "Orca Arena P1P 0.8 nozzle"
+    "Orca Arena P1P 0.4 nozzle"
 ]
 }
diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PETG-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PETG-CF @Arena P1P.json
index 65f46101a5f..0cecda5053a 100644
--- a/resources/profiles/OrcaArena/filament/P1P/Arena PETG-CF @Arena P1P.json	
+++ b/resources/profiles/OrcaArena/filament/P1P/Arena PETG-CF @Arena P1P.json	
@@ -6,8 +6,6 @@
   "instantiation": "true",
   "inherits": "Arena PETG-CF @base",
   "compatible_printers": [
-    "Orca Arena P1P 0.4 nozzle",
-    "Orca Arena P1P 0.6 nozzle",
-    "Orca Arena P1P 0.8 nozzle"
+    "Orca Arena P1P 0.4 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P.json
index 29649e295c7..4f525605a6d 100644
--- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P.json	
+++ b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P.json	
@@ -24,8 +24,6 @@
     "65"
   ],
   "compatible_printers": [
-    "Orca Arena P1P 0.4 nozzle",
-    "Orca Arena P1P 0.6 nozzle",
-    "Orca Arena P1P 0.8 nozzle"
+    "Orca Arena P1P 0.4 nozzle"
   ]
 }
\ No newline at end of file
diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PA @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PA @Arena P1P.json
index 3276c66a3de..066d7eb4e07 100644
--- a/resources/profiles/OrcaArena/filament/P1P/Generic PA @Arena P1P.json	
+++ b/resources/profiles/OrcaArena/filament/P1P/Generic PA @Arena P1P.json	
@@ -19,8 +19,6 @@
     "16"
   ],
   "compatible_printers": [
-    "Orca Arena P1P 0.4 nozzle",
-    "Orca Arena P1P 0.6 nozzle",
-    "Orca Arena P1P 0.8 nozzle"
+    "Orca Arena P1P 0.4 nozzle"
 ]  
 }
diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PETG-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PETG-CF @Arena P1P.json
index 049921895a0..1b3e30f73e8 100644
--- a/resources/profiles/OrcaArena/filament/P1P/Generic PETG-CF @Arena P1P.json	
+++ b/resources/profiles/OrcaArena/filament/P1P/Generic PETG-CF @Arena P1P.json	
@@ -6,8 +6,6 @@
   "instantiation": "true",
   "inherits": "Generic PETG-CF @base",
   "compatible_printers": [
-    "Orca Arena P1P 0.4 nozzle",
-    "Orca Arena P1P 0.6 nozzle",
-    "Orca Arena P1P 0.8 nozzle"
+    "Orca Arena P1P 0.4 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PLA-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PLA-CF @Arena P1P.json
index 5fa786ab7ba..4cdd3c70c63 100644
--- a/resources/profiles/OrcaArena/filament/P1P/Generic PLA-CF @Arena P1P.json	
+++ b/resources/profiles/OrcaArena/filament/P1P/Generic PLA-CF @Arena P1P.json	
@@ -18,8 +18,6 @@
     "65"
   ],
   "compatible_printers": [
-    "Orca Arena P1P 0.4 nozzle",
-    "Orca Arena P1P 0.6 nozzle",
-    "Orca Arena P1P 0.8 nozzle"
+    "Orca Arena P1P 0.4 nozzle"
   ]
 }
diff --git a/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1.json b/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1.json
index 81d7143f295..fe3d99ffe08 100644
--- a/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1.json	
@@ -12,8 +12,6 @@
         "8"
     ],
     "compatible_printers": [
-        "Orca Arena X1 0.4 nozzle",
-        "Orca Arena X1 0.6 nozzle",
-        "Orca Arena X1 0.8 nozzle"
+          "Orca Arena X1 0.8 nozzle"
       ]
 }
diff --git a/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1C 0.2 nozzle.json
index 0b1e923beeb..8604c1d72f7 100644
--- a/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1C 0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "1"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1.json b/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1.json
index d0334d94d99..9f457993f5d 100644
--- a/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1.json	
+++ b/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1.json	
@@ -12,8 +12,6 @@
         "8"
     ],
     "compatible_printers": [
-        "Orca Arena X1 0.4 nozzle",
-        "Orca Arena X1 0.6 nozzle",
-        "Orca Arena X1 0.8 nozzle"
+          "Orca Arena X1 0.8 nozzle"
       ]
 }
diff --git a/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1C 0.2 nozzle.json
index d053b76a316..30afdc8cefc 100644
--- a/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1C 0.2 nozzle.json	
@@ -9,7 +9,6 @@
         "1"
     ],
     "compatible_printers": [
-      "Orca Arena X1 Carbon 0.2 nozzle",
-      "Orca Arena X1 0.2 nozzle"
+      "Orca Arena X1 Carbon 0.2 nozzle"
     ]
 }
diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js
index fc7877892e0..2b5ae8bf65d 100644
--- a/resources/web/guide/21/21.js
+++ b/resources/web/guide/21/21.js
@@ -62,7 +62,11 @@ function HandleModelList( pVal )
 			let sVV=strVendor;
 			if( sVV=="BBL" )
 				sVV="Bambu Lab";
-			
+			if( sVV=="Custom")
+				sVV="Custom Printer";
+			if( sVV=="Other")
+				sVV="Orca colosseum";
+
 			let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
 '<div class="BlockBanner">'+
 '	<div class="BannerBtns">'+
@@ -129,12 +133,12 @@ function HandleModelList( pVal )
 		}
 	}	
 
-	let AlreadySelect=$("input:checked");
-	let nSelect=AlreadySelect.length;
-	if(nSelect==0)
-	{
-		$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true);
-	}
+	// let AlreadySelect=$("input:checked");
+	// let nSelect=AlreadySelect.length;
+	// if(nSelect==0)
+	// {
+	// 	$("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
+	// }
 	
 	TranslatePage();
 }
diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js
index b6b38e15995..a9b3bed8471 100644
--- a/resources/web/guide/24/24.js
+++ b/resources/web/guide/24/24.js
@@ -62,7 +62,11 @@ function HandleModelList( pVal )
 			let sVV=strVendor;
 			if( sVV=="BBL" )
 				sVV="Bambu Lab";			
-			
+			if( sVV=="Custom")
+				sVV="Custom Printer";
+			if( sVV=="Other")
+				sVV="Orca colosseum";
+
 			let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
 '<div class="BlockBanner">'+
 '	<div class="BannerBtns">'+
@@ -129,12 +133,12 @@ function HandleModelList( pVal )
 		}
 	}	
 
-	let AlreadySelect=$("input:checked");
-	let nSelect=AlreadySelect.length;
-	if(nSelect==0)
-	{
-		$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true);
-	}
+	// let AlreadySelect=$("input:checked");
+	// let nSelect=AlreadySelect.length;
+	// if(nSelect==0)
+	// {
+	// 	$("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
+	// }
 	
 	TranslatePage();
 }
diff --git a/resources/web/guide/5/index.html b/resources/web/guide/5/index.html
index bcbe6dde2d0..2d2c2b35b14 100644
--- a/resources/web/guide/5/index.html
+++ b/resources/web/guide/5/index.html
@@ -30,7 +30,7 @@
 	
 	
 	
-	<div id="CheckArea"><input id="InstallCheck" onClick="SendInstallPluginCheck()" checked type="checkbox"><a tid="t69" class="trans TextS1">Install Bambu Network Plug-in. </a></div>
+	<div id="CheckArea"><input id="InstallCheck" onClick="SendInstallPluginCheck()" type="checkbox"><a tid="t69" class="trans TextS1">Install Bambu Network Plug-in. </a></div>
 	<div id="RestartText" tid="t70" class="trans" ></div>
 	
 </div>
diff --git a/resources/web/image/printer/1024px-Łuk_w_El_Jem.jpg b/resources/web/image/printer/1024px-Łuk_w_El_Jem.jpg
deleted file mode 100644
index 2a98f3c2fea..00000000000
Binary files a/resources/web/image/printer/1024px-Łuk_w_El_Jem.jpg and /dev/null differ
diff --git a/resources/web/image/printer/MyKlipper_cover.png b/resources/web/image/printer/Generaic Klipper Printer_cover.png
similarity index 100%
rename from resources/web/image/printer/MyKlipper_cover.png
rename to resources/web/image/printer/Generaic Klipper Printer_cover.png
diff --git a/resources/web/image/printer/MyMarlin_cover.png b/resources/web/image/printer/Generic Marlin Printer_cover.png
similarity index 100%
rename from resources/web/image/printer/MyMarlin_cover.png
rename to resources/web/image/printer/Generic Marlin Printer_cover.png
diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp
index e339783f099..30f07ee415e 100644
--- a/src/libslic3r/PresetBundle.cpp
+++ b/src/libslic3r/PresetBundle.cpp
@@ -42,10 +42,10 @@ static std::vector<std::string> s_project_options {
 };
 
 //BBS: add BBL as default
-const char *PresetBundle::BBL_BUNDLE = "BBL";
-const char *PresetBundle::BBL_DEFAULT_PRINTER_MODEL = "Bambu Lab X1 Carbon";
+const char *PresetBundle::BBL_BUNDLE = "Custom";
+const char *PresetBundle::BBL_DEFAULT_PRINTER_MODEL = "";
 const char *PresetBundle::BBL_DEFAULT_PRINTER_VARIANT = "0.4";
-const char *PresetBundle::BBL_DEFAULT_FILAMENT = "Generic PLA";
+const char *PresetBundle::BBL_DEFAULT_FILAMENT = "My Generic PLA";
 
 PresetBundle::PresetBundle()
     : prints(Preset::TYPE_PRINT, Preset::print_options(), static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()))
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index a240ed3e1a5..6d1c4b3112f 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -759,33 +759,33 @@ const std::vector<GCodeViewer::Color> GCodeViewer::Travel_Colors {{
 
 // Normal ranges
 // blue to red
-const std::vector<GCodeViewer::Color> GCodeViewer::Range_Colors{{
-    decode_color_to_float_array("#FF00FF"),  // bluish
-    decode_color_to_float_array("#FF55A9"),
-    decode_color_to_float_array("#FE8778"),
-    decode_color_to_float_array("#FFB847"),
-    decode_color_to_float_array("#FFD925"),
-    decode_color_to_float_array("#FFFF00"),
-    decode_color_to_float_array("#D8FF00"),
-    decode_color_to_float_array("#ADFF04"),
-    decode_color_to_float_array("#76FF01"),
-    decode_color_to_float_array("#52c7b8")    // reddish
-}};
-
-//const std::vector<GCodeViewer::Color> GCodeViewer::Range_Colors {{
-//    {0.043f, 0.173f, 0.478f, 1.0f}, // bluish
-//    {0.075f, 0.349f, 0.522f, 1.0f},
-//    {0.110f, 0.533f, 0.569f, 1.0f},
-//    {0.016f, 0.839f, 0.059f, 1.0f},
-//    {0.667f, 0.949f, 0.000f, 1.0f},
-//    {0.988f, 0.975f, 0.012f, 1.0f},
-//    {0.961f, 0.808f, 0.039f, 1.0f},
-//    //{0.890f, 0.533f, 0.125f, 1.0f},
-//    {0.820f, 0.408f, 0.188f, 1.0f},
-//    {0.761f, 0.322f, 0.235f, 1.0f},
-//    {0.581f, 0.149f, 0.087f, 1.0f} // reddish
+//const std::vector<GCodeViewer::Color> GCodeViewer::Range_Colors{{
+//    decode_color_to_float_array("#FF00FF"),  // bluish
+//    decode_color_to_float_array("#FF55A9"),
+//    decode_color_to_float_array("#FE8778"),
+//    decode_color_to_float_array("#FFB847"),
+//    decode_color_to_float_array("#FFD925"),
+//    decode_color_to_float_array("#FFFF00"),
+//    decode_color_to_float_array("#D8FF00"),
+//    decode_color_to_float_array("#ADFF04"),
+//    decode_color_to_float_array("#76FF01"),
+//    decode_color_to_float_array("#52c7b8")    // reddish
 //}};
 
+const std::vector<ColorRGBA> GCodeViewer::Range_Colors{ {
+    { 0.043f, 0.173f, 0.478f, 1.0f }, // bluish
+    { 0.075f, 0.349f, 0.522f, 1.0f },
+    { 0.110f, 0.533f, 0.569f, 1.0f },
+    { 0.016f, 0.839f, 0.059f, 1.0f },
+    { 0.667f, 0.949f, 0.000f, 1.0f },
+    { 0.988f, 0.975f, 0.012f, 1.0f },
+    { 0.961f, 0.808f, 0.039f, 1.0f },
+    { 0.890f, 0.533f, 0.125f, 1.0f },
+    { 0.820f, 0.408f, 0.188f, 1.0f },
+    { 0.761f, 0.322f, 0.235f, 1.0f },
+    { 0.581f, 0.149f, 0.087f, 1.0f }  // reddish
+}};
+
 
 const GCodeViewer::Color GCodeViewer::Wipe_Color = { 1.0f, 1.0f, 0.0f, 1.0f };
 const GCodeViewer::Color GCodeViewer::Neutral_Color = { 0.25f, 0.25f, 0.25f, 1.0f };