From bee0df825ea6fcf3a96ead493354406acb07e371 Mon Sep 17 00:00:00 2001
From: SoftFever <softfeverever@gmail.com>
Date: Tue, 1 Sep 2026 18:36:44 +0800
Subject: [PATCH] fix filament_vendor

---
 resources/profiles/Flashforge.json            | 106 +-
 ...hforge ABS Basic @FF AD5M 0.25 nozzle.json |   4 +-
 ...hforge ABS Basic @FF AD5X 0.25 nozzle.json |   4 +-
 ...shforge ABS Basic @FF AD5X 0.6 nozzle.json |   5 +-
 ...shforge ABS Basic @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge ABS Basic @FF AD5X.json        |   5 +-
 .../filament/Flashforge ABS Basic @FF C5.json |   5 +-
 .../Flashforge ABS Basic @FF C5P.json         |   5 +-
 ...ashforge ABS Basic @FF G4 0.25 nozzle.json |   4 +-
 ...hforge ABS Basic @FF G4 0.6 HF nozzle.json |   5 +-
 ...lashforge ABS Basic @FF G4 0.6 nozzle.json |   5 +-
 ...hforge ABS Basic @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge ABS Basic @FF G4 HF.json       |   5 +-
 .../filament/Flashforge ABS Basic @FF G4.json |   5 +-
 ...shforge ABS Basic @FF G4P 0.25 nozzle.json |   4 +-
 ...forge ABS Basic @FF G4P 0.6 HF nozzle.json |   5 +-
 ...ashforge ABS Basic @FF G4P 0.6 nozzle.json |   5 +-
 ...forge ABS Basic @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge ABS Basic @FF G4P HF.json      |   5 +-
 .../Flashforge ABS Basic @FF G4P.json         |   5 +-
 .../filament/Flashforge ABS Basic.json        |   5 +-
 .../Flashforge ABS-CF @FF G4 0.6 nozzle.json  |   5 +-
 .../filament/Flashforge ABS-CF @FF G4.json    |   5 +-
 .../Flashforge ABS-CF @FF G4P 0.6 nozzle.json |   5 +-
 .../filament/Flashforge ABS-CF @FF G4P.json   |   5 +-
 .../filament/Flashforge ABS-GF @FF C5.json    |   5 +-
 .../filament/Flashforge ABS-GF @FF C5P.json   |   5 +-
 .../Flashforge ASA @FF AD5M 0.25 Nozzle.json  |   5 +-
 ...hforge ASA Basic @FF AD5M 0.25 nozzle.json |   5 +-
 ...hforge ASA Basic @FF AD5X 0.25 nozzle.json |   5 +-
 ...shforge ASA Basic @FF AD5X 0.6 nozzle.json |   5 +-
 ...shforge ASA Basic @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge ASA Basic @FF AD5X.json        |   5 +-
 .../filament/Flashforge ASA Basic @FF C5.json |   5 +-
 .../Flashforge ASA Basic @FF C5P.json         |   5 +-
 ...ashforge ASA Basic @FF G4 0.25 nozzle.json |   4 +-
 ...hforge ASA Basic @FF G4 0.6 HF nozzle.json |   5 +-
 ...lashforge ASA Basic @FF G4 0.6 nozzle.json |   5 +-
 ...hforge ASA Basic @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge ASA Basic @FF G4 HF.json       |   5 +-
 .../filament/Flashforge ASA Basic @FF G4.json |   5 +-
 ...shforge ASA Basic @FF G4P 0.25 nozzle.json |   4 +-
 ...forge ASA Basic @FF G4P 0.6 HF nozzle.json |   5 +-
 ...ashforge ASA Basic @FF G4P 0.6 nozzle.json |   5 +-
 ...forge ASA Basic @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge ASA Basic @FF G4P HF.json      |   5 +-
 .../Flashforge ASA Basic @FF G4P.json         |   5 +-
 .../filament/Flashforge ASA Basic.json        |   5 +-
 .../filament/Flashforge ASA-GF @FF C5.json    |   5 +-
 .../filament/Flashforge ASA-GF @FF C5P.json   |   5 +-
 .../filament/Flashforge HIPS @FF C5.json      |   5 +-
 .../filament/Flashforge HIPS @FF C5P.json     |   5 +-
 .../Flashforge HIPS @FF G4 0.6 HF nozzle.json |   5 +-
 .../Flashforge HIPS @FF G4 0.6 nozzle.json    |   5 +-
 .../Flashforge HIPS @FF G4 0.8 HF nozzle.json |   5 +-
 .../filament/Flashforge HIPS @FF G4 HF.json   |   5 +-
 .../filament/Flashforge HIPS @FF G4.json      |   5 +-
 ...Flashforge HIPS @FF G4P 0.6 HF nozzle.json |   5 +-
 .../Flashforge HIPS @FF G4P 0.6 nozzle.json   |   5 +-
 ...Flashforge HIPS @FF G4P 0.8 HF nozzle.json |   5 +-
 .../filament/Flashforge HIPS @FF G4P HF.json  |   5 +-
 .../filament/Flashforge HIPS @FF G4P.json     |   5 +-
 ...ashforge HS PETG @FF AD5M 0.25 nozzle.json |   4 +-
 ...ashforge HS PETG @FF AD5X 0.25 nozzle.json |   4 +-
 ...lashforge HS PETG @FF AD5X 0.6 nozzle.json |   5 +-
 ...lashforge HS PETG @FF AD5X 0.8 nozzle.json |   5 +-
 .../filament/Flashforge HS PETG @FF AD5X.json |   5 +-
 .../filament/Flashforge HS PETG @FF C5.json   |   5 +-
 .../filament/Flashforge HS PETG @FF C5P.json  |   5 +-
 ...Flashforge HS PETG @FF G4 0.25 nozzle.json |   4 +-
 ...ashforge HS PETG @FF G4 0.6 HF nozzle.json |   5 +-
 .../Flashforge HS PETG @FF G4 0.6 nozzle.json |   5 +-
 ...ashforge HS PETG @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge HS PETG @FF G4 HF.json         |   5 +-
 .../filament/Flashforge HS PETG @FF G4.json   |   5 +-
 ...lashforge HS PETG @FF G4P 0.25 nozzle.json |   4 +-
 ...shforge HS PETG @FF G4P 0.6 HF nozzle.json |   5 +-
 ...Flashforge HS PETG @FF G4P 0.6 nozzle.json |   5 +-
 ...shforge HS PETG @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge HS PETG @FF G4P HF.json        |   5 +-
 .../filament/Flashforge HS PETG @FF G4P.json  |   5 +-
 .../filament/Flashforge HS PETG.json          |   5 +-
 ...lashforge HS PLA @FF AD5M 0.25 Nozzle.json |   5 +-
 ...lashforge HS PLA @FF AD5X 0.25 nozzle.json |   4 +-
 ...Flashforge HS PLA @FF AD5X 0.6 nozzle.json |   5 +-
 ...Flashforge HS PLA @FF AD5X 0.8 nozzle.json |   5 +-
 .../filament/Flashforge HS PLA @FF AD5X.json  |   5 +-
 .../filament/Flashforge HS PLA @FF C5.json    |   5 +-
 .../filament/Flashforge HS PLA @FF C5P.json   |   5 +-
 .../Flashforge HS PLA @FF G4 0.25 nozzle.json |   4 +-
 ...lashforge HS PLA @FF G4 0.6 HF nozzle.json |   5 +-
 .../Flashforge HS PLA @FF G4 0.6 nozzle.json  |   5 +-
 ...lashforge HS PLA @FF G4 0.8 HF nozzle.json |   5 +-
 .../filament/Flashforge HS PLA @FF G4 HF.json |   5 +-
 .../filament/Flashforge HS PLA @FF G4.json    |   5 +-
 ...Flashforge HS PLA @FF G4P 0.25 nozzle.json |   4 +-
 ...ashforge HS PLA @FF G4P 0.6 HF nozzle.json |   5 +-
 .../Flashforge HS PLA @FF G4P 0.6 nozzle.json |   5 +-
 ...ashforge HS PLA @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge HS PLA @FF G4P HF.json         |   5 +-
 .../filament/Flashforge HS PLA @FF G4P.json   |   5 +-
 ... HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json |   5 +-
 .../Flashforge HS PLA Burnt Ti @FF G4 HF.json |   5 +-
 ...HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json |   5 +-
 ...Flashforge HS PLA Burnt Ti @FF G4P HF.json |   5 +-
 ...orge HS PLA Burnt Ti@FF G4 0.6 nozzle.json |   5 +-
 ...e HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json |   6 +-
 ...rge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json |   5 +-
 ... HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json |   6 +-
 .../filament/Flashforge HS PLA.json           |   5 +-
 .../Flashforge PA @FF G4 0.6 HF nozzle.json   |   5 +-
 .../filament/Flashforge PA @FF G4 HF.json     |   5 +-
 .../filament/Flashforge PA @FF G4.json        |   5 +-
 .../Flashforge PA @FF G4P 0.6 HF nozzle.json  |   5 +-
 .../filament/Flashforge PA @FF G4P HF.json    |   5 +-
 .../filament/Flashforge PA @FF G4P.json       |   5 +-
 .../filament/Flashforge PA-CF @FF C5.json     |   5 +-
 .../filament/Flashforge PA-CF @FF C5P.json    |   5 +-
 .../filament/Flashforge PA-CF @FF G4.json     |   5 +-
 .../filament/Flashforge PA-CF @FF G4P.json    |   5 +-
 .../filament/Flashforge PAHT-CF @FF C5.json   |  83 --
 .../filament/Flashforge PAHT-CF @FF C5P.json  |  89 --
 .../filament/Flashforge PAHT-CF @FF G4.json   | 108 --
 .../filament/Flashforge PAHT-CF @FF G4P.json  | 108 --
 ...> Flashforge PC @FF G4 0.6 HF nozzle.json} |  11 +-
 ...n => Flashforge PC @FF G4 0.6 nozzle.json} |  11 +-
 ...> Flashforge PC @FF G4 0.8 HF nozzle.json} |  11 +-
 ... Flashforge PC @FF G4P 0.6 HF nozzle.json} |  11 +-
 ... => Flashforge PC @FF G4P 0.6 nozzle.json} |  11 +-
 ... Flashforge PC @FF G4P 0.8 HF nozzle.json} |  11 +-
 ...forge PETG Basic @FF AD5M 0.25 nozzle.json |   4 +-
 .../filament/Flashforge PETG Basic.json       |   5 +-
 ...shforge PETG Pro @FF AD5M 0.25 nozzle.json |   4 +-
 ...shforge PETG Pro @FF AD5X 0.25 nozzle.json |   4 +-
 ...ashforge PETG Pro @FF AD5X 0.6 nozzle.json |   5 +-
 ...ashforge PETG Pro @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PETG Pro @FF AD5X.json         |   5 +-
 .../filament/Flashforge PETG Pro @FF C5.json  |   5 +-
 .../filament/Flashforge PETG Pro @FF C5P.json |   5 +-
 ...lashforge PETG Pro @FF G4 0.25 nozzle.json |   4 +-
 ...shforge PETG Pro @FF G4 0.6 HF nozzle.json |   5 +-
 ...Flashforge PETG Pro @FF G4 0.6 nozzle.json |   5 +-
 ...shforge PETG Pro @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge PETG Pro @FF G4 HF.json        |   5 +-
 .../filament/Flashforge PETG Pro @FF G4.json  |   5 +-
 ...ashforge PETG Pro @FF G4P 0.25 nozzle.json |   4 +-
 ...hforge PETG Pro @FF G4P 0.6 HF nozzle.json |   5 +-
 ...lashforge PETG Pro @FF G4P 0.6 nozzle.json |   5 +-
 ...hforge PETG Pro @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge PETG Pro @FF G4P HF.json       |   5 +-
 .../filament/Flashforge PETG Pro @FF G4P.json |   5 +-
 .../filament/Flashforge PETG Pro.json         |   5 +-
 ...PETG Transparent @FF AD5M 0.25 nozzle.json |   4 +-
 ...PETG Transparent @FF AD5X 0.25 nozzle.json |   4 +-
 ... PETG Transparent @FF AD5X 0.6 nozzle.json |   5 +-
 ... PETG Transparent @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PETG Transparent @FF AD5X.json |   5 +-
 .../Flashforge PETG Transparent @FF C5.json   |   5 +-
 .../Flashforge PETG Transparent @FF C5P.json  |   5 +-
 ...e PETG Transparent @FF G4 0.25 nozzle.json |   4 +-
 ...PETG Transparent @FF G4 0.6 HF nozzle.json |   5 +-
 ...ge PETG Transparent @FF G4 0.6 nozzle.json |   5 +-
 ...PETG Transparent @FF G4 0.8 HF nozzle.json |   5 +-
 ...Flashforge PETG Transparent @FF G4 HF.json |   5 +-
 .../Flashforge PETG Transparent @FF G4.json   |   5 +-
 ... PETG Transparent @FF G4P 0.25 nozzle.json |   4 +-
 ...ETG Transparent @FF G4P 0.6 HF nozzle.json |   5 +-
 ...e PETG Transparent @FF G4P 0.6 nozzle.json |   5 +-
 ...ETG Transparent @FF G4P 0.8 HF nozzle.json |   5 +-
 ...lashforge PETG Transparent @FF G4P HF.json |   5 +-
 .../Flashforge PETG Transparent @FF G4P.json  |   5 +-
 .../filament/Flashforge PETG Transparent.json |   5 +-
 ...lashforge PETG-CF @FF AD5X 0.6 nozzle.json |   5 +-
 ...lashforge PETG-CF @FF AD5X 0.8 nozzle.json |   5 +-
 .../filament/Flashforge PETG-CF @FF AD5X.json |   5 +-
 .../filament/Flashforge PETG-CF @FF C5.json   |   5 +-
 .../filament/Flashforge PETG-CF @FF C5P.json  |   5 +-
 .../Flashforge PETG-CF @FF G4 0.6 nozzle.json |   5 +-
 .../filament/Flashforge PETG-CF @FF G4.json   |   5 +-
 ...Flashforge PETG-CF @FF G4P 0.6 nozzle.json |   5 +-
 .../filament/Flashforge PETG-CF @FF G4P.json  |   5 +-
 .../filament/Flashforge PETG-CF.json          |   5 +-
 ...hforge PLA Basic @FF AD5M 0.25 nozzle.json |   4 +-
 ...hforge PLA Basic @FF AD5X 0.25 nozzle.json |   4 +-
 ...shforge PLA Basic @FF AD5X 0.6 nozzle.json |   5 +-
 ...shforge PLA Basic @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PLA Basic @FF AD5X.json        |   5 +-
 .../filament/Flashforge PLA Basic @FF C5.json |   5 +-
 .../Flashforge PLA Basic @FF C5P.json         |   5 +-
 ...ashforge PLA Basic @FF G4 0.25 nozzle.json |   4 +-
 ...hforge PLA Basic @FF G4 0.6 HF nozzle.json |   5 +-
 ...lashforge PLA Basic @FF G4 0.6 nozzle.json |   5 +-
 ...hforge PLA Basic @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Basic @FF G4 HF.json       |   5 +-
 .../filament/Flashforge PLA Basic @FF G4.json |   5 +-
 ...shforge PLA Basic @FF G4P 0.25 nozzle.json |   4 +-
 ...forge PLA Basic @FF G4P 0.6 HF nozzle.json |   5 +-
 ...ashforge PLA Basic @FF G4P 0.6 nozzle.json |   5 +-
 ...forge PLA Basic @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Basic @FF G4P HF.json      |   5 +-
 .../Flashforge PLA Basic @FF G4P.json         |   5 +-
 .../filament/Flashforge PLA Basic.json        |   5 +-
 ...hforge PLA Buint Ti @FF G4 0.8 nozzle.json |  93 --
 ...forge PLA Buint Ti @FF G4P 0.8 nozzle.json |  93 --
 ...PLA Color Change @FF AD5M 0.25 nozzle.json |   4 +-
 ...PLA Color Change @FF AD5X 0.25 nozzle.json |   4 +-
 ... PLA Color Change @FF AD5X 0.6 nozzle.json |   5 +-
 ... PLA Color Change @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PLA Color Change @FF AD5X.json |   5 +-
 .../Flashforge PLA Color Change @FF C5.json   |   5 +-
 .../Flashforge PLA Color Change @FF C5P.json  |   5 +-
 ...e PLA Color Change @FF G4 0.25 nozzle.json |   4 +-
 ...PLA Color Change @FF G4 0.6 HF nozzle.json |   5 +-
 ...ge PLA Color Change @FF G4 0.6 nozzle.json |   5 +-
 ...PLA Color Change @FF G4 0.8 HF nozzle.json |   5 +-
 ...Flashforge PLA Color Change @FF G4 HF.json |   5 +-
 .../Flashforge PLA Color Change @FF G4.json   |   5 +-
 ... PLA Color Change @FF G4P 0.25 nozzle.json |   4 +-
 ...LA Color Change @FF G4P 0.6 HF nozzle.json |   5 +-
 ...e PLA Color Change @FF G4P 0.6 nozzle.json |   5 +-
 ...LA Color Change @FF G4P 0.8 HF nozzle.json |   5 +-
 ...lashforge PLA Color Change @FF G4P HF.json |   5 +-
 .../Flashforge PLA Color Change @FF G4P.json  |   5 +-
 .../filament/Flashforge PLA Color Change.json |   5 +-
 ...forge PLA Galaxy @FF AD5M 0.25 nozzle.json |   4 +-
 ...forge PLA Galaxy @FF AD5X 0.25 nozzle.json |   4 +-
 ...hforge PLA Galaxy @FF AD5X 0.6 nozzle.json |   5 +-
 ...hforge PLA Galaxy @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PLA Galaxy @FF AD5X.json       |   5 +-
 .../Flashforge PLA Galaxy @FF C5.json         |   5 +-
 .../Flashforge PLA Galaxy @FF C5P.json        |   5 +-
 ...shforge PLA Galaxy @FF G4 0.25 nozzle.json |   4 +-
 ...forge PLA Galaxy @FF G4 0.6 HF nozzle.json |   5 +-
 ...ashforge PLA Galaxy @FF G4 0.6 nozzle.json |   5 +-
 ...forge PLA Galaxy @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Galaxy @FF G4 HF.json      |   5 +-
 .../Flashforge PLA Galaxy @FF G4.json         |   5 +-
 ...hforge PLA Galaxy @FF G4P 0.25 nozzle.json |   4 +-
 ...orge PLA Galaxy @FF G4P 0.6 HF nozzle.json |   5 +-
 ...shforge PLA Galaxy @FF G4P 0.6 nozzle.json |   5 +-
 ...orge PLA Galaxy @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Galaxy @FF G4P HF.json     |   5 +-
 .../Flashforge PLA Galaxy @FF G4P.json        |   5 +-
 .../filament/Flashforge PLA Galaxy.json       |   5 +-
 ...rge PLA Luminous @FF AD5M 0.25 nozzle.json |   4 +-
 ...rge PLA Luminous @FF AD5X 0.25 nozzle.json |   4 +-
 ...orge PLA Luminous @FF AD5X 0.6 nozzle.json |   5 +-
 ...orge PLA Luminous @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PLA Luminous @FF AD5X.json     |   5 +-
 .../Flashforge PLA Luminous @FF C5.json       |   5 +-
 .../Flashforge PLA Luminous @FF C5P.json      |   5 +-
 ...forge PLA Luminous @FF G4 0.25 nozzle.json |   4 +-
 ...rge PLA Luminous @FF G4 0.6 HF nozzle.json |   5 +-
 ...rge PLA Luminous @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Luminous @FF G4 HF.json    |   5 +-
 .../Flashforge PLA Luminous @FF G4.json       |   5 +-
 ...orge PLA Luminous @FF G4P 0.25 nozzle.json |   4 +-
 ...ge PLA Luminous @FF G4P 0.6 HF nozzle.json |   5 +-
 ...ge PLA Luminous @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Luminous @FF G4P HF.json   |   5 +-
 .../Flashforge PLA Luminous @FF G4P.json      |   5 +-
 .../filament/Flashforge PLA Luminous.json     |   5 +-
 ...hforge PLA Matte @FF AD5M 0.25 nozzle.json |   4 +-
 ...hforge PLA Matte @FF AD5X 0.25 nozzle.json |   4 +-
 ...shforge PLA Matte @FF AD5X 0.6 nozzle.json |   5 +-
 ...shforge PLA Matte @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PLA Matte @FF AD5X.json        |   5 +-
 ....json => Flashforge PLA Matte @FF C5.json} |  12 +-
 ...json => Flashforge PLA Matte @FF C5P.json} |  12 +-
 ...ashforge PLA Matte @FF G4 0.25 nozzle.json |   4 +-
 ...hforge PLA Matte @FF G4 0.6 HF nozzle.json |   5 +-
 ...lashforge PLA Matte @FF G4 0.6 nozzle.json |   5 +-
 ...hforge PLA Matte @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Matte @FF G4 HF.json       |   5 +-
 .../filament/Flashforge PLA Matte @FF G4.json |   5 +-
 ...shforge PLA Matte @FF G4P 0.25 nozzle.json |   4 +-
 ...forge PLA Matte @FF G4P 0.6 HF nozzle.json |   5 +-
 ...ashforge PLA Matte @FF G4P 0.6 nozzle.json |   5 +-
 ...forge PLA Matte @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Matte @FF G4P HF.json      |   5 +-
 .../Flashforge PLA Matte @FF G4P.json         |   5 +-
 .../filament/Flashforge PLA Matte.json        |   5 +-
 ...hforge PLA Metal @FF AD5M 0.25 nozzle.json |   4 +-
 ...hforge PLA Metal @FF AD5X 0.25 nozzle.json |   4 +-
 ...shforge PLA Metal @FF AD5X 0.6 nozzle.json |   5 +-
 ...shforge PLA Metal @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PLA Metal @FF AD5X.json        |   5 +-
 ....json => Flashforge PLA Metal @FF C5.json} |  12 +-
 ...json => Flashforge PLA Metal @FF C5P.json} |  12 +-
 ...ashforge PLA Metal @FF G4 0.25 nozzle.json |   4 +-
 ...hforge PLA Metal @FF G4 0.6 HF nozzle.json |   5 +-
 ...lashforge PLA Metal @FF G4 0.6 nozzle.json |   5 +-
 ...hforge PLA Metal @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Metal @FF G4 HF.json       |   5 +-
 .../filament/Flashforge PLA Metal @FF G4.json |   5 +-
 ...shforge PLA Metal @FF G4P 0.25 nozzle.json |   4 +-
 ...forge PLA Metal @FF G4P 0.6 HF nozzle.json |   5 +-
 ...ashforge PLA Metal @FF G4P 0.6 nozzle.json |   5 +-
 ...forge PLA Metal @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Metal @FF G4P HF.json      |   5 +-
 .../Flashforge PLA Metal @FF G4P.json         |   5 +-
 .../filament/Flashforge PLA Metal.json        |   5 +-
 ...ashforge PLA Pro @FF AD5M 0.25 nozzle.json |   4 +-
 ...ashforge PLA Pro @FF AD5X 0.25 nozzle.json |   4 +-
 ...lashforge PLA Pro @FF AD5X 0.6 nozzle.json |   5 +-
 ...lashforge PLA Pro @FF AD5X 0.8 nozzle.json |   5 +-
 .../filament/Flashforge PLA Pro @FF AD5X.json |   5 +-
 ...C5.json => Flashforge PLA Pro @FF C5.json} |  12 +-
 ...P.json => Flashforge PLA Pro @FF C5P.json} |  12 +-
 ...Flashforge PLA Pro @FF G4 0.25 nozzle.json |   4 +-
 ...ashforge PLA Pro @FF G4 0.6 HF nozzle.json |   5 +-
 .../Flashforge PLA Pro @FF G4 0.6 nozzle.json |   5 +-
 ...ashforge PLA Pro @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Pro @FF G4 HF.json         |   5 +-
 .../filament/Flashforge PLA Pro @FF G4.json   |   5 +-
 ...lashforge PLA Pro @FF G4P 0.25 nozzle.json |   4 +-
 ...shforge PLA Pro @FF G4P 0.6 HF nozzle.json |   5 +-
 ...Flashforge PLA Pro @FF G4P 0.6 nozzle.json |   5 +-
 ...shforge PLA Pro @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Pro @FF G4P HF.json        |   5 +-
 .../filament/Flashforge PLA Pro @FF G4P.json  |   5 +-
 .../filament/Flashforge PLA Pro.json          |   5 +-
 ...shforge PLA Silk @FF AD5M 0.25 nozzle.json |   5 +-
 ...shforge PLA Silk @FF AD5X 0.25 nozzle.json |   4 +-
 ...ashforge PLA Silk @FF AD5X 0.6 nozzle.json |   5 +-
 ...ashforge PLA Silk @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PLA Silk @FF AD5X.json         |   5 +-
 .../filament/Flashforge PLA Silk @FF C5.json  |   5 +-
 .../filament/Flashforge PLA Silk @FF C5P.json |   5 +-
 ...lashforge PLA Silk @FF G4 0.25 nozzle.json |   4 +-
 ...shforge PLA Silk @FF G4 0.6 HF nozzle.json |   5 +-
 ...Flashforge PLA Silk @FF G4 0.6 nozzle.json |   5 +-
 ...shforge PLA Silk @FF G4 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Silk @FF G4 HF.json        |   5 +-
 .../filament/Flashforge PLA Silk @FF G4.json  |   5 +-
 ...ashforge PLA Silk @FF G4P 0.25 nozzle.json |   4 +-
 ...hforge PLA Silk @FF G4P 0.6 HF nozzle.json |   5 +-
 ...lashforge PLA Silk @FF G4P 0.6 nozzle.json |   5 +-
 ...hforge PLA Silk @FF G4P 0.8 HF nozzle.json |   5 +-
 .../Flashforge PLA Silk @FF G4P HF.json       |   5 +-
 .../filament/Flashforge PLA Silk @FF G4P.json |   5 +-
 .../filament/Flashforge PLA Silk.json         |   5 +-
 ...orge PLA Sparkle @FF AD5M 0.25 nozzle.json |   4 +-
 ...orge PLA Sparkle @FF AD5X 0.25 nozzle.json |   4 +-
 ...forge PLA Sparkle @FF AD5X 0.6 nozzle.json |   5 +-
 ...forge PLA Sparkle @FF AD5X 0.8 nozzle.json |   5 +-
 .../Flashforge PLA Sparkle @FF AD5X.json      |   5 +-
 ...hforge PLA Sparkle @FF G4 0.25 nozzle.json |   4 +-
 ...orge PLA Sparkle @FF G4 0.6 HF nozzle.json |   5 +-
 ...shforge PLA Sparkle @FF G4 0.6 nozzle.json |   5 +-
 .../Flashforge PLA Sparkle @FF G4 HF.json     |   5 +-
 .../Flashforge PLA Sparkle @FF G4.json        |   5 +-
 ...forge PLA Sparkle @FF G4P 0.25 nozzle.json |   4 +-
 ...rge PLA Sparkle @FF G4P 0.6 HF nozzle.json |   5 +-
 ...hforge PLA Sparkle @FF G4P 0.6 nozzle.json |   5 +-
 .../Flashforge PLA Sparkle @FF G4P HF.json    |   5 +-
 .../Flashforge PLA Sparkle @FF G4P.json       |   5 +-
 .../filament/Flashforge PLA Sparkle.json      |   5 +-
 ...Flashforge PLA-CF @FF AD5X 0.6 nozzle.json |   5 +-
 ...Flashforge PLA-CF @FF AD5X 0.8 nozzle.json |   5 +-
 .../filament/Flashforge PLA-CF @FF AD5X.json  |   5 +-
 .../filament/Flashforge PLA-CF @FF C5.json    |   5 +-
 .../filament/Flashforge PLA-CF @FF C5P.json   |   5 +-
 .../Flashforge PLA-CF @FF G4 0.6 nozzle.json  |   5 +-
 .../filament/Flashforge PLA-CF @FF G4.json    |   5 +-
 .../Flashforge PLA-CF @FF G4P 0.6 nozzle.json |   5 +-
 .../filament/Flashforge PLA-CF @FF G4P.json   |   5 +-
 .../filament/Flashforge PLA-CF.json           |   5 +-
 ...shforge PLA-SILK @FF AD5M 0.25 Nozzle.json |   5 +-
 ... Flashforge PPS @FF G4 0.6 HF nozzle.json} |  11 +-
 ... => Flashforge PPS @FF G4 0.6 nozzle.json} |  11 +-
 ... Flashforge PPS @FF G4 0.8 HF nozzle.json} |  11 +-
 .../filament/Flashforge PPS @FF G4.json       |   5 +-
 ...Flashforge PPS @FF G4P 0.6 HF nozzle.json} |  11 +-
 ...=> Flashforge PPS @FF G4P 0.6 nozzle.json} |  11 +-
 ...Flashforge PPS @FF G4P 0.8 HF nozzle.json} |  11 +-
 .../filament/Flashforge PPS @FF G4P.json      |   5 +-
 ... Flashforge PPS-CF @FF G4 0.6 nozzle.json} |  11 +-
 ...Flashforge PPS-CF @FF G4P 0.6 nozzle.json} |  11 +-
 .../filament/Flashforge PVA @FF C5.json       |   5 +-
 .../filament/Flashforge PVA @FF C5P.json      |   5 +-
 ...ashforge TPU 65D @FF G4 0.6 HF nozzle.json |   5 +-
 .../Flashforge TPU 65D @FF G4 0.6 nozzle.json |   5 +-
 ...ashforge TPU 65D @FF G4 0.8 HF nozzle.json |   5 +-
 ...shforge TPU 65D @FF G4P 0.6 HF nozzle.json |   5 +-
 ...Flashforge TPU 65D @FF G4P 0.6 nozzle.json |   5 +-
 ...shforge TPU 65D @FF G4P 0.8 HF nozzle.json |   5 +-
 ...lashforge TPU 95A @FF AD5X 0.6 nozzle.json |   5 +-
 ...lashforge TPU 95A @FF AD5X 0.8 nozzle.json |   5 +-
 .../filament/Flashforge TPU 95A @FF AD5X.json |   5 +-
 ...ashforge TPU 95A @FF G4 0.6 HF nozzle.json |   5 +-
 .../Flashforge TPU 95A @FF G4 0.6 nozzle.json |   5 +-
 ...ashforge TPU 95A @FF G4 0.8 HF nozzle.json |   5 +-
 .../filament/Flashforge TPU 95A @FF G4.json   |   5 +-
 ...shforge TPU 95A @FF G4P 0.6 HF nozzle.json |   5 +-
 ...Flashforge TPU 95A @FF G4P 0.6 nozzle.json |   5 +-
 ...shforge TPU 95A @FF G4P 0.8 HF nozzle.json |   5 +-
 .../filament/Flashforge TPU 95A @FF G4P.json  |   5 +-
 .../filament/Flashforge TPU 95A.json          |   5 +-
 .../filament/Flashforge TPU-64D @FF C5.json   |   5 +-
 .../filament/Flashforge TPU-64D @FF C5P.json  |   5 +-
 .../filament/Flashforge TPU-90A @FF C5.json   |   5 +-
 .../filament/Flashforge TPU-90A @FF C5P.json  |   5 +-
 .../filament/Flashforge TPU-95A @FF C5.json   |   5 +-
 .../filament/Flashforge TPU-95A @FF C5P.json  |   5 +-
 .../filament/FusRock PAHT-CF @FF C5.json      |   1 +
 .../filament/FusRock PAHT-CF @FF C5P.json     |   1 +
 .../filament/FusRock PAHT-CF @FF G4.json      |   1 +
 .../filament/FusRock PAHT-CF @FF G4P.json     |   1 +
 resources/profiles/Ratrig.json                |  26 +-
 ...son => Generic ABS BigNozzle @RatRig.json} |   7 +-
 ...son => Generic ASA BigNozzle @RatRig.json} |   7 +-
 ...on => Generic PCTG BigNozzle @RatRig.json} |   7 +-
 ...on => Generic PETG BigNozzle @RatRig.json} |   7 +-
 ...son => Generic PLA BigNozzle @RatRig.json} |   7 +-
 ...son => Generic TPU BigNozzle @RatRig.json} |   7 +-
 resources/profiles/retired_filament_ids.json  | 276 +++++
 scripts/filament_id_snapshot.json             | 946 ++++++++----------
 418 files changed, 2321 insertions(+), 1714 deletions(-)
 delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json
 delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json
 delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json
 delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json
 rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4 0.6 HF nozzle.json => Flashforge PC @FF G4 0.6 HF nozzle.json} (85%)
 rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4 0.6 nozzle.json => Flashforge PC @FF G4 0.6 nozzle.json} (85%)
 rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4 0.8 HF nozzle.json => Flashforge PC @FF G4 0.8 HF nozzle.json} (85%)
 rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4P 0.6 HF nozzle.json => Flashforge PC @FF G4P 0.6 HF nozzle.json} (85%)
 rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4P 0.6 nozzle.json => Flashforge PC @FF G4P 0.6 nozzle.json} (85%)
 rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4P 0.8 HF nozzle.json => Flashforge PC @FF G4P 0.8 HF nozzle.json} (85%)
 delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json
 delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json
 rename resources/profiles/Flashforge/filament/{Flashforge PLA  Pro @FF C5.json => Flashforge PLA Matte @FF C5.json} (82%)
 rename resources/profiles/Flashforge/filament/{Flashforge PLA  Matte @FF C5P.json => Flashforge PLA Matte @FF C5P.json} (80%)
 rename resources/profiles/Flashforge/filament/{Flashforge PLA  Metal @FF C5.json => Flashforge PLA Metal @FF C5.json} (81%)
 rename resources/profiles/Flashforge/filament/{Flashforge PLA  Metal @FF C5P.json => Flashforge PLA Metal @FF C5P.json} (80%)
 rename resources/profiles/Flashforge/filament/{Flashforge PLA  Matte @FF C5.json => Flashforge PLA Pro @FF C5.json} (82%)
 rename resources/profiles/Flashforge/filament/{Flashforge PLA  Pro @FF C5P.json => Flashforge PLA Pro @FF C5P.json} (81%)
 rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4 0.6 HF nozzle.json => Flashforge PPS @FF G4 0.6 HF nozzle.json} (86%)
 rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4 0.6 nozzle.json => Flashforge PPS @FF G4 0.6 nozzle.json} (87%)
 rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4 0.8 HF nozzle.json => Flashforge PPS @FF G4 0.8 HF nozzle.json} (86%)
 rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4P 0.6 HF nozzle.json => Flashforge PPS @FF G4P 0.6 HF nozzle.json} (86%)
 rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4P 0.6 nozzle.json => Flashforge PPS @FF G4P 0.6 nozzle.json} (87%)
 rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4P 0.8 HF nozzle.json => Flashforge PPS @FF G4P 0.8 HF nozzle.json} (86%)
 rename resources/profiles/Flashforge/filament/{FlashForge PPS-CF @FF G4 0.6 nozzle.json => Flashforge PPS-CF @FF G4 0.6 nozzle.json} (85%)
 rename resources/profiles/Flashforge/filament/{FlashForge PPS-CF @FF G4P 0.6 nozzle.json => Flashforge PPS-CF @FF G4P 0.6 nozzle.json} (85%)
 rename resources/profiles/Ratrig/filament/{RatRig BigNozzle ABS.json => Generic ABS BigNozzle @RatRig.json} (93%)
 rename resources/profiles/Ratrig/filament/{RatRig BigNozzle ASA.json => Generic ASA BigNozzle @RatRig.json} (93%)
 rename resources/profiles/Ratrig/filament/{RatRig BigNozzle PCTG.json => Generic PCTG BigNozzle @RatRig.json} (93%)
 rename resources/profiles/Ratrig/filament/{RatRig BigNozzle PETG.json => Generic PETG BigNozzle @RatRig.json} (93%)
 rename resources/profiles/Ratrig/filament/{RatRig BigNozzle PLA.json => Generic PLA BigNozzle @RatRig.json} (92%)
 rename resources/profiles/Ratrig/filament/{RatRig BigNozzle TPU.json => Generic TPU BigNozzle @RatRig.json} (92%)

diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json
index 63c09f65af..11b86ecc8d 100644
--- a/resources/profiles/Flashforge.json
+++ b/resources/profiles/Flashforge.json
@@ -1,7 +1,7 @@
 {
 	"name": "Flashforge",
 	"url": "",
-	"version": "02.04.00.05",
+	"version": "02.04.00.06",
 	"force_update": "0",
 	"description": "Flashforge configurations",
 	"machine_model_list": [
@@ -1237,14 +1237,6 @@
 			"name": "Flashforge PA-CF @FF G4P",
 			"sub_path": "filament/Flashforge PA-CF @FF G4P.json"
 		},
-		{
-			"name": "Flashforge PAHT-CF @FF G4",
-			"sub_path": "filament/Flashforge PAHT-CF @FF G4.json"
-		},
-		{
-			"name": "Flashforge PAHT-CF @FF G4P",
-			"sub_path": "filament/Flashforge PAHT-CF @FF G4P.json"
-		},
 		{
 			"name": "Flashforge PLA-CF",
 			"sub_path": "filament/Flashforge PLA-CF.json"
@@ -1898,36 +1890,36 @@
 			"sub_path": "filament/FusRock/FusRock PET-GF.json"
 		},
 		{
-			"name": "FlashForge PPS @FF G4 0.6 HF nozzle",
-			"sub_path": "filament/FlashForge PPS @FF G4 0.6 HF nozzle.json"
+			"name": "Flashforge PPS @FF G4 0.6 HF nozzle",
+			"sub_path": "filament/Flashforge PPS @FF G4 0.6 HF nozzle.json"
 		},
 		{
-			"name": "FlashForge PPS @FF G4 0.6 nozzle",
-			"sub_path": "filament/FlashForge PPS @FF G4 0.6 nozzle.json"
+			"name": "Flashforge PPS @FF G4 0.6 nozzle",
+			"sub_path": "filament/Flashforge PPS @FF G4 0.6 nozzle.json"
 		},
 		{
-			"name": "FlashForge PPS @FF G4 0.8 HF nozzle",
-			"sub_path": "filament/FlashForge PPS @FF G4 0.8 HF nozzle.json"
+			"name": "Flashforge PPS @FF G4 0.8 HF nozzle",
+			"sub_path": "filament/Flashforge PPS @FF G4 0.8 HF nozzle.json"
 		},
 		{
-			"name": "FlashForge PPS @FF G4P 0.6 HF nozzle",
-			"sub_path": "filament/FlashForge PPS @FF G4P 0.6 HF nozzle.json"
+			"name": "Flashforge PPS @FF G4P 0.6 HF nozzle",
+			"sub_path": "filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json"
 		},
 		{
-			"name": "FlashForge PPS @FF G4P 0.6 nozzle",
-			"sub_path": "filament/FlashForge PPS @FF G4P 0.6 nozzle.json"
+			"name": "Flashforge PPS @FF G4P 0.6 nozzle",
+			"sub_path": "filament/Flashforge PPS @FF G4P 0.6 nozzle.json"
 		},
 		{
-			"name": "FlashForge PPS @FF G4P 0.8 HF nozzle",
-			"sub_path": "filament/FlashForge PPS @FF G4P 0.8 HF nozzle.json"
+			"name": "Flashforge PPS @FF G4P 0.8 HF nozzle",
+			"sub_path": "filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json"
 		},
 		{
-			"name": "FlashForge PPS-CF @FF G4 0.6 nozzle",
-			"sub_path": "filament/FlashForge PPS-CF @FF G4 0.6 nozzle.json"
+			"name": "Flashforge PPS-CF @FF G4 0.6 nozzle",
+			"sub_path": "filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json"
 		},
 		{
-			"name": "FlashForge PPS-CF @FF G4P 0.6 nozzle",
-			"sub_path": "filament/FlashForge PPS-CF @FF G4P 0.6 nozzle.json"
+			"name": "Flashforge PPS-CF @FF G4P 0.6 nozzle",
+			"sub_path": "filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json"
 		},
 		{
 			"name": "FusRock PET @FF G4P 0.8 HF nozzle",
@@ -1966,28 +1958,28 @@
 			"sub_path": "filament/Generic PET @FF G4P 0.8 HF nozzle.json"
 		},
 		{
-			"name": "FlashForge PC @FF G4 0.6 HF nozzle",
-			"sub_path": "filament/FlashForge PC @FF G4 0.6 HF nozzle.json"
+			"name": "Flashforge PC @FF G4 0.6 HF nozzle",
+			"sub_path": "filament/Flashforge PC @FF G4 0.6 HF nozzle.json"
 		},
 		{
-			"name": "FlashForge PC @FF G4 0.6 nozzle",
-			"sub_path": "filament/FlashForge PC @FF G4 0.6 nozzle.json"
+			"name": "Flashforge PC @FF G4 0.6 nozzle",
+			"sub_path": "filament/Flashforge PC @FF G4 0.6 nozzle.json"
 		},
 		{
-			"name": "FlashForge PC @FF G4 0.8 HF nozzle",
-			"sub_path": "filament/FlashForge PC @FF G4 0.8 HF nozzle.json"
+			"name": "Flashforge PC @FF G4 0.8 HF nozzle",
+			"sub_path": "filament/Flashforge PC @FF G4 0.8 HF nozzle.json"
 		},
 		{
-			"name": "FlashForge PC @FF G4P 0.6 HF nozzle",
-			"sub_path": "filament/FlashForge PC @FF G4P 0.6 HF nozzle.json"
+			"name": "Flashforge PC @FF G4P 0.6 HF nozzle",
+			"sub_path": "filament/Flashforge PC @FF G4P 0.6 HF nozzle.json"
 		},
 		{
-			"name": "FlashForge PC @FF G4P 0.6 nozzle",
-			"sub_path": "filament/FlashForge PC @FF G4P 0.6 nozzle.json"
+			"name": "Flashforge PC @FF G4P 0.6 nozzle",
+			"sub_path": "filament/Flashforge PC @FF G4P 0.6 nozzle.json"
 		},
 		{
-			"name": "FlashForge PC @FF G4P 0.8 HF nozzle",
-			"sub_path": "filament/FlashForge PC @FF G4P 0.8 HF nozzle.json"
+			"name": "Flashforge PC @FF G4P 0.8 HF nozzle",
+			"sub_path": "filament/Flashforge PC @FF G4P 0.8 HF nozzle.json"
 		},
 		{
 			"name": "FusRock PAHT @FF G4 0.6 HF nozzle",
@@ -2117,14 +2109,6 @@
 			"name": "Flashforge PLA Basic @FF G4P 0.8 HF nozzle",
 			"sub_path": "filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json"
 		},
-		{
-			"name": "Flashforge PLA Buint Ti @FF G4 0.8 nozzle",
-			"sub_path": "filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json"
-		},
-		{
-			"name": "Flashforge PLA Buint Ti @FF G4P 0.8 nozzle",
-			"sub_path": "filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json"
-		},
 		{
 			"name": "Flashforge PLA Color Change @FF G4 0.6 HF nozzle",
 			"sub_path": "filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json"
@@ -2569,14 +2553,6 @@
 			"name": "Flashforge PA-CF @FF C5P",
 			"sub_path": "filament/Flashforge PA-CF @FF C5P.json"
 		},
-		{
-			"name": "Flashforge PAHT-CF @FF C5",
-			"sub_path": "filament/Flashforge PAHT-CF @FF C5.json"
-		},
-		{
-			"name": "Flashforge PAHT-CF @FF C5P",
-			"sub_path": "filament/Flashforge PAHT-CF @FF C5P.json"
-		},
 		{
 			"name": "Flashforge PET-CF @FF C5",
 			"sub_path": "filament/Flashforge PET-CF @FF C5.json"
@@ -2610,28 +2586,28 @@
 			"sub_path": "filament/Flashforge PETG-CF @FF C5P.json"
 		},
 		{
-			"name": "Flashforge PLA  Matte @FF C5",
-			"sub_path": "filament/Flashforge PLA  Matte @FF C5.json"
+			"name": "Flashforge PLA Matte @FF C5",
+			"sub_path": "filament/Flashforge PLA Matte @FF C5.json"
 		},
 		{
-			"name": "Flashforge PLA  Matte @FF C5P",
-			"sub_path": "filament/Flashforge PLA  Matte @FF C5P.json"
+			"name": "Flashforge PLA Matte @FF C5P",
+			"sub_path": "filament/Flashforge PLA Matte @FF C5P.json"
 		},
 		{
-			"name": "Flashforge PLA  Metal @FF C5",
-			"sub_path": "filament/Flashforge PLA  Metal @FF C5.json"
+			"name": "Flashforge PLA Metal @FF C5",
+			"sub_path": "filament/Flashforge PLA Metal @FF C5.json"
 		},
 		{
-			"name": "Flashforge PLA  Metal @FF C5P",
-			"sub_path": "filament/Flashforge PLA  Metal @FF C5P.json"
+			"name": "Flashforge PLA Metal @FF C5P",
+			"sub_path": "filament/Flashforge PLA Metal @FF C5P.json"
 		},
 		{
-			"name": "Flashforge PLA  Pro @FF C5",
-			"sub_path": "filament/Flashforge PLA  Pro @FF C5.json"
+			"name": "Flashforge PLA Pro @FF C5",
+			"sub_path": "filament/Flashforge PLA Pro @FF C5.json"
 		},
 		{
-			"name": "Flashforge PLA  Pro @FF C5P",
-			"sub_path": "filament/Flashforge PLA  Pro @FF C5P.json"
+			"name": "Flashforge PLA Pro @FF C5P",
+			"sub_path": "filament/Flashforge PLA Pro @FF C5P.json"
 		},
 		{
 			"name": "Flashforge PLA Basic @FF C5",
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json
index 836cd00898..93b640c5f2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "SuEfcE6AYK8N1FI4",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge ABS Basic @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json
index 39cbd2de77..6245bcf02c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "gmkc6fRLMI73Iut8",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.6 nozzle.json
index 8ce05c7f1e..7ba9ffc527 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "fgEYZ1Mgyp1AvtwU",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json
index b3f51e2b63..d797114137 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "cIxbQMVdG5K85rJr",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json
index 7457627179..82e08e3f49 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "9GXBeuCUrScJfmJB",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json
index 0e39fc998e..5e5ce18eea 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @System",
 	"from": "system",
 	"setting_id": "ds0GgE1jssl4IbF3",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json
index 4394ed643a..9ea370b14b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @System",
 	"from": "system",
 	"setting_id": "UTWbwTYuXYbBx3uw",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json
index ec7afd1806..6be9c9ac5a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "CuckX5MsN69806ow",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 HF nozzle.json
index 136856bf4a..c38639dd89 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "NttDJCrfB01uwMDl",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 nozzle.json
index 79ecbbdf9e..9709d11e22 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "hJd6dG6OdEffEFC7",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.8 HF nozzle.json
index dcc92a46c8..2f3d072baf 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "8yFCuCnEuI3dUvQy",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 HF.json
index a824989281..a6badb7396 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "np4fP5kghRlczOTT",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json
index 050606e773..c70351a9b1 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "8o2maTFOXq0XR6Dm",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json
index dea33f9ccb..ebacfbe35c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "MBo02hFXn0ebDRdb",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 HF nozzle.json
index 6055001320..d6be224ddc 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "vCsjC0UnKenzIR0O",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 nozzle.json
index c4295d0a31..9ff2f3f54a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "xhxVdlmh5r7meoHo",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.8 HF nozzle.json
index 30a2cdf399..d2c5c73541 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "6dlQN4Xhd6kGZ0Qn",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P HF.json
index ea68716e21..c4b58df04c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "r8WVFPozL8f5oLVJ",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json
index 95bc121e93..ebf003f20d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "xw0pZNmhw1K4tPQ1",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json
index b4b539a756..8be3cb0913 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "m6QLC2UaS3fW298i",
-	"filament_id": "OFShw1X8",
+	"filament_id": "OFibWuBd",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge ABS Basic"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4 0.6 nozzle.json
index 95fab6bbc4..398f80f8a5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "Nx3Px0Zu356IKShT",
-	"filament_id": "OFi7Bf0F",
+	"filament_id": "OFYTIMbj",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json
index 92ed5ff1cc..3fd0dc97ea 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "d4EGsmMeEDCOUBF2",
-	"filament_id": "OFi7Bf0F",
+	"filament_id": "OFYTIMbj",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"complete_print_exhaust_fan_speed": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P 0.6 nozzle.json
index 4e5016999f..043e0ea208 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "9ziPFKsjESbw1pXL",
-	"filament_id": "OFi7Bf0F",
+	"filament_id": "OFYTIMbj",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json
index dceedb6fc5..77148bf480 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "NzJJs6yrSik5xuyX",
-	"filament_id": "OFi7Bf0F",
+	"filament_id": "OFYTIMbj",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"complete_print_exhaust_fan_speed": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json
index dd285b07f6..8cb591fa47 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @System",
 	"from": "system",
 	"setting_id": "UinlbuXNbad2kN0s",
-	"filament_id": "OFH5UH6P",
+	"filament_id": "OFojbdhR",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json
index 0244b1fa25..3fefbd7a96 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @System",
 	"from": "system",
 	"setting_id": "ycgiXY41kqNgslE3",
-	"filament_id": "OFH5UH6P",
+	"filament_id": "OFojbdhR",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json
index 1fe1013580..f7d1332ec2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json	
@@ -3,7 +3,10 @@
 	"name": "Flashforge ASA @FF AD5M 0.25 Nozzle",
 	"inherits": "Generic ASA @Flashforge",
 	"from": "system",
-	"filament_id": "OFtTYl9Q",
+	"filament_id": "OFJS560n",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "false",
 	"compatible_printers": [
 		"Flashforge Adventurer 5M 0.25 Nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json
index 665b49d497..0f99d476fc 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Flashforge ASA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "kjS4k8nrIdNNNoWw",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge ASA Basic @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.25 nozzle.json
index 42c9955886..9a3aac8573 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.25 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Flashforge ASA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "Y647IFVkk5JIXzte",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.6 nozzle.json
index 4cd916c615..7a199389af 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "vaOyXUcrJ97KE7ZW",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.8 nozzle.json
index c98dc7b59f..3c2e7173bf 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "iLWq5pJ3ox9EAM1Z",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json
index 8b80a1d1c3..68f66a1f6b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "i7PUPYxy0Z9weyyA",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json
index 48e7c83322..5aec1c1d8b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @System",
 	"from": "system",
 	"setting_id": "UUSDyOetXSOuBIUd",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json
index 886c3cf0c1..18ae2c78f1 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @System",
 	"from": "system",
 	"setting_id": "2r0kwhklE24Hp94O",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json
index 52420cb125..051b069550 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "XWta5jJFsCxBdEPd",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 HF nozzle.json
index 012911ba4a..66ae12c06c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "w8O6oenp0NymzCqf",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 nozzle.json
index dc42f97981..166d3a01ab 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "thhmWRzNYLYJOeR2",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.8 HF nozzle.json
index 9cccf05b75..54e47a5e64 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "g5jiz6Q6or23BIo7",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 HF.json
index 2b405b1fb6..01db10d49d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "7xmWlHHNMvXBKdYS",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json
index ae0e3d9222..9cdc87b1e5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "r0B8KfZ1mNWMvGqE",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json
index 7a8035000c..f989622957 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "quOwRRLcNfOy0sYf",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 HF nozzle.json
index 01a5604125..d8801abca8 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "CBLZqLhkwf5XKO12",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 nozzle.json
index 48e7d01b94..1cc08eabb3 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "Df3anJxiRXLVO9hw",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.8 HF nozzle.json
index 6c8441ee9f..30787c9de1 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "Nu4WvBWuEhazZfh5",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P HF.json
index e30b784bfb..5b73e31a49 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "hF0h4ye3hMDtEba1",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json
index ce18c5a69f..05223314f5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge",
 	"from": "system",
 	"setting_id": "3isZCWr4CBjFtGDX",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json
index 613efc2502..2500eacd3f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ASA @Flashforge",
 	"from": "system",
 	"setting_id": "SU6r879TbQMUFCij",
-	"filament_id": "OFaBwRvT",
+	"filament_id": "OFFFg2Pf",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge ASA Basic"
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json
index e1bb924d28..de98bbdf41 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @System",
 	"from": "system",
 	"setting_id": "941E5MaAyFY3iv4V",
-	"filament_id": "OFWnSvGu",
+	"filament_id": "OFrZDhVt",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json
index 0f1d63ca96..0bff2a9e2c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @System",
 	"from": "system",
 	"setting_id": "RdmsxyUGUX8Ot4oj",
-	"filament_id": "OFWnSvGu",
+	"filament_id": "OFrZDhVt",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json
index 798fbc6583..608d143031 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HIPS @System",
 	"from": "system",
 	"setting_id": "ckwc7U0Q2eKHmCxY",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json
index 4abf262f2f..14a3d39616 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HIPS @System",
 	"from": "system",
 	"setting_id": "AEQYrT7e4Q5J2G6C",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 Pro 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 HF nozzle.json
index ae01f84a4b..bb2f4387b9 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "jUNUZhE0BJyB64fC",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 nozzle.json
index 6658adabab..597e24ade7 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "0qMEqo9YMDLSVafs",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.8 HF nozzle.json
index 4e2fd50066..5b17792267 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "ek749gIdUAPq6WxT",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json
index ed9d2cb9e4..b79fa3d0d2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "tEohTtyHofD6l6o3",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"complete_print_exhaust_fan_speed": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json
index 10127abb22..96b5849040 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "oLeLrIjFJzoZha3E",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 HF nozzle.json
index f050371f1f..cb385fd395 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "HXGUlYY4X5IHhL3R",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 nozzle.json
index 02d5c02b8c..a32508d8b0 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "g22Cv3zy3h5BhJYK",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.8 HF nozzle.json
index a99c168faf..b2958e0032 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "aDzBXuvN7IuSP5sa",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json
index 436a4cba60..bbbaebe8b8 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "CIj24REX7BA8zPHQ",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"complete_print_exhaust_fan_speed": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json
index 3b2a22ccbf..bc52c94e5b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "yAGyGjF6uDrjfjLn",
-	"filament_id": "OFaz8VoR",
+	"filament_id": "OFvaLVML",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json
index 5f34ca9901..b9eb0a335b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "1NFhtEvvvgZiHcto",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge HS PETG @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json
index a6229f92d8..fb96e1e846 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "eNOkWn5PT8rDpA0g",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.6 nozzle.json
index 081ede7bc4..c1dd59623c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "vOqAGzaYLz0XdRvC",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json
index 8ea4960a88..21198590ac 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "KSuxZ3fpQz0khDSz",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json
index 577b175cbe..23703621f3 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "o4B1kAToVny7jw0M",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json
index 3e26d15964..a48606e3c0 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG HF @System",
 	"from": "system",
 	"setting_id": "kpRved5M3NktqIYn",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json
index 4cab6d97ae..9ceca02a50 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG HF @System",
 	"from": "system",
 	"setting_id": "ypxgjHl9uIMyZIce",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json
index 21e54e38b4..5b64fa0f61 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "uXGuyvVxfdQW22vu",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json
index 30ccd1a277..28565a5c3b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "q9UbakUmZPzG3xU0",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 nozzle.json
index 6e2c0ca19c..592b3fe094 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "IL18Lu0qHx1RVqKD",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.8 HF nozzle.json
index 33696f6366..e4b953f089 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "2FQib7fZjcwfCnm2",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 HF.json
index 2b3722dd0c..955235b442 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "CtwOm90WWD4S7U6j",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json
index 83ebdfa2b1..5a47b94941 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "kvULpm0WhKiSPj8V",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json
index b161612d91..9875a638ff 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "bFVYSPkynBBapFjq",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 HF nozzle.json
index cf4731f584..26df92ae7b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "CUU7knzm4cbe1giE",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 nozzle.json
index 78a554fec2..b936141d13 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "gcYvL572cumWZdnl",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.8 HF nozzle.json
index b00acd32da..f53c9c41e3 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "cx99AH0C575XxAj9",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P HF.json
index 613a806f5a..82a8dc096a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "RrrKoR7MVD8IFQlq",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json
index aa7bf4a40f..ff09b6e445 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "7VEPGuR16wNukAX2",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json
index 8908833f96..3ee8ed9e42 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "H9uwlPw6m6Nf7qH5",
-	"filament_id": "OF5w29Kq",
+	"filament_id": "OFDxxTpW",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge HS PETG"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json
index d8dfd92fc6..d511cdafe6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "OmDped3weZ4uHAtY",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Adventurer 5M 0.25 Nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json
index 12e9fe913f..c7060c9f4e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "bfPaqPGaR5zpTsLk",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.6 nozzle.json
index 1f37c091d2..082b03f19b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "oD592bif4ra0ADco",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json
index a8cf1c5bdc..6571d871b4 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "ldhMY6F7v6nK8wwf",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json
index ada09e1c19..a5b788402d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "5vzOmbjHbkJXrgYM",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json
index 0d5e671f95..85c0b17327 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "xSJk7LFpYKmckPQh",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json
index 9aa4efc2e4..667e4045b9 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "xdFZUsj1cNLXdvT6",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json
index 43f1bbf068..15551e3faa 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "JCQtuv8Abfz4jVRV",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json
index 42f009212d..ba4f6bc6d9 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "hzxRPyH1fqarsMuN",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 nozzle.json
index fcb55d2400..4e69e17253 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "oJsLlIIpxwGSoJTv",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.8 HF nozzle.json
index 80c9e422d0..ad8f07ef26 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "hJbNZ381ERkZ0KUB",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 HF.json
index 5072e86227..f202e50f11 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "BqavrNpwhXDXcZ3r",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json
index 25a9130d9d..7472f78b02 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "cgf4Qk4iHZh7zHN5",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json
index 8e228a364e..3d97511a29 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "jFUS6233aq4XPgrn",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 HF nozzle.json
index a1e58886d3..2bc30165fc 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "p31K69Srld6o4sQ2",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 nozzle.json
index 7217ec8854..b5308a0f8c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "MwbYvnRIzlNmH81h",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.8 HF nozzle.json
index fcf7f8a8c7..2c2ee97348 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "rKhHmkqXYD2xN4K9",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P HF.json
index c6d61c696b..88184f5a92 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "Dshsi3O7NvYYjXJt",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json
index a7fb05e8d6..cd59be156d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "mfnL6QEevCmTmOL0",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json
index 117fe724a9..3281932fe8 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "AGLHrHKWye0YTtNK",
-	"filament_id": "OFmQkb3c",
+	"filament_id": "OF8O09RG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 HF.json
index 806f9e4ed7..f5de82a8bb 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "px8qzmB2yFLoNl83",
-	"filament_id": "OFmQkb3c",
+	"filament_id": "OF8O09RG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json
index fecd582701..da6fd90d98 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "mwuIEsBz5bXEV68w",
-	"filament_id": "OFmQkb3c",
+	"filament_id": "OF8O09RG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P HF.json
index 4ae6a84762..bb2d6256b6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "TielygFT88owWg4J",
-	"filament_id": "OFmQkb3c",
+	"filament_id": "OF8O09RG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle.json
index f391f26c3a..149406f025 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "It2NI6OFhNEUvulz",
-	"filament_id": "OFmQkb3c",
+	"filament_id": "OF8O09RG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json
index a554fc2a59..d06a93931d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json	
@@ -2,9 +2,13 @@
 	"type": "filament",
 	"name": "Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle",
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
+	"renamed_from": "Flashforge PLA Buint Ti @FF G4 0.8 nozzle;Flashforge PLA Buint Ti FF G4 0.8 nozzle",
 	"from": "system",
 	"setting_id": "Qt3huWxoYpMEqEN6",
-	"filament_id": "OFmQkb3c",
+	"filament_id": "OF8O09RG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json
index f32d4697c0..6fb09f1458 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "Y3XuavnnOMoHLGHA",
-	"filament_id": "OFmQkb3c",
+	"filament_id": "OF8O09RG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json
index 7eddf0b7b5..13d1358b71 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json	
@@ -2,9 +2,13 @@
 	"type": "filament",
 	"name": "Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle",
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
+	"renamed_from": "Flashforge PLA Buint Ti @FF G4P 0.8 nozzle;Flashforge PLA Buint Ti FF G4P 0.8 nozzle",
 	"from": "system",
 	"setting_id": "2HUxAWeolJIlxPs1",
-	"filament_id": "OFmQkb3c",
+	"filament_id": "OF8O09RG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json
index 120d8b317e..8002ac7ba9 100644
--- a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "vdaZBnDsmUC1fhDp",
-	"filament_id": "OFnMv3W5",
+	"filament_id": "OFIK2H3G",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge HS PLA"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 0.6 HF nozzle.json
index af9159b1b6..f5d60553e6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "u7rolQaTQz9U6veH",
-	"filament_id": "OFgf4gZa",
+	"filament_id": "OFEvEfw5",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json
index 14e5f098ab..8b10616a83 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "qTGTwiliWj3dSo9y",
-	"filament_id": "OFgf4gZa",
+	"filament_id": "OFEvEfw5",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json
index 2f7836790f..ec1ded13ea 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @Flashforge",
 	"from": "system",
 	"setting_id": "wAkuJRTLWxGyBU0b",
-	"filament_id": "OFgf4gZa",
+	"filament_id": "OFEvEfw5",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P 0.6 HF nozzle.json
index dd3a5801f6..bc05757132 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "dbs29hQSQl9zuWis",
-	"filament_id": "OFgf4gZa",
+	"filament_id": "OFEvEfw5",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json
index dbbb88d9ee..1e5eb664ec 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "XGNPvS2ps7Xn2fpx",
-	"filament_id": "OFgf4gZa",
+	"filament_id": "OFEvEfw5",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json
index 6d34858446..21ee8da2a6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @Flashforge",
 	"from": "system",
 	"setting_id": "h33iEGZ7wPeBYKYQ",
-	"filament_id": "OFgf4gZa",
+	"filament_id": "OFEvEfw5",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json
index 687017cdba..2b4f6fc95a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PA-CF @System",
 	"from": "system",
 	"setting_id": "e58C9MdOWikIbbVR",
-	"filament_id": "OFuGRMNV",
+	"filament_id": "OFGxuI0n",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json
index 4159a24737..b75438e584 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PA-CF @System",
 	"from": "system",
 	"setting_id": "RX2Tg8KpwQpCbkLI",
-	"filament_id": "OFuGRMNV",
+	"filament_id": "OFGxuI0n",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json
index d0589f6b1a..3379bd5c39 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "C4DfYuQgDXIgK7mk",
-	"filament_id": "OFuGRMNV",
+	"filament_id": "OFGxuI0n",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json
index 6225424dc7..07653a9002 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "Yu7hL4izNsgDVqMT",
-	"filament_id": "OFuGRMNV",
+	"filament_id": "OFGxuI0n",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json
deleted file mode 100644
index 0491362ddf..0000000000
--- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json	
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-	"type": "filament",
-	"name": "Flashforge PAHT-CF @FF C5",
-	"inherits": "Generic PA-CF @System",
-	"from": "system",
-	"setting_id": "8ZR8o3MKYxXLd70k",
-	"filament_id": "OFuFqYyG",
-	"instantiation": "true",
-	"compatible_printers": [
-		"Flashforge Creator 5 0.4 nozzle",
-		"Flashforge Creator 5 0.6 nozzle",
-		"Flashforge Creator 5 0.8 nozzle"
-	],
-	"complete_print_exhaust_fan_speed": [
-		"40"
-	],
-	"during_print_exhaust_fan_speed": [
-		"40"
-	],
-	"enable_pressure_advance": [
-		"1"
-	],
-	"eng_plate_temp": [
-		"80"
-	],
-	"eng_plate_temp_initial_layer": [
-		"80"
-	],
-	"fan_cooling_layer_time": [
-		"5"
-	],
-	"fan_max_speed": [
-		"40"
-	],
-	"fan_min_speed": [
-		"10"
-	],
-	"filament_flow_ratio": [
-		"0.96"
-	],
-	"filament_max_volumetric_speed": [
-		"7"
-	],
-	"filament_settings_id": [
-		"Flashforge PAHT-CF @FF C5"
-	],
-	"filament_start_gcode": [
-		"; filament start gcode"
-	],
-	"filament_type": [
-		"PAHT-CF"
-	],
-	"hot_plate_temp": [
-		"80"
-	],
-	"hot_plate_temp_initial_layer": [
-		"80"
-	],
-	"nozzle_temperature": [
-		"310"
-	],
-	"nozzle_temperature_initial_layer": [
-		"310"
-	],
-	"nozzle_temperature_range_high": [
-		"320"
-	],
-	"nozzle_temperature_range_low": [
-		"300"
-	],
-	"textured_cool_plate_temp": [
-		"0"
-	],
-	"textured_cool_plate_temp_initial_layer": [
-		"0"
-	],
-	"textured_plate_temp": [
-		"80"
-	],
-	"textured_plate_temp_initial_layer": [
-		"80"
-	]
-}
diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json
deleted file mode 100644
index 1c142f11b5..0000000000
--- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json	
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"type": "filament",
-	"name": "Flashforge PAHT-CF @FF C5P",
-	"inherits": "Generic PA-CF @System",
-	"from": "system",
-	"setting_id": "FSfGFl7FCutxXN2l",
-	"filament_id": "OFuFqYyG",
-	"instantiation": "true",
-	"activate_chamber_temp_control": [
-		"1"
-	],
-	"chamber_temperature": [
-		"60"
-	],
-	"compatible_printers": [
-		"Flashforge Creator 5 Pro 0.4 nozzle",
-		"Flashforge Creator 5 Pro 0.6 nozzle",
-		"Flashforge Creator 5 Pro 0.8 nozzle"
-	],
-	"complete_print_exhaust_fan_speed": [
-		"40"
-	],
-	"during_print_exhaust_fan_speed": [
-		"40"
-	],
-	"enable_pressure_advance": [
-		"1"
-	],
-	"eng_plate_temp": [
-		"80"
-	],
-	"eng_plate_temp_initial_layer": [
-		"80"
-	],
-	"fan_cooling_layer_time": [
-		"5"
-	],
-	"fan_max_speed": [
-		"40"
-	],
-	"fan_min_speed": [
-		"10"
-	],
-	"filament_flow_ratio": [
-		"0.96"
-	],
-	"filament_max_volumetric_speed": [
-		"7"
-	],
-	"filament_settings_id": [
-		"Flashforge PAHT-CF @FF C5P"
-	],
-	"filament_start_gcode": [
-		"; filament start gcode"
-	],
-	"filament_type": [
-		"PAHT-CF"
-	],
-	"hot_plate_temp": [
-		"80"
-	],
-	"hot_plate_temp_initial_layer": [
-		"80"
-	],
-	"nozzle_temperature": [
-		"310"
-	],
-	"nozzle_temperature_initial_layer": [
-		"310"
-	],
-	"nozzle_temperature_range_high": [
-		"320"
-	],
-	"nozzle_temperature_range_low": [
-		"300"
-	],
-	"textured_cool_plate_temp": [
-		"0"
-	],
-	"textured_cool_plate_temp_initial_layer": [
-		"0"
-	],
-	"textured_plate_temp": [
-		"80"
-	],
-	"textured_plate_temp_initial_layer": [
-		"80"
-	]
-}
diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json
deleted file mode 100644
index 19abc27d75..0000000000
--- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json	
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-	"type": "filament",
-	"name": "Flashforge PAHT-CF @FF G4",
-	"inherits": "Generic PLA-CF10 @Flashforge",
-	"from": "system",
-	"setting_id": "ZlpBAM9uaS01sWAJ",
-	"filament_id": "OFuFqYyG",
-	"instantiation": "true",
-	"activate_chamber_temp_control": [
-		"1"
-	],
-	"additional_cooling_fan_speed": [
-		"0"
-	],
-	"chamber_temperature": [
-		"60"
-	],
-	"close_fan_the_first_x_layers": [
-		"3"
-	],
-	"complete_print_exhaust_fan_speed": [
-		"50"
-	],
-	"cool_plate_temp": [
-		"0"
-	],
-	"cool_plate_temp_initial_layer": [
-		"0"
-	],
-	"during_print_exhaust_fan_speed": [
-		"40"
-	],
-	"eng_plate_temp": [
-		"100"
-	],
-	"eng_plate_temp_initial_layer": [
-		"100"
-	],
-	"fan_cooling_layer_time": [
-		"5"
-	],
-	"fan_max_speed": [
-		"60"
-	],
-	"fan_min_speed": [
-		"30"
-	],
-	"filament_density": [
-		"1.06"
-	],
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"filament_max_volumetric_speed": [
-		"8"
-	],
-	"filament_settings_id": [
-		"Flashforge PAHT-CF @FF G4"
-	],
-	"filament_start_gcode": [
-		"; filament start gcode\n;right_extruder_material:PA-CF\n"
-	],
-	"filament_type": [
-		"PAHT-CF"
-	],
-	"compatible_printers": [
-		"Flashforge Guider4 0.4 nozzle"
-	],
-	"hot_plate_temp": [
-		"100"
-	],
-	"hot_plate_temp_initial_layer": [
-		"100"
-	],
-	"nozzle_temperature": [
-		"290"
-	],
-	"nozzle_temperature_initial_layer": [
-		"290"
-	],
-	"nozzle_temperature_range_high": [
-		"300"
-	],
-	"nozzle_temperature_range_low": [
-		"260"
-	],
-	"overhang_fan_speed": [
-		"60"
-	],
-	"pressure_advance": [
-		"0.02"
-	],
-	"slow_down_layer_time": [
-		"2"
-	],
-	"support_material_interface_fan_speed": [
-		"60"
-	],
-	"temperature_vitrification": [
-		"180"
-	],
-	"textured_plate_temp": [
-		"100"
-	],
-	"textured_plate_temp_initial_layer": [
-		"100"
-	]
-}
diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json
deleted file mode 100644
index dff2e68ddd..0000000000
--- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json	
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-	"type": "filament",
-	"name": "Flashforge PAHT-CF @FF G4P",
-	"inherits": "Generic PLA-CF10 @Flashforge",
-	"from": "system",
-	"setting_id": "9DaSYBA2OI7Jj5zS",
-	"filament_id": "OFuFqYyG",
-	"instantiation": "true",
-	"activate_chamber_temp_control": [
-		"1"
-	],
-	"additional_cooling_fan_speed": [
-		"0"
-	],
-	"chamber_temperature": [
-		"60"
-	],
-	"close_fan_the_first_x_layers": [
-		"3"
-	],
-	"complete_print_exhaust_fan_speed": [
-		"50"
-	],
-	"cool_plate_temp": [
-		"0"
-	],
-	"cool_plate_temp_initial_layer": [
-		"0"
-	],
-	"during_print_exhaust_fan_speed": [
-		"40"
-	],
-	"eng_plate_temp": [
-		"100"
-	],
-	"eng_plate_temp_initial_layer": [
-		"100"
-	],
-	"fan_cooling_layer_time": [
-		"5"
-	],
-	"fan_max_speed": [
-		"60"
-	],
-	"fan_min_speed": [
-		"30"
-	],
-	"filament_density": [
-		"1.06"
-	],
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"filament_max_volumetric_speed": [
-		"8"
-	],
-	"filament_settings_id": [
-		"Flashforge PAHT-CF @FF G4P"
-	],
-	"filament_start_gcode": [
-		"; filament start gcode\n;right_extruder_material:PA-CF\n"
-	],
-	"filament_type": [
-		"PAHT-CF"
-	],
-	"compatible_printers": [
-		"Flashforge Guider4 Pro 0.4 nozzle"
-	],
-	"hot_plate_temp": [
-		"100"
-	],
-	"hot_plate_temp_initial_layer": [
-		"100"
-	],
-	"nozzle_temperature": [
-		"290"
-	],
-	"nozzle_temperature_initial_layer": [
-		"290"
-	],
-	"nozzle_temperature_range_high": [
-		"300"
-	],
-	"nozzle_temperature_range_low": [
-		"260"
-	],
-	"overhang_fan_speed": [
-		"60"
-	],
-	"pressure_advance": [
-		"0.02"
-	],
-	"slow_down_layer_time": [
-		"2"
-	],
-	"support_material_interface_fan_speed": [
-		"60"
-	],
-	"temperature_vitrification": [
-		"180"
-	],
-	"textured_plate_temp": [
-		"100"
-	],
-	"textured_plate_temp_initial_layer": [
-		"100"
-	]
-}
diff --git a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 HF nozzle.json
similarity index 85%
rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.6 HF nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 HF nozzle.json
index bd7ef806a7..e88cbb31c3 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 HF nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PC @FF G4 0.6 HF nozzle",
+	"name": "Flashforge PC @FF G4 0.6 HF nozzle",
 	"inherits": "FusRock S-PAHT @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PC @FF G4 0.6 HF nozzle;FlashForge PC FF G4 0.6 HF nozzle",
 	"from": "system",
-	"setting_id": "M9HM8tihJzV4crs8",
-	"filament_id": "OFe6sfXS",
+	"setting_id": "Tj504IYSj6mUDR6E",
+	"filament_id": "OFWXCbVF",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"3"
@@ -43,7 +44,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PC @FF G4 0.6 HF nozzle"
+		"Flashforge PC @FF G4 0.6 HF nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PC"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 nozzle.json
similarity index 85%
rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.6 nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 nozzle.json
index 1bbc7d1e11..6b1decef09 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PC @FF G4 0.6 nozzle",
+	"name": "Flashforge PC @FF G4 0.6 nozzle",
 	"inherits": "FusRock S-PAHT @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PC @FF G4 0.6 nozzle;FlashForge PC FF G4 0.6 nozzle",
 	"from": "system",
-	"setting_id": "08VjBSha6gjhJYgk",
-	"filament_id": "OFe6sfXS",
+	"setting_id": "VfhBf8676qCWatKP",
+	"filament_id": "OFWXCbVF",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"3"
@@ -43,7 +44,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PC @FF G4 0.6 nozzle"
+		"Flashforge PC @FF G4 0.6 nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PC"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.8 HF nozzle.json
similarity index 85%
rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.8 HF nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.8 HF nozzle.json
index 9e7ebbdc89..e1740fb30d 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.8 HF nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PC @FF G4 0.8 HF nozzle",
+	"name": "Flashforge PC @FF G4 0.8 HF nozzle",
 	"inherits": "FusRock S-PAHT @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PC @FF G4 0.8 HF nozzle;FlashForge PC FF G4 0.8 HF nozzle",
 	"from": "system",
-	"setting_id": "JqgkmxnjlnQ3uw1u",
-	"filament_id": "OFe6sfXS",
+	"setting_id": "ILBm9zXX5U4Oh82h",
+	"filament_id": "OFWXCbVF",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"3"
@@ -43,7 +44,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PC @FF G4 0.8 HF nozzle"
+		"Flashforge PC @FF G4 0.8 HF nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PC"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 HF nozzle.json
similarity index 85%
rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.6 HF nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 HF nozzle.json
index 5e6b9ca06c..11ec475184 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 HF nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PC @FF G4P 0.6 HF nozzle",
+	"name": "Flashforge PC @FF G4P 0.6 HF nozzle",
 	"inherits": "FusRock S-PAHT @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PC @FF G4P 0.6 HF nozzle;FlashForge PC FF G4P 0.6 HF nozzle",
 	"from": "system",
-	"setting_id": "vvLLPvSeb5PYbT1R",
-	"filament_id": "OFe6sfXS",
+	"setting_id": "Kj6KWBfSuFALX2sd",
+	"filament_id": "OFWXCbVF",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"3"
@@ -43,7 +44,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PC @FF G4P 0.6 HF nozzle"
+		"Flashforge PC @FF G4P 0.6 HF nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PC"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 nozzle.json
similarity index 85%
rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.6 nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 nozzle.json
index 74fb0b79e2..38ca36a685 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PC @FF G4P 0.6 nozzle",
+	"name": "Flashforge PC @FF G4P 0.6 nozzle",
 	"inherits": "FusRock S-PAHT @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PC @FF G4P 0.6 nozzle;FlashForge PC FF G4P 0.6 nozzle",
 	"from": "system",
-	"setting_id": "mPJMPfFCyfWdKzMO",
-	"filament_id": "OFe6sfXS",
+	"setting_id": "XjAM4PMXLCBwdgQf",
+	"filament_id": "OFWXCbVF",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"3"
@@ -43,7 +44,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PC @FF G4P 0.6 nozzle"
+		"Flashforge PC @FF G4P 0.6 nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PC"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.8 HF nozzle.json
similarity index 85%
rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.8 HF nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.8 HF nozzle.json
index 81ee3e9c95..dfdda7bfe2 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.8 HF nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PC @FF G4P 0.8 HF nozzle",
+	"name": "Flashforge PC @FF G4P 0.8 HF nozzle",
 	"inherits": "FusRock S-PAHT @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PC @FF G4P 0.8 HF nozzle;FlashForge PC FF G4P 0.8 HF nozzle",
 	"from": "system",
-	"setting_id": "HTgqTUTznOlfCRAd",
-	"filament_id": "OFe6sfXS",
+	"setting_id": "icAIkgRCZAjz6apM",
+	"filament_id": "OFWXCbVF",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"3"
@@ -43,7 +44,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PC @FF G4P 0.8 HF nozzle"
+		"Flashforge PC @FF G4P 0.8 HF nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PC"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json
index 6ea60b3214..5dc78f3cdb 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "xOZQvdZa1YCcnjor",
-	"filament_id": "OFEMfQsX",
+	"filament_id": "OFYYeMyQ",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PETG Basic @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json
index 0d325d1c1a..3d5c4f4b0c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "YLLJ4xZI704GReej",
-	"filament_id": "OFEMfQsX",
+	"filament_id": "OFYYeMyQ",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"60"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json
index a351fd284a..614ac50225 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "8EUg1hTLfsyDPbnG",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PETG Pro @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json
index 153daf20e9..0ab5b18b04 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "UKhV8A2DBc1xyNWc",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.6 nozzle.json
index d685b38547..e15f011f1f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "dFZ1MmHjj1AAIaMm",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json
index 1a279d0591..a3d431030f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "Ro3rt7IAJrA5aZD6",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json
index 4f839ae1b5..7cc361d89d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "cTxrnqzr2wVt4Nj7",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json
index bbf62043f7..0a1b47b916 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @System",
 	"from": "system",
 	"setting_id": "QA1KD03F0zj2zsVi",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json
index fae56d5e11..69cb6ee5e8 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @System",
 	"from": "system",
 	"setting_id": "EU8Q0XLjED23MNer",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json
index a22994d00b..fcb6cbcaad 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "XFSgx95whLw5FD08",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 HF nozzle.json
index 5c41866971..746eb1cc61 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "8x6yU2U8d5f67N73",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 nozzle.json
index df04115fd9..ecafe03349 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "4W0nfaSSZdg2HQkh",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.8 HF nozzle.json
index 00878236df..94b757887a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "AJcugKx4qHPJ3JAT",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 HF.json
index b73e951307..d1c404cd19 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "R0nZuLXEo5qA6Mt8",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json
index ccb1dd2f50..8c1de1d947 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "Ql2BBBymzqEG7GKk",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json
index 295b0a313e..387adc60c7 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "8Jc4eedkknqNB87s",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 HF nozzle.json
index c4f944cfc2..60bb0ae243 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "KU5tDHAKja1sCoHm",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 nozzle.json
index 93664c46e2..24ed205273 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "sb6jD3UZmb0DNIsC",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.8 HF nozzle.json
index da54d45f51..d993d05592 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "4BB1wJLtsXus5eyY",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P HF.json
index b2f8087db9..1385ac8454 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "m7oJx47UMlFctMkX",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json
index be118c9e69..1bd2c4cdbf 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "ozD2wU5UiORTtJsa",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json
index 00fffab83a..df9948d863 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "IQfUoy7gTmVmBDL5",
-	"filament_id": "OFPQfNAf",
+	"filament_id": "OFXiArjA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"60"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json
index b43b82c176..b1352eecc1 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "W59yTyPnVv4LYiah",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PETG Transparent @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json
index 54596db508..697cd7b714 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "NRY4fsPNtnqs0kyH",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.6 nozzle.json
index fdc9c427d3..2d29ad79b5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "Ht7wzk8l0b1kv5tZ",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json
index bbe03ece1f..f1b7a3b4ab 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "NJFHpa5HFHIyHSWu",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json
index 4e0de85100..252e51750d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "UaObrRNSTwitC6jr",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"close_fan_the_first_x_layers": [
 		"2"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json
index 08e0076cb0..ed8c6fd0bb 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @System",
 	"from": "system",
 	"setting_id": "TtXy042wtT6nF3WB",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json
index 4d40f2fbcb..b6395b0325 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @System",
 	"from": "system",
 	"setting_id": "66OWHhGyuaFISu6v",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json
index 60bc613ad6..3f0f32fc0a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "p5c6XJ1VD8cn2Meh",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 HF nozzle.json
index 5c9ccb693f..2ab27e8567 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "K8WkJmFy2V1zhYQO",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 nozzle.json
index 7676d966b1..b3c10e9970 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "LLK1hwKZhDU8SaGJ",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.8 HF nozzle.json
index 63c046558f..8c29f5a466 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "LaUF2HJtBnpZF7Cd",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 HF.json
index 6adfb18f16..2736fea042 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "OUToXk8ddS1RPPUK",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json
index c8e5141713..d907e48ab5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "ywff8rI39XKjcocY",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json
index 347a845f06..61db117e30 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "C0VV5Uzsl4icRgKa",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle.json
index 4ede8cb506..0dfa3dfee2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "kuCvwo6Phr6Ywhm4",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 nozzle.json
index 74d4250de0..91c49b1c85 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "Z2E69w9AevYg15tl",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle.json
index d345b35e9f..0ac80ad83a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "RkQaxwTjhJK0A3zr",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P HF.json
index 3d6abe6ff3..bc6fbecdb4 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "YBQTMes2S9iJjKDf",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json
index bf76cf5bfa..0213d9e14b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "lCngVWG3q0FWsnrG",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json
index 450c5f33d7..7502aa35b6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "3Gv6MJ3RRja5pbOM",
-	"filament_id": "OFMyLYV8",
+	"filament_id": "OFwjMiKL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"60"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.6 nozzle.json
index d746b5348d..a516f371a2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "bcqYod61blJRzhK2",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json
index 1b5c706120..7a51f2615a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "CnFKOi7fFyS8QlKK",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json
index 0fbd657de5..e401baa389 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "eKWJW36I5fVHwjWD",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json
index 16c5cce80d..52901dd534 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG-CF @System",
 	"from": "system",
 	"setting_id": "RXRERfs2oQKewpPS",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json
index 2be54257d3..dda9226bcd 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG-CF @System",
 	"from": "system",
 	"setting_id": "8Ns75F5n2fdQ8sDk",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"compatible_printers": [
 		"Flashforge Creator 5 Pro 0.4 nozzle",
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4 0.6 nozzle.json
index c0145120d7..71c68991d0 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG-CF @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "4EgMPzlVo1rTeQ1e",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json
index fb095064f7..b0b2ec7360 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "K9ME1F4oJkPi8jRu",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json
index 76d459de35..668e1af37a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG-CF @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "9jCp0gTjB3Mt95Mj",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"0"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json
index 14be746810..a0200ebe49 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge",
 	"from": "system",
 	"setting_id": "d5OleuNNZBJK9vxH",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json
index c92b4aa162..57b297768c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "MpG61mwVUtJ7t602",
-	"filament_id": "OFBK6zAi",
+	"filament_id": "OFuFEtKX",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PETG-CF"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json
index 65741b1860..9a4844d6ea 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "3fuVuyVcn8U0bRJQ",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PLA Basic @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json
index 64d564cfca..1a56e9f162 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "FrRRUl5OT773uCju",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.6 nozzle.json
index 6248751055..7c929b1363 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "gMmhMDqjmJfAYcbV",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json
index d9041d25b7..7f66423bbe 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "0OsrtqfIxrEJMwac",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json
index 110048dba4..f698b05b32 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "fuzWVrfZqekMETLK",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json
index 8963823c97..6893946556 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "FmUnckQofjunAtwr",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json
index 6fc821a49a..9a7c7080a0 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "Q0RsVOPLuMByur9c",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json
index 6969ef6263..bd42e42f74 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "QXJgY8OPyaoYUI1D",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 HF nozzle.json
index d0b03d8959..4ed8203529 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "R54l7TcwsjdPHvNB",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 nozzle.json
index a898615cfc..731b59748d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "MELEwYupDkT2DPxL",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.8 HF nozzle.json
index 8a98aa4445..24eb70b646 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "uGLvOoPAfksLO43M",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 HF.json
index c9cb6c8711..b9ab2a97ec 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "gGpKvk3rnLuTjOwo",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json
index 94fee218f2..2d81ff10df 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "Yopqnj4b5ZVwigGx",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json
index dcbfee57e3..eedd218625 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "GrwiA2dArUGV9x2g",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 HF nozzle.json
index 0714764c1c..9c6d20e0e0 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "QEfQrqMwApuSMqih",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 nozzle.json
index afa79d4382..1285b05257 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "BAPIn3eJAPGpscRJ",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json
index 1b7bd7a1dc..784f6dfd17 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "44BmRNRb6vlPq8qe",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P HF.json
index 8f77560323..4fdcf94869 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "ltJbhoAeAec9gxrS",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json
index 6cf9a832ff..57305d4cc5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "GxdZiXdqns72ibQl",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json
index 8582b545c9..12a8f6cd79 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "5XKGaHUjxHECbnHO",
-	"filament_id": "OFIxitiU",
+	"filament_id": "OFJ3F2jm",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Basic"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json
deleted file mode 100644
index 2728623e2e..0000000000
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json	
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-	"type": "filament",
-	"name": "Flashforge PLA Buint Ti @FF G4 0.8 nozzle",
-	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
-	"from": "system",
-	"setting_id": "H8IStdO8zEfSLYVE",
-	"filament_id": "OFQZeyZv",
-	"instantiation": "true",
-	"activate_air_filtration": [
-		"1"
-	],
-	"additional_cooling_fan_speed": [
-		"40"
-	],
-	"complete_print_exhaust_fan_speed": [
-		"40"
-	],
-	"cool_plate_temp": [
-		"40"
-	],
-	"cool_plate_temp_initial_layer": [
-		"40"
-	],
-	"during_print_exhaust_fan_speed": [
-		"40"
-	],
-	"eng_plate_temp": [
-		"50"
-	],
-	"eng_plate_temp_initial_layer": [
-		"50"
-	],
-	"fan_cooling_layer_time": [
-		"100"
-	],
-	"filament_flow_ratio": [
-		"0.96"
-	],
-	"filament_max_volumetric_speed": [
-		"30"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"15"
-	],
-	"filament_settings_id": [
-		"Flashforge PLA Buint Ti @FF G4 0.8 nozzle"
-	],
-	"filament_start_gcode": [
-		"; filament start gcode\n;right_extruder_material:PLA\n\n"
-	],
-	"compatible_printers": [
-		"Flashforge Guider4 0.8 HF nozzle"
-	],
-	"hot_plate_temp": [
-		"50"
-	],
-	"hot_plate_temp_initial_layer": [
-		"50"
-	],
-	"nozzle_temperature": [
-		"200"
-	],
-	"nozzle_temperature_initial_layer": [
-		"205"
-	],
-	"nozzle_temperature_range_high": [
-		"240"
-	],
-	"nozzle_temperature_range_low": [
-		"190"
-	],
-	"overhang_fan_threshold": [
-		"25%"
-	],
-	"pressure_advance": [
-		"0.025"
-	],
-	"slow_down_layer_time": [
-		"9"
-	],
-	"slow_down_min_speed": [
-		"20"
-	],
-	"temperature_vitrification": [
-		"45"
-	],
-	"textured_plate_temp": [
-		"50"
-	],
-	"textured_plate_temp_initial_layer": [
-		"50"
-	]
-}
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json
deleted file mode 100644
index 538d1415f1..0000000000
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json	
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-	"type": "filament",
-	"name": "Flashforge PLA Buint Ti @FF G4P 0.8 nozzle",
-	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
-	"from": "system",
-	"setting_id": "4wlkoKnU2bA7xhYO",
-	"filament_id": "OFQZeyZv",
-	"instantiation": "true",
-	"activate_air_filtration": [
-		"1"
-	],
-	"additional_cooling_fan_speed": [
-		"40"
-	],
-	"complete_print_exhaust_fan_speed": [
-		"40"
-	],
-	"cool_plate_temp": [
-		"40"
-	],
-	"cool_plate_temp_initial_layer": [
-		"40"
-	],
-	"during_print_exhaust_fan_speed": [
-		"40"
-	],
-	"eng_plate_temp": [
-		"50"
-	],
-	"eng_plate_temp_initial_layer": [
-		"50"
-	],
-	"fan_cooling_layer_time": [
-		"100"
-	],
-	"filament_flow_ratio": [
-		"0.96"
-	],
-	"filament_max_volumetric_speed": [
-		"30"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"15"
-	],
-	"filament_settings_id": [
-		"Flashforge PLA Buint Ti @FF G4P 0.8 nozzle"
-	],
-	"filament_start_gcode": [
-		"; filament start gcode\n;right_extruder_material:PLA\n\n"
-	],
-	"compatible_printers": [
-		"Flashforge Guider4 Pro 0.8 HF nozzle"
-	],
-	"hot_plate_temp": [
-		"50"
-	],
-	"hot_plate_temp_initial_layer": [
-		"50"
-	],
-	"nozzle_temperature": [
-		"200"
-	],
-	"nozzle_temperature_initial_layer": [
-		"205"
-	],
-	"nozzle_temperature_range_high": [
-		"240"
-	],
-	"nozzle_temperature_range_low": [
-		"190"
-	],
-	"overhang_fan_threshold": [
-		"25%"
-	],
-	"pressure_advance": [
-		"0.025"
-	],
-	"slow_down_layer_time": [
-		"9"
-	],
-	"slow_down_min_speed": [
-		"20"
-	],
-	"temperature_vitrification": [
-		"45"
-	],
-	"textured_plate_temp": [
-		"50"
-	],
-	"textured_plate_temp_initial_layer": [
-		"50"
-	]
-}
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json
index 6cf9156ada..6947f2afbf 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "KXy0WyQp06VC2ICh",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PLA Color Change @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json
index d5e1624903..9e644f1006 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "9cGw7tXD8YJHEi1H",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.6 nozzle.json
index 45e7ed6a32..4f5eca6889 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "TF6BeOl0patjpPaa",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json
index ed65db080c..950effa7cd 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "nkYeEBo8NdkJulAP",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X.json
index 70991dff2d..bf6dfb230f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "yEDfsOsogfZbNBVX",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5.json
index 2fc09d1cc1..23bfa9be0c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "xZmQdh487UMtvBRu",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5P.json
index 707eb4e042..6f5e1afb0e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "rc00SOyIg30uE3Da",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json
index 5a35f8d82f..a465a78ea6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "k1OiugasUs7baG1f",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json
index 9c64cff73b..31a99ea10e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "G2Et7kPHptMESzQ0",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 nozzle.json
index f57fbdc47d..07fe12f973 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "zsOdmFGBSF9UySMN",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.8 HF nozzle.json
index 963bd8152d..3a778e5472 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "oxRMuvBMu9qdQWUQ",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 HF.json
index 608ef77d24..8657a4010e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "5hwNJvvLtb75XBBg",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4.json
index 78d56a62a5..c185b26f3d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "mGj8VEyOnnogpkmF",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json
index 2542e59765..0709fa3e08 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "HXVX4mDeUSfW2RgL",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle.json
index 9070fa4762..9742b8aefc 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "JDcRA6apekWLXPvH",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 nozzle.json
index 01b3800053..4d3681736e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "b5GJpvKYktP4vZpj",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle.json
index 78aa762193..6eb75a8f52 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "RjUpQV6iQxTircwj",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P HF.json
index 0241ed5dba..26609fd995 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "9DEZ6SmFdgfluhsR",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P.json
index 7d3aa644c0..e660d0f569 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "girTMkusNTfY04rz",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json
index 75e3bc1a3f..29f68b0f62 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "pCQ2qmeXUyJzP7kS",
-	"filament_id": "OFkwIWwc",
+	"filament_id": "OFMkAW6r",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Color Change"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json
index aa9433b6a2..b0f7d6bf89 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "a1jTbQsflD7SDFih",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PLA Galaxy @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json
index 979f2a51fd..df9cc2d3e6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "zyCRsy0mHRgyuQqt",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle.json
index d48f2944b6..d66bf2b24c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "y8TNaRebTrmFem10",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json
index 17a2bd1120..65dffd3601 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "qju0AMvvq0B5Glny",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json
index 06e76b0a60..1067b50067 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "o8gGBOEcNvlbZxGW",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json
index 929002ffac..2ce8486cb0 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "0RkkIcIUFgwOFTBY",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json
index 487f05b211..373a81bcdc 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "9qVabnSl8xfKSIYX",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json
index 0d81c49ca3..e44bbe16e5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "DL7lxDI35YErCTWX",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle.json
index aa3a164d86..efb7dad130 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "koEC7DteUoXHUd2z",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 nozzle.json
index 0517355c72..64b442938c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "D69fWcXioFcpoUjC",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle.json
index 2982fcfe42..d20dc55d41 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "rfiQUncdSExEaK0U",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 HF.json
index ef995df080..346dfad0a0 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "WX8lK8efXIVcpjFf",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json
index a301208f82..3b999c0734 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "Tzvo3oILQJc4SQko",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json
index 7491d8dc7c..b29877be60 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "ZQYrljZtu3es26hB",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle.json
index 9b00f47fc6..1b8e75eb32 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "Y5gm20O4yCCDIoC0",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 nozzle.json
index c92d0c95c3..d39114697f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "80vSQxnHfd5ZUy5h",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle.json
index fc02069f65..185440fba4 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "UZi7T5VoasmXWyH5",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P HF.json
index c86fa47d2f..ec0581df11 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "6UlSb4fqHIMdMxkO",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json
index 22b40f77bb..c1818186cb 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "H2Cr4B5VUaxyYsN0",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json
index ffff2b3523..785e26ace5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "NJrc0UZ54Fq8MaqF",
-	"filament_id": "OF5NQFKI",
+	"filament_id": "OFJJ0Ar3",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Galaxy"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json
index ec022f475c..5702843039 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "k8iibCO2EnlTSRyi",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PLA Luminous @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json
index a6bc399396..44a6f663ef 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "pACct3L7duMh3hfx",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.6 nozzle.json
index 5898b4c1c2..3e106a6eda 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "GdvXL8SrKrYHxSgZ",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json
index 227d392df3..446137267f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "SLYD2YcQTQgbSjIF",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json
index 0b7704be7b..d605b1e444 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "kOobFSlqEG9Qe0d1",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json
index bb19b242a7..5efeada6af 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "4sE1LTVVuRglRbpD",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json
index f370433f16..485a3b51a2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @System",
 	"from": "system",
 	"setting_id": "jEUZyaEIBf2eXXeh",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json
index 9e865d710f..3019fb194c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "qZ6kKjRCMfe4Ql3F",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.6 HF nozzle.json
index 1dd346734f..0b58399215 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "xPPSRmadqfqCtRF2",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.8 HF nozzle.json
index 19db33c12b..792049300a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "aWVXIk1xVa9URR1D",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 HF.json
index 85732db257..a218752f68 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "KhBF7hHHVPzqiAca",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json
index 4a47c2e41d..615e05d2e6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "sTplnj3gMAzwtLWE",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json
index 3f409afcef..cc630d58ab 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "zJFUJKDJRYi1pRL7",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle.json
index aab7e584c9..65e6995584 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "vXPXOKD8vNJlujM1",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle.json
index 01c99d30bd..7704d5f2b8 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "purqxjmWiflDrnik",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P HF.json
index e11842c15a..b9f94e604e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "qraQ97uusigB63hv",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json
index 049325af4d..5ce6582146 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "Z1NCX8XMyIVlOlWn",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json
index e8f02f10a0..46151a4496 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "s620OFLTgFT4Ds2A",
-	"filament_id": "OFMIma8C",
+	"filament_id": "OFdqkWtz",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Luminous"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json
index d9c3ffe33a..30c0a43a1e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "DcbISTLvKNMZRzKx",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PLA Matte @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json
index 790c30cef0..98964015a5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "4fwlIrzy6O2EsyBZ",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.6 nozzle.json
index 9788577dc8..2774450e57 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "BVmVfNCuy8HDhcEI",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json
index b044ecd47f..f03dc70fd1 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "WRMePGzDGdEGiqNv",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json
index 1cdea005e4..f009759cad 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "thnbuaLDDlGrkrdY",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA  Pro @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json
similarity index 82%
rename from resources/profiles/Flashforge/filament/Flashforge PLA  Pro @FF C5.json
rename to resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json
index 5aa386d441..230a723624 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA  Pro @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json	
@@ -1,10 +1,14 @@
 {
 	"type": "filament",
-	"name": "Flashforge PLA  Pro @FF C5",
+	"name": "Flashforge PLA Matte @FF C5",
 	"inherits": "Generic PLA @System",
+	"renamed_from": "Flashforge PLA  Matte @FF C5;Flashforge PLA  Matte FF C5",
 	"from": "system",
-	"setting_id": "47Q7YXoJ7rD7Vu21",
-	"filament_id": "OF6ueBwd",
+	"setting_id": "ct3nO6w9j58gqDI0",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
@@ -45,7 +49,7 @@
 		"18"
 	],
 	"filament_settings_id": [
-		"Flashforge PLA  Pro @FF C5"
+		"Flashforge PLA Matte @FF C5"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA  Matte @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json
similarity index 80%
rename from resources/profiles/Flashforge/filament/Flashforge PLA  Matte @FF C5P.json
rename to resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json
index 657898f301..0d7543cc09 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA  Matte @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json	
@@ -1,10 +1,14 @@
 {
 	"type": "filament",
-	"name": "Flashforge PLA  Matte @FF C5P",
+	"name": "Flashforge PLA Matte @FF C5P",
 	"inherits": "Generic PLA @System",
+	"renamed_from": "Flashforge PLA  Matte @FF C5P;Flashforge PLA  Matte FF C5P",
 	"from": "system",
-	"setting_id": "FpLoe6QrPXnrH019",
-	"filament_id": "OFH6Pjxe",
+	"setting_id": "Bn2BaG7f1tkvlyYI",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
@@ -48,7 +52,7 @@
 		"18"
 	],
 	"filament_settings_id": [
-		"Flashforge PLA  Matte @FF C5P"
+		"Flashforge PLA Matte @FF C5P"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json
index 548d627fa2..4898587111 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "cnPwhLyBq6JL8gEA",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 HF nozzle.json
index 28809dc1c0..2ff2a07363 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "8b9q1FfVljPmKoEt",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 nozzle.json
index 2a2ac35fa8..f49e19c292 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "o9dOrLgL6efF19O1",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.8 HF nozzle.json
index d3d9ac763a..98e44f21f4 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "QoRmDvhoeGi6Z2xv",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 HF.json
index 2cc4d75091..7eda7a4b62 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "dHyuoORAUGLtlGkJ",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json
index bc2daed905..698511967d 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "OgqVyIHfy3U8Dc6d",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json
index 2716d0f9fa..c9a63d60cb 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "g1gnICJ3u6hpGazQ",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 HF nozzle.json
index fa2c6322ea..c868aa0137 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "feXpVbDM5ON5mwg0",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 nozzle.json
index 8ae39f5623..fc205bb684 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "XMnZQ1AxXPJqpqRX",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.8 HF nozzle.json
index e8a01ae3e0..42dc4c9c15 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "Ke0bRKPNKSsVMO1Y",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P HF.json
index 55571d70e5..1d76131870 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "IRC2n4GaofxvvyTt",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json
index 75b6007012..63d6f372e3 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "RN4wdTL0qccM4huZ",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json
index 60488f6338..781357b1a1 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "ipMevDMORKqZYdvD",
-	"filament_id": "OF1bQyX2",
+	"filament_id": "OF6qAuyi",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"22"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json
index a788ef51f7..1adef03eef 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "vwwb5nfO63U1ErCn",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PLA Metal @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json
index b6a2c35983..e786ecd378 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "ekq4MRPyzlYxRhbX",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.6 nozzle.json
index 231e4cf895..27caf06739 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "uusF7Vz94HOwoQF0",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json
index 92a867b768..4f01562a04 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "sHZWzrZO8PP0QYZR",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json
index 22abaf206a..f85391cb2b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "bxwjEFI8HmNY8JI6",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA  Metal @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json
similarity index 81%
rename from resources/profiles/Flashforge/filament/Flashforge PLA  Metal @FF C5.json
rename to resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json
index e41c16e0cb..d382637556 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA  Metal @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json	
@@ -1,10 +1,14 @@
 {
 	"type": "filament",
-	"name": "Flashforge PLA  Metal @FF C5",
+	"name": "Flashforge PLA Metal @FF C5",
 	"inherits": "Generic PLA @System",
+	"renamed_from": "Flashforge PLA  Metal @FF C5;Flashforge PLA  Metal FF C5",
 	"from": "system",
-	"setting_id": "YFbZ472BRNga6OpQ",
-	"filament_id": "OFrnkURQ",
+	"setting_id": "AdjRSTc9RZG6mJ1e",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
@@ -45,7 +49,7 @@
 		"18"
 	],
 	"filament_settings_id": [
-		"Flashforge PLA  Metal @FF C5"
+		"Flashforge PLA Metal @FF C5"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA  Metal @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json
similarity index 80%
rename from resources/profiles/Flashforge/filament/Flashforge PLA  Metal @FF C5P.json
rename to resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json
index fb5ba4bbf6..965b6fe595 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA  Metal @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json	
@@ -1,10 +1,14 @@
 {
 	"type": "filament",
-	"name": "Flashforge PLA  Metal @FF C5P",
+	"name": "Flashforge PLA Metal @FF C5P",
 	"inherits": "Generic PLA @System",
+	"renamed_from": "Flashforge PLA  Metal @FF C5P;Flashforge PLA  Metal FF C5P",
 	"from": "system",
-	"setting_id": "AtVxriSKOrFZzUun",
-	"filament_id": "OFrnkURQ",
+	"setting_id": "k0AQO2dGbk0qvxzO",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
@@ -48,7 +52,7 @@
 		"18"
 	],
 	"filament_settings_id": [
-		"Flashforge PLA  Metal @FF C5P"
+		"Flashforge PLA Metal @FF C5P"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json
index 5f0dc7ac33..bf884cf46e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "VvMaIJwFk4Q6KX4p",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 HF nozzle.json
index 682889ba46..8fcf56e6b6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "5xqdqoj2l50FegPF",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 nozzle.json
index da2e664b20..352adaa681 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "R79SbWA9i2OAu2ee",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.8 HF nozzle.json
index 56b51fbb39..8d78236629 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "zjIN4KzIOwI1VwOc",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 HF.json
index aa615d6c52..aaabcaac60 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "UxMNNil2KnWvAJ4q",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json
index 18240ff4ab..b1035a4629 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "57i6iKrVYUS5UiBT",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json
index 712410e542..d7697ccb8e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "vVKalJViJuBvlHkK",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 HF nozzle.json
index a8eea524f7..bf06971c23 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "IYPw8a9tkpuf95uH",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 nozzle.json
index eebeaeb9d4..7d85d6e56f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "I0bULoVAbtVfQoCy",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.8 HF nozzle.json
index 48206bc4e6..9c6e1b92b0 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "DbPo3ay2e4a002AB",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P HF.json
index 8d50a6ad0a..a79ce03a5b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "uztv4hhm2O3T93zZ",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json
index cd239560be..82bf12c247 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "UFWWrhfgS7N36Y8W",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json
index 368782f0fd..90d419bfa5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "UD5i0ijsirfieUvb",
-	"filament_id": "OFvVxvzZ",
+	"filament_id": "OFAebKg8",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Metal"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json
index 15a01f350a..c956e6a5ec 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "DIMoIGOGedN17WbO",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PLA Pro @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json
index 9d4fb9f9a8..eda5f5745f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "SC5LJcecBaEG5by3",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.6 nozzle.json
index b25c6b56ab..d56ed06c1e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "t9lPSFnwLDk0ARIp",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json
index d0a7d88e4f..423b8743a7 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "SBSlOEwZSvZHeX4r",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json
index f276a6e671..0ab1f650f2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "DbWTm2H71izMWmpx",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA  Matte @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json
similarity index 82%
rename from resources/profiles/Flashforge/filament/Flashforge PLA  Matte @FF C5.json
rename to resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json
index 15b12ed8f9..e02f21dbd3 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA  Matte @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json	
@@ -1,10 +1,14 @@
 {
 	"type": "filament",
-	"name": "Flashforge PLA  Matte @FF C5",
+	"name": "Flashforge PLA Pro @FF C5",
 	"inherits": "Generic PLA @System",
+	"renamed_from": "Flashforge PLA  Pro @FF C5;Flashforge PLA  Pro FF C5",
 	"from": "system",
-	"setting_id": "UQF0kAaXnZgJGK4o",
-	"filament_id": "OFH6Pjxe",
+	"setting_id": "30eBjTZFg6vDZkc0",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
@@ -45,7 +49,7 @@
 		"18"
 	],
 	"filament_settings_id": [
-		"Flashforge PLA  Matte @FF C5"
+		"Flashforge PLA Pro @FF C5"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA  Pro @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json
similarity index 81%
rename from resources/profiles/Flashforge/filament/Flashforge PLA  Pro @FF C5P.json
rename to resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json
index 025ddbf305..fedd74b2c5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA  Pro @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json	
@@ -1,10 +1,14 @@
 {
 	"type": "filament",
-	"name": "Flashforge PLA  Pro @FF C5P",
+	"name": "Flashforge PLA Pro @FF C5P",
 	"inherits": "Generic PLA @System",
+	"renamed_from": "Flashforge PLA  Pro @FF C5P;Flashforge PLA  Pro FF C5P",
 	"from": "system",
-	"setting_id": "v7vYsiPVka4c1CUW",
-	"filament_id": "OF6ueBwd",
+	"setting_id": "xOvxorpWP37CQCfi",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
@@ -48,7 +52,7 @@
 		"18"
 	],
 	"filament_settings_id": [
-		"Flashforge PLA  Pro @FF C5P"
+		"Flashforge PLA Pro @FF C5P"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json
index 174584294f..a2ea5e43ee 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "ZENqqRqvEOeloAgs",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 HF nozzle.json
index e7b16bb162..f3dd8e04cf 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "YcXuvz3qYHtVoWxv",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 nozzle.json
index 400fb84d2e..7dc8528606 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "prItyXNphhuPCAce",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.8 HF nozzle.json
index f044a481b4..57e815ab25 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "83zDmjaAgxxIt7KU",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 HF.json
index c40c210005..35bce9d866 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "px3O28Olb9LExqfT",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json
index 71ad06d85a..b04f49d81b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "QYgsCCHP3Khqrzh3",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json
index 6f675b36db..4e1e4c5ac7 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "wV01bqvZ6MRaEibZ",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 HF nozzle.json
index aaab161802..07b82edf7f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "1ro9wHPYhuMHNiYe",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 nozzle.json
index 20ee4d7163..433318fc86 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "4W4a7c9ugUVwvvmn",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.8 HF nozzle.json
index 804c28cfe1..87031ba66b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "CloRo3qxvzxHZuIP",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P HF.json
index b0f9655605..281a34a2c5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "QgUbP07tIXmFysEb",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json
index 50db881fc0..8d29d1823c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "6mvGOtkPZT6ROboo",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json
index 2924f05d13..e70b87f9a9 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "vI875WYbMyQeMwlh",
-	"filament_id": "OFK74HJD",
+	"filament_id": "OFm4SivL",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Pro"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json
index 13d04ff82c..b232f00632 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "gxl3i7jTwkzrKxF4",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Silk @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json
index c3ece049cf..1a604e9250 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "mx6NWRkqyo2U12XQ",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.6 nozzle.json
index c39e501f5c..3bbc1afcb1 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-Silk @Flashforge",
 	"from": "system",
 	"setting_id": "YH9IHXOFMKwcTLyA",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json
index 58d57b30c2..36a3c15a4f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-Silk @Flashforge",
 	"from": "system",
 	"setting_id": "IfAieG0OAG807xlu",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json
index dc7fb68745..ce5ecdb2aa 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-Silk @Flashforge",
 	"from": "system",
 	"setting_id": "N6J7QqQ7TIgM3MyW",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"50"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json
index 3e65220aa5..de9c9be46a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA Silk @System",
 	"from": "system",
 	"setting_id": "OIsfpi49wEoF0ekO",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json
index 5943d800f7..f82bc5efc4 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA Silk @System",
 	"from": "system",
 	"setting_id": "xxeZ6VPjRFevxDnK",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json
index 1db32c1b42..84ee8494b5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "x5m17Z5UpqpTtwgF",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 HF nozzle.json
index 0f6d8e0bbe..ec7a71f35f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "2GZp8yjrY1OioFDi",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 nozzle.json
index 284128710c..36090afaf7 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "U0XtCVUhIMnidhbR",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.8 HF nozzle.json
index 72d48ebb9b..558015cb87 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "8j9kaYy3ghkF81Cu",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 HF.json
index 00ddedabc1..c37e0f6341 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "E0LeJwSxaniDkB0b",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json
index 536a4ac8ac..b7f4f619ec 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "8rggqgJ9kg9yLE28",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json
index f8dbc1a5db..7e2cbef575 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "hnWRLUwnfXiwnqBM",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 HF nozzle.json
index 96cc519bb4..047cdcf879 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "uY4OWhIytHMz4rWq",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 nozzle.json
index de21757695..b5f36b7483 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "YSkkXd9EhhEHvGpf",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.8 HF nozzle.json
index 7a3f814c62..a41d10e40a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "XlxXZj9Wi1D6IwCE",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P HF.json
index 2723288b7d..e95f7ad1de 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "IPyXBSnMCAikjI9V",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json
index 7837f5d704..df4894cdb1 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "f3gJsovSmDKoA7BP",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json
index 16a44d9bf2..15239129d4 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-Silk @Flashforge",
 	"from": "system",
 	"setting_id": "vZb7BvbyVWkZv3rR",
-	"filament_id": "OFLYDIb8",
+	"filament_id": "OFgjgN35",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Silk"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json
index b9621303fe..c6e10f3502 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "ojYsAanAPqYhgFoe",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"filament_settings_id": [
 		"Flashforge PLA Sparkle @FF AD5M 0.25 nozzle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json
index e1df09f3fb..e90f5c1545 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "xVYaNvQwM2chTkPe",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"complete_print_exhaust_fan_speed": [
 		"80"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle.json
index 96d39efa5d..3786cf7abb 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "o8lsEnMIiHHorJhb",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json
index ee4824a8dd..c7fb93bca2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "oXlxQJY0K6Dnri7e",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json
index 06c4d3fb57..b6802db1b4 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "XKpFulrvvrfE56va",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json
index b0d52bf934..3d35049e4e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "jmVmKMUCcowszvVp",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle.json
index 296b827e39..5cf32f2c38 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "yeh5cd0tAHtHzdoQ",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 nozzle.json
index 9dbe7d7af0..27380eb9e7 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "q2Zi0YluaYpG3Ktf",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 HF.json
index 1eafaf0b40..42df4a0ea9 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "1qXV6AJqPpAwX1YK",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json
index 1d93c10b5a..7a11476c06 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "YsyGGOGqUVkEqkIr",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json
index b333c92f94..013e84740b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json	
@@ -4,10 +4,10 @@
 	"inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle",
 	"from": "system",
 	"setting_id": "4L3Zm1YIxs8J8dp9",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle.json
index 6459a6f8a8..4a975e6f20 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "UVvd018dTbygqTgy",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 nozzle.json
index 410394cbce..0781dd641f 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "F0k8kkgWM5FkLAzo",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P HF.json
index 7ecddf5859..9b4065c982 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P HF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P HF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic ABS @Flashforge G3U",
 	"from": "system",
 	"setting_id": "Oapl8InwbkwNSIDl",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json
index 0554f047e6..35ccf42632 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "NiB6Yb4b0auyn9KQ",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json
index ca024d690b..4be3dba6ea 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge",
 	"from": "system",
 	"setting_id": "LYtdPgec1hBLhoQA",
-	"filament_id": "OFec7Qiw",
+	"filament_id": "OFV5c8hG",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA Sparkle"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.6 nozzle.json
index 8bb0d6980f..245e401283 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "QRyISvTy06kCwxKo",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json
index f63829709e..f456d8c7db 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "rmnF24E3SuwzRscH",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json
index 2939f9ee4e..a39646f621 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "BXPI5Pkp7a6pLrCh",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json
index b2b8bcf477..a1b271569e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF @System",
 	"from": "system",
 	"setting_id": "rBm25DRY1PAkEJ4r",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json
index f5e734c62b..189dba715a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF @System",
 	"from": "system",
 	"setting_id": "xReo12oteZ4ECNJN",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4 0.6 nozzle.json
index e441facb7d..292cf5972c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "9PgjgxU7pLl2Dfpe",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json
index f2b5662c13..0faba78623 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "RuNKzuIsw7F1ogmG",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P 0.6 nozzle.json
index 62dd7a9ee9..77a590f1d6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "YPuMCHNGDWh0FpIB",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json
index 7958393b2b..3bd2e72000 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic HS PLA @Flashforge",
 	"from": "system",
 	"setting_id": "3uC056Y171ZjnQE6",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json
index 5466774689..10f87a860a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "JxNlb64lTODaaQhU",
-	"filament_id": "OF2bZtyg",
+	"filament_id": "OF9cAwMK",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge PLA-CF"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json
index 07744f726a..4242f0f8a5 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json	
@@ -3,7 +3,10 @@
 	"name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle",
 	"inherits": "Generic PLA-Silk @Flashforge",
 	"from": "system",
-	"filament_id": "OFGc282l",
+	"filament_id": "OFV8Mxqx",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "false",
 	"compatible_printers": [
 		"Flashforge Adventurer 5M 0.25 Nozzle",
diff --git a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 HF nozzle.json
similarity index 86%
rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.6 HF nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 HF nozzle.json
index e8de847c00..3df5398f11 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 HF nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PPS @FF G4 0.6 HF nozzle",
+	"name": "Flashforge PPS @FF G4 0.6 HF nozzle",
 	"inherits": "FusRock PET-CF @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PPS @FF G4 0.6 HF nozzle;FlashForge PPS FF G4 0.6 HF nozzle",
 	"from": "system",
-	"setting_id": "3w8fnDjkoFaJ6Nhw",
-	"filament_id": "OFUCpLaL",
+	"setting_id": "5x1ye2DAm3GvzmZJ",
+	"filament_id": "OFlgMgNM",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_chamber_temp_control": [
 		"1"
@@ -61,7 +62,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PPS @FF G4 0.6 HF nozzle"
+		"Flashforge PPS @FF G4 0.6 HF nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PPS"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 nozzle.json
similarity index 87%
rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.6 nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 nozzle.json
index 993a4dbf92..1de4d51745 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PPS @FF G4 0.6 nozzle",
+	"name": "Flashforge PPS @FF G4 0.6 nozzle",
 	"inherits": "FusRock PET-CF @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PPS @FF G4 0.6 nozzle;FlashForge PPS FF G4 0.6 nozzle",
 	"from": "system",
-	"setting_id": "owHbDqY55rFtSegz",
-	"filament_id": "OFUCpLaL",
+	"setting_id": "yZoLC24CeKEyvkgA",
+	"filament_id": "OFlgMgNM",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_chamber_temp_control": [
 		"1"
@@ -61,7 +62,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PPS @FF G4 0.6 nozzle"
+		"Flashforge PPS @FF G4 0.6 nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PPS"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.8 HF nozzle.json
similarity index 86%
rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.8 HF nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.8 HF nozzle.json
index ff65c08991..e8014ddfec 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.8 HF nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PPS @FF G4 0.8 HF nozzle",
+	"name": "Flashforge PPS @FF G4 0.8 HF nozzle",
 	"inherits": "FusRock PET-CF @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PPS @FF G4 0.8 HF nozzle;FlashForge PPS FF G4 0.8 HF nozzle",
 	"from": "system",
-	"setting_id": "eFK1zzT1JY9ZnEl9",
-	"filament_id": "OFUCpLaL",
+	"setting_id": "EsrSpDB3Kx35qb76",
+	"filament_id": "OFlgMgNM",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_chamber_temp_control": [
 		"1"
@@ -61,7 +62,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PPS @FF G4 0.8 HF nozzle"
+		"Flashforge PPS @FF G4 0.8 HF nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PPS"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json
index c8a1c2d800..fd2f854067 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "6NjEQ6RJKUAOrSLw",
-	"filament_id": "OFxMGIPt",
+	"filament_id": "OFlgMgNM",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json
similarity index 86%
rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.6 HF nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json
index 0f6fa82220..f731181d65 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PPS @FF G4P 0.6 HF nozzle",
+	"name": "Flashforge PPS @FF G4P 0.6 HF nozzle",
 	"inherits": "FusRock PET-CF @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PPS @FF G4P 0.6 HF nozzle;FlashForge PPS FF G4P 0.6 HF nozzle",
 	"from": "system",
-	"setting_id": "E8CcstoHzax78ZJY",
-	"filament_id": "OFUCpLaL",
+	"setting_id": "Uu82gm86ESeidnRT",
+	"filament_id": "OFlgMgNM",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_chamber_temp_control": [
 		"1"
@@ -61,7 +62,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PPS @FF G4P 0.6 HF nozzle"
+		"Flashforge PPS @FF G4P 0.6 HF nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PPS"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 nozzle.json
similarity index 87%
rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.6 nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 nozzle.json
index 581d855fe0..3eab34befc 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PPS @FF G4P 0.6 nozzle",
+	"name": "Flashforge PPS @FF G4P 0.6 nozzle",
 	"inherits": "FusRock PET-CF @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PPS @FF G4P 0.6 nozzle;FlashForge PPS FF G4P 0.6 nozzle",
 	"from": "system",
-	"setting_id": "xa22FD8bRVGsLiPJ",
-	"filament_id": "OFUCpLaL",
+	"setting_id": "G6pIMZA5RC15kJoC",
+	"filament_id": "OFlgMgNM",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_chamber_temp_control": [
 		"1"
@@ -61,7 +62,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PPS @FF G4P 0.6 nozzle"
+		"Flashforge PPS @FF G4P 0.6 nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PPS"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json
similarity index 86%
rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.8 HF nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json
index dee62ada5b..a2662d8cc9 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PPS @FF G4P 0.8 HF nozzle",
+	"name": "Flashforge PPS @FF G4P 0.8 HF nozzle",
 	"inherits": "FusRock PET-CF @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PPS @FF G4P 0.8 HF nozzle;FlashForge PPS FF G4P 0.8 HF nozzle",
 	"from": "system",
-	"setting_id": "bZ9dbA8dIu9mjWyN",
-	"filament_id": "OFUCpLaL",
+	"setting_id": "SsK15iSJxrQWI5wy",
+	"filament_id": "OFlgMgNM",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"activate_chamber_temp_control": [
 		"1"
@@ -61,7 +62,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PPS @FF G4P 0.8 HF nozzle"
+		"Flashforge PPS @FF G4P 0.8 HF nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PPS"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json
index 76257267fe..b841f62e6c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA-CF10 @Flashforge",
 	"from": "system",
 	"setting_id": "vFMKqNjQjlNxwvDI",
-	"filament_id": "OFxMGIPt",
+	"filament_id": "OFlgMgNM",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_chamber_temp_control": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PPS-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json
similarity index 85%
rename from resources/profiles/Flashforge/filament/FlashForge PPS-CF @FF G4 0.6 nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json
index 218d8add21..b33fcb95c9 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PPS-CF @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PPS-CF @FF G4 0.6 nozzle",
+	"name": "Flashforge PPS-CF @FF G4 0.6 nozzle",
 	"inherits": "FusRock PET-CF @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PPS-CF @FF G4 0.6 nozzle;FlashForge PPS-CF FF G4 0.6 nozzle",
 	"from": "system",
-	"setting_id": "4w0oK3F50O1DUqsu",
-	"filament_id": "OFogbnCb",
+	"setting_id": "mMTi9QaW5xVch3an",
+	"filament_id": "OFTSXxzE",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"2"
@@ -49,7 +50,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PPS-CF @FF G4 0.6 nozzle"
+		"Flashforge PPS-CF @FF G4 0.6 nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PPS"
diff --git a/resources/profiles/Flashforge/filament/FlashForge PPS-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json
similarity index 85%
rename from resources/profiles/Flashforge/filament/FlashForge PPS-CF @FF G4P 0.6 nozzle.json
rename to resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json
index 1213313096..48edb216c5 100644
--- a/resources/profiles/Flashforge/filament/FlashForge PPS-CF @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json	
@@ -1,13 +1,14 @@
 {
 	"type": "filament",
-	"name": "FlashForge PPS-CF @FF G4P 0.6 nozzle",
+	"name": "Flashforge PPS-CF @FF G4P 0.6 nozzle",
 	"inherits": "FusRock PET-CF @G3U 0.6 Nozzle",
+	"renamed_from": "FlashForge PPS-CF @FF G4P 0.6 nozzle;FlashForge PPS-CF FF G4P 0.6 nozzle",
 	"from": "system",
-	"setting_id": "94vPnztRcpnbfAKx",
-	"filament_id": "OFogbnCb",
+	"setting_id": "dSI79hoaa9jLGvhz",
+	"filament_id": "OFTSXxzE",
 	"instantiation": "true",
 	"filament_vendor": [
-		"Generic"
+		"Flashforge"
 	],
 	"close_fan_the_first_x_layers": [
 		"2"
@@ -49,7 +50,7 @@
 		"15"
 	],
 	"filament_settings_id": [
-		"FlashForge PPS-CF @FF G4P 0.6 nozzle"
+		"Flashforge PPS-CF @FF G4P 0.6 nozzle"
 	],
 	"filament_start_gcode": [
 		"; filament start gcode\n;right_extruder_material:PPS"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json
index 4f3cc891e3..90d94b9c29 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PVA @System",
 	"from": "system",
 	"setting_id": "rSYGG2ni41NDVw6l",
-	"filament_id": "OFQiq4fb",
+	"filament_id": "OFaaddbQ",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json
index 206933a8fe..03fdb6117e 100644
--- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PVA @System",
 	"from": "system",
 	"setting_id": "nwgbMjLRJLtJ04ri",
-	"filament_id": "OFQiq4fb",
+	"filament_id": "OFaaddbQ",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 HF nozzle.json
index f3625e4bea..1514862e44 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "f75oElm4zB0hukIj",
-	"filament_id": "OFKpQTJI",
+	"filament_id": "OFSDfduA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 nozzle.json
index c08ad7948b..d6fda96505 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "o4KYTpJF6KksX2mg",
-	"filament_id": "OFKpQTJI",
+	"filament_id": "OFSDfduA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.8 HF nozzle.json
index e0d6448c72..27d6515ccb 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "HUSkDZL6rCpz0lRk",
-	"filament_id": "OFKpQTJI",
+	"filament_id": "OFSDfduA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 HF nozzle.json
index a37ab23204..7db519170a 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "8xgu0AnMuKbPWyVd",
-	"filament_id": "OFKpQTJI",
+	"filament_id": "OFSDfduA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 nozzle.json
index a9ceca338a..2123c33993 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "Rgqt3MjxOye5EaFt",
-	"filament_id": "OFKpQTJI",
+	"filament_id": "OFSDfduA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.8 HF nozzle.json
index df74375b18..a5ce644702 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "PBFsW5qhVbQteYh5",
-	"filament_id": "OFKpQTJI",
+	"filament_id": "OFSDfduA",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.6 nozzle.json
index 6eca69f2b4..897054d8ee 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @Flashforge",
 	"from": "system",
 	"setting_id": "TPbHmcFyPyjvoERv",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json
index c0e5b624e4..adb4820faa 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @Flashforge",
 	"from": "system",
 	"setting_id": "zLMgsyDmdoXHhqFv",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"45"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json
index 06a632a6c5..5c5f690cd2 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @Flashforge",
 	"from": "system",
 	"setting_id": "ThakVhjfpgnAlEVH",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"cool_plate_temp": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 HF nozzle.json
index 676484711e..b67887cc8b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "M0ozqaD3jSKoD6fm",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 nozzle.json
index 01fd9f2752..ae6049673b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "ob8IkvzNt9CWCzbk",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.8 HF nozzle.json
index 9f72e9eaca..37bef9c3f6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "NzxX1lyRJ7wLUihV",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json
index ecd3bbb764..c5b24e9e04 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @Flashforge",
 	"from": "system",
 	"setting_id": "4FIGiheSGvSJPw3s",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 HF nozzle.json
index bcfe2516a2..23cd8d6326 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "1GNqSBaQitzhYSx7",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 nozzle.json
index 22373250ff..eb2a423bca 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "eOhMygyxaccdov7o",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.8 HF nozzle.json
index 7d393a9b9d..f4b91222e7 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.8 HF nozzle.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.8 HF nozzle.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle",
 	"from": "system",
 	"setting_id": "LxooKiOkRncktNLf",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json
index cdcee7c997..9e675ccd52 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @Flashforge",
 	"from": "system",
 	"setting_id": "HdoJfbQr0uwQ6Vwb",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json
index c3042b14b1..aa2f6251dc 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @Flashforge",
 	"from": "system",
 	"setting_id": "J4EaFhnpkLDcl5wH",
-	"filament_id": "OFAf9pJF",
+	"filament_id": "OFSqIcJC",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"filament_settings_id": [
 		"Flashforge TPU 95A"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json
index 1daa3b0189..5a4e304862 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @System",
 	"from": "system",
 	"setting_id": "fd5bACFa33J7aTdp",
-	"filament_id": "OF995YXg",
+	"filament_id": "OF8GtyKJ",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json
index 3145267db2..428afe7f1c 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @System",
 	"from": "system",
 	"setting_id": "hrcELA2qEMkZ6Wvj",
-	"filament_id": "OF995YXg",
+	"filament_id": "OF8GtyKJ",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json
index 96c3798a71..407e92aed8 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @System",
 	"from": "system",
 	"setting_id": "Lis7BZ3lMkoX5KQt",
-	"filament_id": "OF41jaTh",
+	"filament_id": "OFwlZ7gH",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json
index 18e401489e..611724b460 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @System",
 	"from": "system",
 	"setting_id": "xY03Hiidu5YNSUyZ",
-	"filament_id": "OF41jaTh",
+	"filament_id": "OFwlZ7gH",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json
index 3fee2a98b2..0c27bb94c6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @System",
 	"from": "system",
 	"setting_id": "AHu6wNV3zcPBusOF",
-	"filament_id": "OFNWnx2c",
+	"filament_id": "OFx0WlzS",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"40"
diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json
index d7625a7d8d..e3b05721e6 100644
--- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json	
@@ -4,7 +4,10 @@
 	"inherits": "Generic TPU @System",
 	"from": "system",
 	"setting_id": "8MBRqfLIRdhxk1dF",
-	"filament_id": "OFNWnx2c",
+	"filament_id": "OFx0WlzS",
+	"filament_vendor": [
+		"Flashforge"
+	],
 	"instantiation": "true",
 	"activate_air_filtration": [
 		"1"
diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json
index 4b212a6283..5ad0cca8f6 100644
--- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json	
+++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json	
@@ -2,6 +2,7 @@
 	"type": "filament",
 	"name": "FusRock PAHT-CF @FF C5",
 	"inherits": "Generic PA-CF @System",
+	"renamed_from": "Flashforge PAHT-CF @FF C5;Flashforge PAHT-CF FF C5",
 	"from": "system",
 	"setting_id": "gZqAGVOlWR79n7hN",
 	"filament_id": "OFKW5hEW",
diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json
index a9e1bce236..b23f871add 100644
--- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json	
+++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json	
@@ -2,6 +2,7 @@
 	"type": "filament",
 	"name": "FusRock PAHT-CF @FF C5P",
 	"inherits": "Generic PA-CF @System",
+	"renamed_from": "Flashforge PAHT-CF @FF C5P;Flashforge PAHT-CF FF C5P",
 	"from": "system",
 	"setting_id": "nJF1lCOavNNh4yHs",
 	"filament_id": "OFKW5hEW",
diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json
index f8595f254b..22ea704736 100644
--- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json	
+++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json	
@@ -2,6 +2,7 @@
 	"type": "filament",
 	"name": "FusRock PAHT-CF @FF G4",
 	"inherits": "Generic PLA-CF10 @Flashforge",
+	"renamed_from": "Flashforge PAHT-CF @FF G4;Flashforge PAHT-CF FF G4",
 	"from": "system",
 	"setting_id": "nH6pwFYsPyBzL1EB",
 	"filament_id": "OFKW5hEW",
diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json
index 8634877859..5156df9505 100644
--- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json	
+++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json	
@@ -2,6 +2,7 @@
 	"type": "filament",
 	"name": "FusRock PAHT-CF @FF G4P",
 	"inherits": "Generic PLA-CF10 @Flashforge",
+	"renamed_from": "Flashforge PAHT-CF @FF G4P;Flashforge PAHT-CF FF G4P",
 	"from": "system",
 	"setting_id": "wmWMf3MfmbfZx2o8",
 	"filament_id": "OFKW5hEW",
diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json
index 128926c992..710554df5a 100644
--- a/resources/profiles/Ratrig.json
+++ b/resources/profiles/Ratrig.json
@@ -1,6 +1,6 @@
 {
 	"name": "RatRig",
-	"version": "02.04.00.03",
+	"version": "02.04.00.04",
 	"force_update": "0",
 	"description": "RatRig configurations",
 	"machine_model_list": [
@@ -313,8 +313,8 @@
 			"sub_path": "filament/fdm_filament_tpu.json"
 		},
 		{
-			"name": "RatRig BigNozzle ABS",
-			"sub_path": "filament/RatRig BigNozzle ABS.json"
+			"name": "Generic ABS BigNozzle @RatRig",
+			"sub_path": "filament/Generic ABS BigNozzle @RatRig.json"
 		},
 		{
 			"name": "Generic ABS @RatRig",
@@ -325,8 +325,8 @@
 			"sub_path": "filament/RatRig PunkFil ABS.json"
 		},
 		{
-			"name": "RatRig BigNozzle ASA",
-			"sub_path": "filament/RatRig BigNozzle ASA.json"
+			"name": "Generic ASA BigNozzle @RatRig",
+			"sub_path": "filament/Generic ASA BigNozzle @RatRig.json"
 		},
 		{
 			"name": "Generic ASA @RatRig",
@@ -345,12 +345,12 @@
 			"sub_path": "filament/Generic PC @RatRig.json"
 		},
 		{
-			"name": "RatRig BigNozzle PCTG",
-			"sub_path": "filament/RatRig BigNozzle PCTG.json"
+			"name": "Generic PCTG BigNozzle @RatRig",
+			"sub_path": "filament/Generic PCTG BigNozzle @RatRig.json"
 		},
 		{
-			"name": "RatRig BigNozzle PETG",
-			"sub_path": "filament/RatRig BigNozzle PETG.json"
+			"name": "Generic PETG BigNozzle @RatRig",
+			"sub_path": "filament/Generic PETG BigNozzle @RatRig.json"
 		},
 		{
 			"name": "Generic PCTG @RatRig",
@@ -369,8 +369,8 @@
 			"sub_path": "filament/RatRig PunkFil PETG CF.json"
 		},
 		{
-			"name": "RatRig BigNozzle PLA",
-			"sub_path": "filament/RatRig BigNozzle PLA.json"
+			"name": "Generic PLA BigNozzle @RatRig",
+			"sub_path": "filament/Generic PLA BigNozzle @RatRig.json"
 		},
 		{
 			"name": "Generic PLA @RatRig",
@@ -385,8 +385,8 @@
 			"sub_path": "filament/Generic PVA @RatRig.json"
 		},
 		{
-			"name": "RatRig BigNozzle TPU",
-			"sub_path": "filament/RatRig BigNozzle TPU.json"
+			"name": "Generic TPU BigNozzle @RatRig",
+			"sub_path": "filament/Generic TPU BigNozzle @RatRig.json"
 		},
 		{
 			"name": "Generic TPU @RatRig",
diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json b/resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json
similarity index 93%
rename from resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json
rename to resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json
index 698d14aba2..3d071c779a 100644
--- a/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json	
+++ b/resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json	
@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "RatRig BigNozzle ABS",
+	"name": "Generic ABS BigNozzle @RatRig",
 	"inherits": "fdm_filament_abs",
+	"renamed_from": "RatRig BigNozzle ABS",
 	"from": "system",
-	"setting_id": "oE39mwr3PCpeBxZN",
-	"filament_id": "OFtplX8o",
+	"setting_id": "4GJ4GHOuApWBbQoS",
+	"filament_id": "OFnyHfcv",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.94"
diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json b/resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json
similarity index 93%
rename from resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json
rename to resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json
index c16d3c7869..f6f85f78e7 100644
--- a/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json	
+++ b/resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json	
@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "RatRig BigNozzle ASA",
+	"name": "Generic ASA BigNozzle @RatRig",
 	"inherits": "fdm_filament_asa",
+	"renamed_from": "RatRig BigNozzle ASA",
 	"from": "system",
-	"setting_id": "GGkbwdd79jAXnwuf",
-	"filament_id": "OFgcryz4",
+	"setting_id": "n2V9gkhbqWJzsQBK",
+	"filament_id": "OF4GM5qX",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.92"
diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json b/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json
similarity index 93%
rename from resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json
rename to resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json
index ce0edbd3b0..0592709a82 100644
--- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json	
+++ b/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json	
@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "RatRig BigNozzle PCTG",
+	"name": "Generic PCTG BigNozzle @RatRig",
 	"inherits": "fdm_filament_pet",
+	"renamed_from": "RatRig BigNozzle PCTG",
 	"from": "system",
-	"setting_id": "uCKZhFAPvEa2wKnA",
-	"filament_id": "OFFC0VqZ",
+	"setting_id": "HPaol79uY9NdhasQ",
+	"filament_id": "OFYfAcLY",
 	"instantiation": "true",
 	"reduce_fan_stop_start_freq": [
 		"1"
diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json b/resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json
similarity index 93%
rename from resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json
rename to resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json
index 1595d776b2..213f41628c 100644
--- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json	
+++ b/resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json	
@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "RatRig BigNozzle PETG",
+	"name": "Generic PETG BigNozzle @RatRig",
 	"inherits": "fdm_filament_pet",
+	"renamed_from": "RatRig BigNozzle PETG",
 	"from": "system",
-	"setting_id": "bf3YMNVRSE1i1E8N",
-	"filament_id": "OFmexHIS",
+	"setting_id": "pRM6IVX5T3y6Ywj4",
+	"filament_id": "OFvD0Qqt",
 	"instantiation": "true",
 	"reduce_fan_stop_start_freq": [
 		"1"
diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json b/resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json
similarity index 92%
rename from resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json
rename to resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json
index 75be42804b..08d546aafc 100644
--- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json	
+++ b/resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json	
@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "RatRig BigNozzle PLA",
+	"name": "Generic PLA BigNozzle @RatRig",
 	"inherits": "fdm_filament_pla",
+	"renamed_from": "RatRig BigNozzle PLA",
 	"from": "system",
-	"setting_id": "dyG3zLuhX2qe8XJP",
-	"filament_id": "OFiuJSmy",
+	"setting_id": "WEI4QiKyANQOK7dG",
+	"filament_id": "OFqFRiLb",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.94"
diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json b/resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json
similarity index 92%
rename from resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json
rename to resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json
index c220b6dc58..4714f57d5a 100644
--- a/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json	
+++ b/resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json	
@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "RatRig BigNozzle TPU",
+	"name": "Generic TPU BigNozzle @RatRig",
 	"inherits": "fdm_filament_tpu",
+	"renamed_from": "RatRig BigNozzle TPU",
 	"from": "system",
-	"setting_id": "wLJ3X05Jnz1EqeOI",
-	"filament_id": "OFsNJjpc",
+	"setting_id": "9UWg2cO61XFdlWxo",
+	"filament_id": "OF5tX6va",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"5"
diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json
index b41888a840..0fb50e0560 100644
--- a/resources/profiles/retired_filament_ids.json
+++ b/resources/profiles/retired_filament_ids.json
@@ -2352,6 +2352,12 @@
    ],
    "successor": "OFDvXujf"
   },
+  "OF1bQyX2": {
+   "claims": [
+    "Flashforge/Flashforge PLA Matte"
+   ],
+   "successor": "OF6qAuyi"
+  },
   "OF1daEUW": {
    "claims": [
     "Anker/Anker Generic PETG-CF"
@@ -2370,6 +2376,12 @@
    ],
    "successor": "OFcVLpNA"
   },
+  "OF2bZtyg": {
+   "claims": [
+    "Flashforge/Flashforge PLA-CF"
+   ],
+   "successor": "OF9cAwMK"
+  },
   "OF2mgDsI": {
    "claims": [
     "Vzbot/Vzbot Generic PLA"
@@ -2396,6 +2408,12 @@
    ],
    "successor": "OFYPdQJh"
   },
+  "OF41jaTh": {
+   "claims": [
+    "Flashforge/Flashforge TPU-90A"
+   ],
+   "successor": "OFwlZ7gH"
+  },
   "OF42ZDpN": {
    "claims": [
     "Flashforge/FusRock PAHT"
@@ -2450,6 +2468,12 @@
    ],
    "successor": "OFLakOUI"
   },
+  "OF5NQFKI": {
+   "claims": [
+    "Flashforge/Flashforge PLA Galaxy"
+   ],
+   "successor": "OFJJ0Ar3"
+  },
   "OF5Zk4e1": {
    "claims": [
     "Anycubic/Anycubic Generic ABS"
@@ -2463,6 +2487,12 @@
    ],
    "successor": "OFDSrzZ8"
   },
+  "OF5w29Kq": {
+   "claims": [
+    "Flashforge/Flashforge HS PETG"
+   ],
+   "successor": "OFDxxTpW"
+  },
   "OF67EdL5": {
    "claims": [
     "Sovol/Sovol SV06 ACE ABS"
@@ -2523,6 +2553,12 @@
    ],
    "successor": "OFgbpcy9"
   },
+  "OF6ueBwd": {
+   "claims": [
+    "Flashforge/Flashforge PLA  Pro"
+   ],
+   "successor": "OFm4SivL"
+  },
   "OF6vKLaU": {
    "claims": [
     "Artillery/Artillery Generic ASA"
@@ -2583,6 +2619,12 @@
    ],
    "successor": "OFLakOUI"
   },
+  "OF995YXg": {
+   "claims": [
+    "Flashforge/Flashforge TPU-64D"
+   ],
+   "successor": "OF8GtyKJ"
+  },
   "OF9fOPpd": {
    "claims": [
     "Vzbot/Vzbot Generic PC"
@@ -2601,6 +2643,12 @@
    ],
    "successor": "OFDSrzZ8"
   },
+  "OFAf9pJF": {
+   "claims": [
+    "Flashforge/Flashforge TPU 95A"
+   ],
+   "successor": "OFSqIcJC"
+  },
   "OFB09fpe": {
    "claims": [
     "Ratrig/RatRig Generic TPU"
@@ -2644,6 +2692,12 @@
    ],
    "successor": "OFLPAxz3"
   },
+  "OFBK6zAi": {
+   "claims": [
+    "Flashforge/Flashforge PETG-CF"
+   ],
+   "successor": "OFuFEtKX"
+  },
   "OFBpcB0a": {
    "claims": [
     "TwoTrees/TwoTrees Generic HS PLA"
@@ -2714,6 +2768,12 @@
    ],
    "successor": "OFgbpcy9"
   },
+  "OFEMfQsX": {
+   "claims": [
+    "Flashforge/Flashforge PETG Basic"
+   ],
+   "successor": "OFYYeMyQ"
+  },
   "OFENzGSm": {
    "claims": [
     "FLSun/FLSun T1 TPU"
@@ -2738,6 +2798,12 @@
    ],
    "successor": "OFWbdGsC"
   },
+  "OFFC0VqZ": {
+   "claims": [
+    "Ratrig/RatRig BigNozzle PCTG"
+   ],
+   "successor": "OFYfAcLY"
+  },
   "OFFZ0BBL": {
    "claims": [
     "FlyingBear/FlyingBear Generic PLA"
@@ -2786,6 +2852,18 @@
    ],
    "successor": "OF6rdQ6M"
   },
+  "OFH5UH6P": {
+   "claims": [
+    "Flashforge/Flashforge ABS-GF"
+   ],
+   "successor": "OFojbdhR"
+  },
+  "OFH6Pjxe": {
+   "claims": [
+    "Flashforge/Flashforge PLA  Matte"
+   ],
+   "successor": "OF6qAuyi"
+  },
   "OFHFZ1Te": {
    "claims": [
     "Prusa/Prusa Generic PLA Silk"
@@ -2854,6 +2932,12 @@
    ],
    "successor": "OFQyyO0l"
   },
+  "OFIxitiU": {
+   "claims": [
+    "Flashforge/Flashforge PLA Basic"
+   ],
+   "successor": "OFJ3F2jm"
+  },
   "OFIy3kLw": {
    "claims": [
     "Prusa/Prusa Generic PA"
@@ -2902,6 +2986,12 @@
    ],
    "successor": "OFzRtFM9"
   },
+  "OFK74HJD": {
+   "claims": [
+    "Flashforge/Flashforge PLA Pro"
+   ],
+   "successor": "OFm4SivL"
+  },
   "OFKNAhls": {
    "claims": [
     "Qidi/Qidi Generic PETG"
@@ -2914,6 +3004,12 @@
    ],
    "successor": "OFvmwTZE"
   },
+  "OFKpQTJI": {
+   "claims": [
+    "Flashforge/Flashforge TPU 65D"
+   ],
+   "successor": "OFSDfduA"
+  },
   "OFKuTr12": {
    "claims": [
     "Tiertime/Tiertime Generic PE"
@@ -2944,6 +3040,12 @@
    ],
    "successor": "OFhQfUQY"
   },
+  "OFLYDIb8": {
+   "claims": [
+    "Flashforge/Flashforge PLA Silk"
+   ],
+   "successor": "OFgjgN35"
+  },
   "OFLrdHse": {
    "claims": [
     "Flashforge/Flashforge Generic HS PLA"
@@ -2968,6 +3070,12 @@
    ],
    "successor": "OFgbpcy9"
   },
+  "OFMIma8C": {
+   "claims": [
+    "Flashforge/Flashforge PLA Luminous"
+   ],
+   "successor": "OFdqkWtz"
+  },
   "OFMIurFh": {
    "claims": [
     "Creality/Creality HF Generic Speed PLA"
@@ -3006,6 +3114,12 @@
    ],
    "successor": "OFg8ndtj"
   },
+  "OFMyLYV8": {
+   "claims": [
+    "Flashforge/Flashforge PETG Transparent"
+   ],
+   "successor": "OFwjMiKL"
+  },
   "OFN7aNHe": {
    "claims": [
     "Tiertime/Tiertime Generic PC"
@@ -3036,6 +3150,12 @@
    ],
    "successor": "OFDSrzZ8"
   },
+  "OFNWnx2c": {
+   "claims": [
+    "Flashforge/Flashforge TPU-95A"
+   ],
+   "successor": "OFx0WlzS"
+  },
   "OFNX8GI1": {
    "claims": [
     "Sovol/Sovol Zero ABS"
@@ -3084,6 +3204,12 @@
    ],
    "successor": "OF7lOgYF"
   },
+  "OFPQfNAf": {
+   "claims": [
+    "Flashforge/Flashforge PETG Pro"
+   ],
+   "successor": "OFXiArjA"
+  },
   "OFPdhDlK": {
    "claims": [
     "Anycubic/Anycubic Generic PA-CF"
@@ -3132,12 +3258,24 @@
    ],
    "successor": "OFWbdGsC"
   },
+  "OFQZeyZv": {
+   "claims": [
+    "Flashforge/Flashforge PLA Buint Ti"
+   ],
+   "successor": "OF8O09RG"
+  },
   "OFQbqeN7": {
    "claims": [
     "Qidi/Qidi Generic PA"
    ],
    "successor": "OFg8ndtj"
   },
+  "OFQiq4fb": {
+   "claims": [
+    "Flashforge/Flashforge PVA"
+   ],
+   "successor": "OFaaddbQ"
+  },
   "OFQswlnF": {
    "claims": [
     "Tiertime/Tiertime Generic PA"
@@ -3224,6 +3362,12 @@
    ],
    "successor": "OFmCOW2Y"
   },
+  "OFShw1X8": {
+   "claims": [
+    "Flashforge/Flashforge ABS Basic"
+   ],
+   "successor": "OFibWuBd"
+  },
   "OFTKFAZ4": {
    "claims": [
     "Tiertime/Tiertime Generic PCTG"
@@ -3260,6 +3404,12 @@
    ],
    "successor": "OFY9muEs"
   },
+  "OFUCpLaL": {
+   "claims": [
+    "Flashforge/FlashForge PPS"
+   ],
+   "successor": "OFlgMgNM"
+  },
   "OFUScM0D": {
    "claims": [
     "Flashforge/FusRock S-Multi"
@@ -3338,6 +3488,12 @@
    ],
    "successor": "OFY9muEs"
   },
+  "OFWnSvGu": {
+   "claims": [
+    "Flashforge/Flashforge ASA-GF"
+   ],
+   "successor": "OFrZDhVt"
+  },
   "OFWof1Ap": {
    "claims": [
     "FLSun/FLSun Generic ABS"
@@ -3460,6 +3616,12 @@
    ],
    "successor": "OFCn83wF"
   },
+  "OFaBwRvT": {
+   "claims": [
+    "Flashforge/Flashforge ASA Basic"
+   ],
+   "successor": "OFFFg2Pf"
+  },
   "OFaFNP2U": {
    "claims": [
     "Sovol/Sovol SV07 PLA"
@@ -3478,6 +3640,12 @@
    ],
    "successor": "OFLakOUI"
   },
+  "OFaz8VoR": {
+   "claims": [
+    "Flashforge/Flashforge HIPS"
+   ],
+   "successor": "OFvaLVML"
+  },
   "OFbeeFkl": {
    "claims": [
     "OrcaArena/OrcaArena Generic PLA Silk"
@@ -3575,6 +3743,12 @@
    ],
    "successor": "OFgbpcy9"
   },
+  "OFe6sfXS": {
+   "claims": [
+    "Flashforge/FlashForge PC"
+   ],
+   "successor": "OFWXCbVF"
+  },
   "OFe7Sx5B": {
    "claims": [
     "Sovol/Sovol SV06 ACE PETG"
@@ -3606,6 +3780,12 @@
    ],
    "successor": "OFi6PfUM"
   },
+  "OFec7Qiw": {
+   "claims": [
+    "Flashforge/Flashforge PLA Sparkle"
+   ],
+   "successor": "OFV5c8hG"
+  },
   "OFetENFF": {
    "claims": [
     "OrcaArena/OrcaArena Generic ABS"
@@ -3654,6 +3834,18 @@
    ],
    "successor": "OFWbdGsC"
   },
+  "OFgcryz4": {
+   "claims": [
+    "Ratrig/RatRig BigNozzle ASA"
+   ],
+   "successor": "OF4GM5qX"
+  },
+  "OFgf4gZa": {
+   "claims": [
+    "Flashforge/Flashforge PA"
+   ],
+   "successor": "OFEvEfw5"
+  },
   "OFgvOmM2": {
    "claims": [
     "Anker/Anker Generic PETG",
@@ -3668,6 +3860,12 @@
    ],
    "successor": "OFgbpcy9"
   },
+  "OFi7Bf0F": {
+   "claims": [
+    "Flashforge/Flashforge ABS-CF"
+   ],
+   "successor": "OFYTIMbj"
+  },
   "OFiCHnso": {
    "claims": [
     "Prusa/Prusa Generic PLA"
@@ -3692,6 +3890,12 @@
    ],
    "successor": "OFDvXujf"
   },
+  "OFiuJSmy": {
+   "claims": [
+    "Ratrig/RatRig BigNozzle PLA"
+   ],
+   "successor": "OFqFRiLb"
+  },
   "OFixgF4N": {
    "claims": [
     "Flashforge/FusRock S-Multi"
@@ -3722,6 +3926,12 @@
    ],
    "successor": "OFsijjtH"
   },
+  "OFkwIWwc": {
+   "claims": [
+    "Flashforge/Flashforge PLA Color Change"
+   ],
+   "successor": "OFMkAW6r"
+  },
   "OFl2SXmv": {
    "claims": [
     "Prusa/Prusa Generic FLEX"
@@ -3764,12 +3974,24 @@
    ],
    "successor": "OFWbdGsC"
   },
+  "OFmQkb3c": {
+   "claims": [
+    "Flashforge/Flashforge HS PLA Burnt Ti"
+   ],
+   "successor": "OF8O09RG"
+  },
   "OFma52eS": {
    "claims": [
     "Blocks/Blocks Generic ABS"
    ],
    "successor": "OFY9muEs"
   },
+  "OFmexHIS": {
+   "claims": [
+    "Ratrig/RatRig BigNozzle PETG"
+   ],
+   "successor": "OFvD0Qqt"
+  },
   "OFmhWhEf": {
    "claims": [
     "Creality/Creality HF Generic PLA"
@@ -3788,6 +4010,12 @@
    ],
    "successor": "OFLPAxz3"
   },
+  "OFnMv3W5": {
+   "claims": [
+    "Flashforge/Flashforge HS PLA"
+   ],
+   "successor": "OFIK2H3G"
+  },
   "OFndmfJ1": {
    "claims": [
     "Anker/Anker Generic PLA",
@@ -3838,6 +4066,12 @@
    ],
    "successor": "OFmpMwxS"
   },
+  "OFogbnCb": {
+   "claims": [
+    "Flashforge/FlashForge PPS-CF"
+   ],
+   "successor": "OFTSXxzE"
+  },
   "OFoqrHTw": {
    "claims": [
     "FLSun/FLSun S1 PLA High Speed"
@@ -3928,6 +4162,12 @@
    ],
    "successor": "OFCD8qiU"
   },
+  "OFrnkURQ": {
+   "claims": [
+    "Flashforge/Flashforge PLA  Metal"
+   ],
+   "successor": "OFAebKg8"
+  },
   "OFrrMLDw": {
    "claims": [
     "Flashforge/Flashforge Generic PLA-SILK"
@@ -3964,6 +4204,12 @@
    ],
    "successor": "OFYPdQJh"
   },
+  "OFsNJjpc": {
+   "claims": [
+    "Ratrig/RatRig BigNozzle TPU"
+   ],
+   "successor": "OF5tX6va"
+  },
   "OFsXOMoX": {
    "claims": [
     "Qidi/Qidi Generic PLA+"
@@ -4000,6 +4246,12 @@
    ],
    "successor": "OFDSrzZ8"
   },
+  "OFtplX8o": {
+   "claims": [
+    "Ratrig/RatRig BigNozzle ABS"
+   ],
+   "successor": "OFnyHfcv"
+  },
   "OFtsVp4v": {
    "claims": [
     "SecKit/SecKit Generic PA-CF"
@@ -4012,6 +4264,18 @@
    ],
    "successor": "OFDSrzZ8"
   },
+  "OFuFqYyG": {
+   "claims": [
+    "Flashforge/Flashforge PAHT-CF"
+   ],
+   "successor": "OFKW5hEW"
+  },
+  "OFuGRMNV": {
+   "claims": [
+    "Flashforge/Flashforge PA-CF"
+   ],
+   "successor": "OFGxuI0n"
+  },
   "OFuSwKgm": {
    "claims": [
     "Tiertime/Tiertime Generic PLA"
@@ -4048,6 +4312,12 @@
    ],
    "successor": "OFq9svOz"
   },
+  "OFvVxvzZ": {
+   "claims": [
+    "Flashforge/Flashforge PLA Metal"
+   ],
+   "successor": "OFAebKg8"
+  },
   "OFwMFLAm": {
    "claims": [
     "Artillery/Artillery Generic ABS"
@@ -4072,6 +4342,12 @@
    ],
    "successor": "OFWbdGsC"
   },
+  "OFxMGIPt": {
+   "claims": [
+    "Flashforge/Flashforge PPS"
+   ],
+   "successor": "OFlgMgNM"
+  },
   "OFxTMg1d": {
    "claims": [
     "FlyingBear/FlyingBear Generic PC"
diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json
index b3e38041f3..5eedb85a5e 100644
--- a/scripts/filament_id_snapshot.json
+++ b/scripts/filament_id_snapshot.json
@@ -19,8 +19,6 @@
   "Flashforge/Flashforge HS PLA @FF C5P",
   "Flashforge/Flashforge PA-CF @FF C5",
   "Flashforge/Flashforge PA-CF @FF C5P",
-  "Flashforge/Flashforge PAHT-CF @FF C5",
-  "Flashforge/Flashforge PAHT-CF @FF C5P",
   "Flashforge/Flashforge PET-CF @FF C5",
   "Flashforge/Flashforge PET-CF @FF C5P",
   "Flashforge/Flashforge PETG Pro @FF C5",
@@ -29,12 +27,6 @@
   "Flashforge/Flashforge PETG Transparent @FF C5P",
   "Flashforge/Flashforge PETG-CF @FF C5",
   "Flashforge/Flashforge PETG-CF @FF C5P",
-  "Flashforge/Flashforge PLA  Matte @FF C5",
-  "Flashforge/Flashforge PLA  Matte @FF C5P",
-  "Flashforge/Flashforge PLA  Metal @FF C5",
-  "Flashforge/Flashforge PLA  Metal @FF C5P",
-  "Flashforge/Flashforge PLA  Pro @FF C5",
-  "Flashforge/Flashforge PLA  Pro @FF C5P",
   "Flashforge/Flashforge PLA Basic @FF C5",
   "Flashforge/Flashforge PLA Basic @FF C5P",
   "Flashforge/Flashforge PLA Color Change @FF C5",
@@ -43,6 +35,12 @@
   "Flashforge/Flashforge PLA Galaxy @FF C5P",
   "Flashforge/Flashforge PLA Luminous @FF C5",
   "Flashforge/Flashforge PLA Luminous @FF C5P",
+  "Flashforge/Flashforge PLA Matte @FF C5",
+  "Flashforge/Flashforge PLA Matte @FF C5P",
+  "Flashforge/Flashforge PLA Metal @FF C5",
+  "Flashforge/Flashforge PLA Metal @FF C5P",
+  "Flashforge/Flashforge PLA Pro @FF C5",
+  "Flashforge/Flashforge PLA Pro @FF C5P",
   "Flashforge/Flashforge PLA Silk @FF C5",
   "Flashforge/Flashforge PLA Silk @FF C5P",
   "Flashforge/Flashforge PLA-CF @FF C5",
@@ -247,20 +245,6 @@
   "Elegoo/Generic PETG PRO @Elegoo",
   "Elegoo/Generic PETG-CF @Elegoo Centauri",
   "Elegoo/Generic PLA Matte @Elegoo",
-  "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle",
-  "Flashforge/FlashForge PC @FF G4 0.6 nozzle",
-  "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle",
-  "Flashforge/FlashForge PC @FF G4P 0.6 HF nozzle",
-  "Flashforge/FlashForge PC @FF G4P 0.6 nozzle",
-  "Flashforge/FlashForge PC @FF G4P 0.8 HF nozzle",
-  "Flashforge/FlashForge PPS @FF G4 0.6 HF nozzle",
-  "Flashforge/FlashForge PPS @FF G4 0.6 nozzle",
-  "Flashforge/FlashForge PPS @FF G4 0.8 HF nozzle",
-  "Flashforge/FlashForge PPS @FF G4P 0.6 HF nozzle",
-  "Flashforge/FlashForge PPS @FF G4P 0.6 nozzle",
-  "Flashforge/FlashForge PPS @FF G4P 0.8 HF nozzle",
-  "Flashforge/FlashForge PPS-CF @FF G4 0.6 nozzle",
-  "Flashforge/FlashForge PPS-CF @FF G4P 0.6 nozzle",
   "Flashforge/Flashforge ABS @FF AD5M 0.25 Nozzle",
   "Flashforge/Flashforge ABS Basic",
   "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle",
@@ -389,10 +373,12 @@
   "Flashforge/Flashforge PA12-CF",
   "Flashforge/Flashforge PA6-CF",
   "Flashforge/Flashforge PA66-CF",
-  "Flashforge/Flashforge PAHT-CF @FF C5",
-  "Flashforge/Flashforge PAHT-CF @FF C5P",
-  "Flashforge/Flashforge PAHT-CF @FF G4",
-  "Flashforge/Flashforge PAHT-CF @FF G4P",
+  "Flashforge/Flashforge PC @FF G4 0.6 HF nozzle",
+  "Flashforge/Flashforge PC @FF G4 0.6 nozzle",
+  "Flashforge/Flashforge PC @FF G4 0.8 HF nozzle",
+  "Flashforge/Flashforge PC @FF G4P 0.6 HF nozzle",
+  "Flashforge/Flashforge PC @FF G4P 0.6 nozzle",
+  "Flashforge/Flashforge PC @FF G4P 0.8 HF nozzle",
   "Flashforge/Flashforge PET-CF",
   "Flashforge/Flashforge PET-CF @FF C5",
   "Flashforge/Flashforge PET-CF @FF C5P",
@@ -449,12 +435,6 @@
   "Flashforge/Flashforge PETG-CF @FF G4 0.6 nozzle",
   "Flashforge/Flashforge PETG-CF @FF G4P",
   "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle",
-  "Flashforge/Flashforge PLA  Matte @FF C5",
-  "Flashforge/Flashforge PLA  Matte @FF C5P",
-  "Flashforge/Flashforge PLA  Metal @FF C5",
-  "Flashforge/Flashforge PLA  Metal @FF C5P",
-  "Flashforge/Flashforge PLA  Pro @FF C5",
-  "Flashforge/Flashforge PLA  Pro @FF C5P",
   "Flashforge/Flashforge PLA Basic",
   "Flashforge/Flashforge PLA Basic @FF AD5M 0.25 nozzle",
   "Flashforge/Flashforge PLA Basic @FF AD5X",
@@ -475,8 +455,6 @@
   "Flashforge/Flashforge PLA Basic @FF G4P 0.6 nozzle",
   "Flashforge/Flashforge PLA Basic @FF G4P 0.8 HF nozzle",
   "Flashforge/Flashforge PLA Basic @FF G4P HF",
-  "Flashforge/Flashforge PLA Buint Ti @FF G4 0.8 nozzle",
-  "Flashforge/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle",
   "Flashforge/Flashforge PLA Color Change",
   "Flashforge/Flashforge PLA Color Change @FF AD5M 0.25 nozzle",
   "Flashforge/Flashforge PLA Color Change @FF AD5X",
@@ -541,6 +519,8 @@
   "Flashforge/Flashforge PLA Matte @FF AD5X 0.25 nozzle",
   "Flashforge/Flashforge PLA Matte @FF AD5X 0.6 nozzle",
   "Flashforge/Flashforge PLA Matte @FF AD5X 0.8 nozzle",
+  "Flashforge/Flashforge PLA Matte @FF C5",
+  "Flashforge/Flashforge PLA Matte @FF C5P",
   "Flashforge/Flashforge PLA Matte @FF G4",
   "Flashforge/Flashforge PLA Matte @FF G4 0.25 nozzle",
   "Flashforge/Flashforge PLA Matte @FF G4 0.6 HF nozzle",
@@ -559,6 +539,8 @@
   "Flashforge/Flashforge PLA Metal @FF AD5X 0.25 nozzle",
   "Flashforge/Flashforge PLA Metal @FF AD5X 0.6 nozzle",
   "Flashforge/Flashforge PLA Metal @FF AD5X 0.8 nozzle",
+  "Flashforge/Flashforge PLA Metal @FF C5",
+  "Flashforge/Flashforge PLA Metal @FF C5P",
   "Flashforge/Flashforge PLA Metal @FF G4",
   "Flashforge/Flashforge PLA Metal @FF G4 0.25 nozzle",
   "Flashforge/Flashforge PLA Metal @FF G4 0.6 HF nozzle",
@@ -577,6 +559,8 @@
   "Flashforge/Flashforge PLA Pro @FF AD5X 0.25 nozzle",
   "Flashforge/Flashforge PLA Pro @FF AD5X 0.6 nozzle",
   "Flashforge/Flashforge PLA Pro @FF AD5X 0.8 nozzle",
+  "Flashforge/Flashforge PLA Pro @FF C5",
+  "Flashforge/Flashforge PLA Pro @FF C5P",
   "Flashforge/Flashforge PLA Pro @FF G4",
   "Flashforge/Flashforge PLA Pro @FF G4 0.25 nozzle",
   "Flashforge/Flashforge PLA Pro @FF G4 0.6 HF nozzle",
@@ -641,12 +625,20 @@
   "Flashforge/Flashforge PPA-CF @FF C5P",
   "Flashforge/Flashforge PPA-GF",
   "Flashforge/Flashforge PPS @FF G4",
+  "Flashforge/Flashforge PPS @FF G4 0.6 HF nozzle",
+  "Flashforge/Flashforge PPS @FF G4 0.6 nozzle",
+  "Flashforge/Flashforge PPS @FF G4 0.8 HF nozzle",
   "Flashforge/Flashforge PPS @FF G4P",
+  "Flashforge/Flashforge PPS @FF G4P 0.6 HF nozzle",
+  "Flashforge/Flashforge PPS @FF G4P 0.6 nozzle",
+  "Flashforge/Flashforge PPS @FF G4P 0.8 HF nozzle",
   "Flashforge/Flashforge PPS-CF",
   "Flashforge/Flashforge PPS-CF @FF C5",
   "Flashforge/Flashforge PPS-CF @FF C5P",
   "Flashforge/Flashforge PPS-CF @FF G4",
+  "Flashforge/Flashforge PPS-CF @FF G4 0.6 nozzle",
   "Flashforge/Flashforge PPS-CF @FF G4P",
+  "Flashforge/Flashforge PPS-CF @FF G4P 0.6 nozzle",
   "Flashforge/Flashforge PVA @FF C5",
   "Flashforge/Flashforge PVA @FF C5P",
   "Flashforge/Flashforge TPU 65D @FF G4 0.6 HF nozzle",
@@ -1592,9 +1584,6 @@
   "OF1W7c76": [
    "Qidi/QIDI ASA-CF"
   ],
-  "OF1bQyX2": [
-   "Flashforge/Flashforge PLA Matte"
-  ],
   "OF1d7c3A": [
    "Snapmaker/Snapmaker ASA"
   ],
@@ -1628,9 +1617,6 @@
   "OF2Z1nT5": [
    "OrcaFilamentLibrary/FilAr PETG Azul Imperial"
   ],
-  "OF2bZtyg": [
-   "Flashforge/Flashforge PLA-CF"
-  ],
   "OF2hfMcG": [
    "OrcaArena/Arena PLA-CF"
   ],
@@ -1671,9 +1657,6 @@
   "OF3ydJTT": [
    "InfiMech/InfiMech PLA Hyper"
   ],
-  "OF41jaTh": [
-   "Flashforge/Flashforge TPU-90A"
-  ],
   "OF43Raws": [
    "Snapmaker/PolyTerra J1 PLA"
   ],
@@ -1686,6 +1669,9 @@
   "OF4APyxe": [
    "Creality/Hyper PAHT-CF"
   ],
+  "OF4GM5qX": [
+   "Ratrig/Generic ASA BigNozzle"
+  ],
   "OF4KsW72": [],
   "OF4Nhggz": [
    "Artillery/Artillery PLA Basic+"
@@ -1732,9 +1718,6 @@
    "Qidi/PolyLite PLA",
    "Snapmaker/PolyLite PLA"
   ],
-  "OF5NQFKI": [
-   "Flashforge/Flashforge PLA Galaxy"
-  ],
   "OF5NqBfC": [
    "Wanhao France/YUMI PETG"
   ],
@@ -1767,15 +1750,15 @@
    "Snapmaker/Polymaker PLA Pro"
   ],
   "OF5rnhjh": [],
+  "OF5tX6va": [
+   "Ratrig/Generic TPU BigNozzle"
+  ],
   "OF5umxxT": [
    "Snapmaker/PolyLite PLA Glow"
   ],
   "OF5vgi2G": [
    "OrcaFilamentLibrary/FilAr PLA-mate Azul"
   ],
-  "OF5w29Kq": [
-   "Flashforge/Flashforge HS PETG"
-  ],
   "OF65InrS": [
    "Snapmaker/Snapmaker TPU"
   ],
@@ -1808,13 +1791,13 @@
   "OF6kj4jI": [
    "iQ/Fiberthree PACF Pro P2"
   ],
+  "OF6qAuyi": [
+   "Flashforge/Flashforge PLA Matte"
+  ],
   "OF6rdQ6M": [
    "Creality/Generic PPS-CF",
    "Tiertime/Generic PPS-CF"
   ],
-  "OF6ueBwd": [
-   "Flashforge/Flashforge PLA  Pro"
-  ],
   "OF70zbGS": [
    "Creality/Hyper L-W PLA"
   ],
@@ -1859,12 +1842,18 @@
   "OF8GnyFU": [
    "Creality/Hyper ABS"
   ],
+  "OF8GtyKJ": [
+   "Flashforge/Flashforge TPU-64D"
+  ],
   "OF8Hx3Pi": [
    "Cubicon/Cubicon PETG"
   ],
   "OF8Jl6NT": [
    "Snapmaker/Snapmaker J1 PET"
   ],
+  "OF8O09RG": [
+   "Flashforge/Flashforge HS PLA Burnt Ti"
+  ],
   "OF8Tlg47": [
    "OrcaFilamentLibrary/Generic PPA-GF",
    "Tiertime/Generic PPA-GF"
@@ -1891,9 +1880,6 @@
   "OF8wE5l7": [
    "Artillery/Artillery PETG Basic"
   ],
-  "OF995YXg": [
-   "Flashforge/Flashforge TPU-64D"
-  ],
   "OF99UMPq": [
    "BBL/COEX ABS",
    "OrcaFilamentLibrary/COEX ABS"
@@ -1914,6 +1900,9 @@
   "OF9UJOGF": [
    "Anycubic/Anycubic PETG-CF"
   ],
+  "OF9cAwMK": [
+   "Flashforge/Flashforge PLA-CF"
+  ],
   "OF9emAI9": [
    "Ratrig/RatRig PunkFil PETG"
   ],
@@ -1938,8 +1927,8 @@
   "OFAZllAN": [
    "Artillery/Artillery PLA-CF"
   ],
-  "OFAf9pJF": [
-   "Flashforge/Flashforge TPU 95A"
+  "OFAebKg8": [
+   "Flashforge/Flashforge PLA Metal"
   ],
   "OFAnyRUI": [
    "OrcaFilamentLibrary/Bambu Support For PLA"
@@ -1956,9 +1945,6 @@
   "OFBJAdLw": [
    "LH/LHS PCTG"
   ],
-  "OFBK6zAi": [
-   "Flashforge/Flashforge PETG-CF"
-  ],
   "OFBLktDy": [
    "Creality/Soleyin Basic PETG"
   ],
@@ -2141,6 +2127,9 @@
   "OFDxfPgH": [
    "OrcaFilamentLibrary/Bambu PLA Sparkle"
   ],
+  "OFDxxTpW": [
+   "Flashforge/Flashforge HS PETG"
+  ],
   "OFE0NFRh": [
    "BBL/COEX TPU 60A",
    "OrcaFilamentLibrary/COEX TPU 60A"
@@ -2148,9 +2137,6 @@
   "OFEGNJD4": [
    "OrcaFilamentLibrary/Bambu PLA Silk"
   ],
-  "OFEMfQsX": [
-   "Flashforge/Flashforge PETG Basic"
-  ],
   "OFEOnBj6": [
    "Snapmaker/Snapmaker PLA Lite"
   ],
@@ -2190,6 +2176,9 @@
   "OFEswT5W": [
    "OrcaFilamentLibrary/Bambu PLA-CF"
   ],
+  "OFEvEfw5": [
+   "Flashforge/Flashforge PA"
+  ],
   "OFEwRwmL": [
    "Cubicon/Cubicon PLA"
   ],
@@ -2206,8 +2195,8 @@
   "OFFAWVf0": [
    "Qidi/QIDI PC-ABS-FR"
   ],
-  "OFFC0VqZ": [
-   "Ratrig/RatRig BigNozzle PCTG"
+  "OFFFg2Pf": [
+   "Flashforge/Flashforge ASA Basic"
   ],
   "OFFNYwWR": [
    "OrcaFilamentLibrary/Bambu PA-CF"
@@ -2250,7 +2239,6 @@
   "OFGVwfK0": [
    "OrcaFilamentLibrary/FilAr PLA-mate Gris"
   ],
-  "OFGc282l": [],
   "OFGcLA5R": [
    "OrcaFilamentLibrary/FilAr PLA-mate Beige"
   ],
@@ -2273,18 +2261,15 @@
   "OFGxC8gB": [
    "Creality/CR-Wood"
   ],
+  "OFGxuI0n": [
+   "Flashforge/Flashforge PA-CF"
+  ],
   "OFH2nN08": [
    "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850"
   ],
   "OFH57ibH": [
    "Snapmaker/Polymaker Silk PLA Family"
   ],
-  "OFH5UH6P": [
-   "Flashforge/Flashforge ABS-GF"
-  ],
-  "OFH6Pjxe": [
-   "Flashforge/Flashforge PLA  Matte"
-  ],
   "OFH7b12v": [
    "Creality/Generic PAHT-CF"
   ],
@@ -2323,6 +2308,9 @@
   "OFIE3vOf": [
    "Anycubic/Anycubic PLA Matte"
   ],
+  "OFIK2H3G": [
+   "Flashforge/Flashforge HS PLA"
+  ],
   "OFIKZxPF": [
    "Creality/Generic PLA Wood"
   ],
@@ -2356,13 +2344,16 @@
   "OFIxOuOu": [
    "Snapmaker/PolyLite PLA Starlight"
   ],
-  "OFIxitiU": [
+  "OFJ3F2jm": [
    "Flashforge/Flashforge PLA Basic"
   ],
   "OFJ3HRsR": [
    "OrcaArena/Arena ABS"
   ],
   "OFJHBEGD": [],
+  "OFJJ0Ar3": [
+   "Flashforge/Flashforge PLA Galaxy"
+  ],
   "OFJNeELv": [
    "OrcaFilamentLibrary/FILL3D PA"
   ],
@@ -2373,6 +2364,7 @@
   "OFJQDUk3": [
    "OrcaFilamentLibrary/FilAr PETG Cristal"
   ],
+  "OFJS560n": [],
   "OFJWKoYG": [
    "iQ/Material4Print ABS Natur P1"
   ],
@@ -2397,9 +2389,6 @@
   "OFJxSqO4": [
    "Wanhao France/YUMI PLA Direct Drive"
   ],
-  "OFK74HJD": [
-   "Flashforge/Flashforge PLA Pro"
-  ],
   "OFK8XHPn": [
    "Qidi/Overture ABS"
   ],
@@ -2443,9 +2432,6 @@
    "OrcaFilamentLibrary/Panchroma PLA Marble",
    "Snapmaker/Panchroma PLA Marble"
   ],
-  "OFKpQTJI": [
-   "Flashforge/Flashforge TPU 65D"
-  ],
   "OFL9aRjN": [
    "Snapmaker/Snapmaker PETG HF"
   ],
@@ -2491,9 +2477,6 @@
    "Elegoo/Elegoo Rapid PETG",
    "OrcaFilamentLibrary/Elegoo Rapid PETG"
   ],
-  "OFLYDIb8": [
-   "Flashforge/Flashforge PLA Silk"
-  ],
   "OFLYDngx": [
    "Qidi/Bambu PETG"
   ],
@@ -2549,9 +2532,6 @@
   "OFMDHOcT": [
    "Qidi/QIDI TPU-Aero"
   ],
-  "OFMIma8C": [
-   "Flashforge/Flashforge PLA Luminous"
-  ],
   "OFMK5gVo": [
    "WonderMaker/WonderMaker PLA Basic"
   ],
@@ -2575,6 +2555,9 @@
   "OFMjtqTC": [
    "OrcaFilamentLibrary/Bambu PLA Wood"
   ],
+  "OFMkAW6r": [
+   "Flashforge/Flashforge PLA Color Change"
+  ],
   "OFMpxamb": [
    "Flashforge/Flashforge PETG"
   ],
@@ -2584,9 +2567,6 @@
   "OFMuXBmO": [
    "OrcaFilamentLibrary/Elas PLA Basic"
   ],
-  "OFMyLYV8": [
-   "Flashforge/Flashforge PETG Transparent"
-  ],
   "OFN9fefN": [
    "Cubicon/Cubicon ABS-A100"
   ],
@@ -2605,9 +2585,6 @@
   "OFNU9YIW": [
    "OrcaFilamentLibrary/FilAr PETG Azul Boreal"
   ],
-  "OFNWnx2c": [
-   "Flashforge/Flashforge TPU-95A"
-  ],
   "OFNemJM6": [
    "OrcaFilamentLibrary/FilAr PLA Cobre"
   ],
@@ -2682,9 +2659,6 @@
   "OFPHLnoe": [
    "Creality/HP-ASA"
   ],
-  "OFPQfNAf": [
-   "Flashforge/Flashforge PETG Pro"
-  ],
   "OFPWPlSC": [
    "OrcaFilamentLibrary/FILL3D PP"
   ],
@@ -2764,9 +2738,6 @@
   "OFQYaiGg": [
    "Snapmaker/Snapmaker PET"
   ],
-  "OFQZeyZv": [
-   "Flashforge/Flashforge PLA Buint Ti"
-  ],
   "OFQbjX3s": [
    "OrcaFilamentLibrary/FILL3D PETG"
   ],
@@ -2777,9 +2748,6 @@
   "OFQe7sAx": [
    "Anycubic/Anycubic PA6-CF"
   ],
-  "OFQiq4fb": [
-   "Flashforge/Flashforge PVA"
-  ],
   "OFQyyO0l": [
    "Flashforge/Polymaker CoPA"
   ],
@@ -2833,14 +2801,17 @@
    "OrcaFilamentLibrary/Panchroma PLA Silk",
    "Snapmaker/Panchroma PLA Silk"
   ],
+  "OFSDfduA": [
+   "Flashforge/Flashforge TPU 65D"
+  ],
   "OFSa39yP": [
    "Snapmaker/Snapmaker J1 PLA"
   ],
   "OFSbGfsz": [
    "OrcaArena/Arena PLA Basic"
   ],
-  "OFShw1X8": [
-   "Flashforge/Flashforge ABS Basic"
+  "OFSqIcJC": [
+   "Flashforge/Flashforge TPU 95A"
   ],
   "OFSwbBWS": [],
   "OFT2jon4": [
@@ -2892,9 +2863,6 @@
   "OFU7CKZt": [
    "Volumic/Volumic ASA Ultra (Performance)"
   ],
-  "OFUCpLaL": [
-   "Flashforge/FlashForge PPS"
-  ],
   "OFUF7oA4": [
    "Creality/Hyper PC"
   ],
@@ -2923,6 +2891,9 @@
   "OFV5Q7j2": [
    "Snapmaker/Snapmaker J1 TPE"
   ],
+  "OFV5c8hG": [
+   "Flashforge/Flashforge PLA Sparkle"
+  ],
   "OFV5tNw6": [
    "Elegoo/Elegoo PET-CF",
    "OrcaFilamentLibrary/Elegoo PET-CF"
@@ -2930,6 +2901,7 @@
   "OFV5wEMe": [
    "Afinia/Afinia ABS"
   ],
+  "OFV8Mxqx": [],
   "OFVBlUFH": [],
   "OFVCkX5w": [
    "OrcaFilamentLibrary/Bambu TPU 95A"
@@ -2967,6 +2939,9 @@
   "OFWTRJ1K": [
    "OrcaFilamentLibrary/FilAr PLA Bronce"
   ],
+  "OFWXCbVF": [
+   "Flashforge/Flashforge PC"
+  ],
   "OFWYtgCa": [
    "Elegoo/Elegoo PLA Wood",
    "OrcaFilamentLibrary/Elegoo PLA Wood"
@@ -2998,9 +2973,6 @@
   "OFWgFOjn": [
    "Snapmaker/Snapmaker PLA Silk"
   ],
-  "OFWnSvGu": [
-   "Flashforge/Flashforge ASA-GF"
-  ],
   "OFWwF7K7": [
    "OrcaFilamentLibrary/FilAr PLA Cafe con Leche"
   ],
@@ -3032,6 +3004,9 @@
   "OFXi59OX": [
    "Afinia/Afinia Value ABS"
   ],
+  "OFXiArjA": [
+   "Flashforge/Flashforge PETG Pro"
+  ],
   "OFXk1emJ": [
    "Artillery/Artillery PLA Basic"
   ],
@@ -3142,10 +3117,19 @@
    "Vzbot/Generic PETG",
    "Z-Bolt/Generic PETG"
   ],
+  "OFYTIMbj": [
+   "Flashforge/Flashforge ABS-CF"
+  ],
+  "OFYYeMyQ": [
+   "Flashforge/Flashforge PETG Basic"
+  ],
   "OFYd5uS3": [],
   "OFYezc6s": [
    "FlyingBear/FlyingBear TPU"
   ],
+  "OFYfAcLY": [
+   "Ratrig/Generic PCTG BigNozzle"
+  ],
   "OFYuowge": [
    "FlyingBear/Other ABS",
    "InfiMech/Other ABS"
@@ -3181,9 +3165,6 @@
   "OFZtkHRq": [
    "Anycubic/Anycubic PC"
   ],
-  "OFaBwRvT": [
-   "Flashforge/Flashforge ASA Basic"
-  ],
   "OFaDOaNt": [
    "OrcaFilamentLibrary/FilAr PLA Celeste Cielo"
   ],
@@ -3211,6 +3192,9 @@
   "OFaYz8iE": [
    "OrcaFilamentLibrary/Elas PLA Pro"
   ],
+  "OFaaddbQ": [
+   "Flashforge/Flashforge PVA"
+  ],
   "OFaeIx7W": [
    "iQ/Polymaker PETG Polymax black P1"
   ],
@@ -3223,9 +3207,6 @@
   "OFausr3F": [
    "OrcaFilamentLibrary/FilAr PLA-mate Rosa"
   ],
-  "OFaz8VoR": [
-   "Flashforge/Flashforge HIPS"
-  ],
   "OFb5EEM3": [
    "Artillery/Artillery PET"
   ],
@@ -3309,6 +3290,9 @@
   "OFdkWDiy": [
    "Cubicon/Cubicon PLAi21"
   ],
+  "OFdqkWtz": [
+   "Flashforge/Flashforge PLA Luminous"
+  ],
   "OFdrYBmI": [
    "Tiertime/Tiertime ASA"
   ],
@@ -3321,9 +3305,6 @@
   "OFe61n6v": [
    "Ratrig/RatRig PunkFil PETG CF"
   ],
-  "OFe6sfXS": [
-   "Flashforge/FlashForge PC"
-  ],
   "OFe8tuNb": [
    "Tiertime/Tiertime PA6-CF"
   ],
@@ -3345,9 +3326,6 @@
   "OFeVzkSU": [
    "Snapmaker/Fiberon PPS-GF20"
   ],
-  "OFec7Qiw": [
-   "Flashforge/Flashforge PLA Sparkle"
-  ],
   "OFeelsSM": [
    "Qidi/HATCHBOX PLA"
   ],
@@ -3509,17 +3487,14 @@
    "Tiertime/Generic TPU",
    "Vzbot/Generic TPU"
   ],
-  "OFgcryz4": [
-   "Ratrig/RatRig BigNozzle ASA"
-  ],
   "OFgdaBOt": [
    "Snapmaker/Polymaker Tough PLA Family"
   ],
   "OFgeM7nD": [
    "Flashforge/Flashforge PA12-CF"
   ],
-  "OFgf4gZa": [
-   "Flashforge/Flashforge PA"
+  "OFgjgN35": [
+   "Flashforge/Flashforge PLA Silk"
   ],
   "OFglhKLM": [
    "Qidi/QIDI PLA Rapido 0.8 nozzle"
@@ -3616,9 +3591,6 @@
    "Creality/Generic PLA-Silk",
    "Flashforge/Generic PLA-Silk"
   ],
-  "OFi7Bf0F": [
-   "Flashforge/Flashforge ABS-CF"
-  ],
   "OFi90KlM": [
    "Volumic/Volumic NYLON Ultra (Performance)"
   ],
@@ -3631,6 +3603,9 @@
   "OFiWaoqD": [
    "OrcaFilamentLibrary/DREMC PPA-CF"
   ],
+  "OFibWuBd": [
+   "Flashforge/Flashforge ABS Basic"
+  ],
   "OFilAA3b": [
    "Eryone/Eryone PLA-CF"
   ],
@@ -3646,9 +3621,6 @@
   "OFitS8al": [
    "Snapmaker/PolyLite PLA Neon"
   ],
-  "OFiuJSmy": [
-   "Ratrig/RatRig BigNozzle PLA"
-  ],
   "OFiwEbze": [
    "Volumic/PETG ESD (Performance)"
   ],
@@ -3753,9 +3725,6 @@
   "OFks6esg": [
    "Creality/EN-PLA+"
   ],
-  "OFkwIWwc": [
-   "Flashforge/Flashforge PLA Color Change"
-  ],
   "OFkx5MEe": [
    "Artillery/Artillery PVA"
   ],
@@ -3778,6 +3747,9 @@
   "OFlSNkhc": [
    "OrcaFilamentLibrary/Eolas Prints ASA"
   ],
+  "OFlgMgNM": [
+   "Flashforge/Flashforge PPS"
+  ],
   "OFllmFhT": [
    "Elegoo/Generic PETG PRO"
   ],
@@ -3800,6 +3772,9 @@
    "Elegoo/Elegoo PLA Basic",
    "OrcaFilamentLibrary/Elegoo PLA Basic"
   ],
+  "OFm4SivL": [
+   "Flashforge/Flashforge PLA Pro"
+  ],
   "OFm4ysMO": [
    "FlyingBear/FlyingBear ABS"
   ],
@@ -3821,9 +3796,6 @@
   "OFmKU2Ha": [
    "Eryone/Eryone PLA"
   ],
-  "OFmQkb3c": [
-   "Flashforge/Flashforge HS PLA Burnt Ti"
-  ],
   "OFmY0l6t": [
    "Creality/Generic PLA Matte",
    "Elegoo/Generic PLA Matte",
@@ -3835,9 +3807,6 @@
   "OFmaeU4a": [
    "OrcaFilamentLibrary/FilAr PLA-mate Naranja"
   ],
-  "OFmexHIS": [
-   "Ratrig/RatRig BigNozzle PETG"
-  ],
   "OFmfizbq": [
    "OrcaArena/Arena PLA Silk"
   ],
@@ -3876,9 +3845,6 @@
   "OFnHc3D6": [
    "Creality/eSUN PLA-CF"
   ],
-  "OFnMv3W5": [
-   "Flashforge/Flashforge HS PLA"
-  ],
   "OFnO4wnf": [
    "Prusa/Prusament PLA"
   ],
@@ -3915,6 +3881,9 @@
   "OFnmp6rt": [
    "Anycubic/Anycubic PLA+"
   ],
+  "OFnyHfcv": [
+   "Ratrig/Generic ABS BigNozzle"
+  ],
   "OFo15hcT": [
    "Qidi/QIDI PAHT-GF"
   ],
@@ -3951,12 +3920,12 @@
    "BBL/AliZ PETG",
    "OrcaFilamentLibrary/AliZ PETG"
   ],
-  "OFogbnCb": [
-   "Flashforge/FlashForge PPS-CF"
-  ],
   "OFoiVqVM": [
    "OrcaFilamentLibrary/Bambu PLA Basic"
   ],
+  "OFojbdhR": [
+   "Flashforge/Flashforge ABS-GF"
+  ],
   "OForhBi4": [
    "Cubicon/Cubicon ABSk"
   ],
@@ -4005,6 +3974,9 @@
    "Creality/Generic PPS",
    "Tiertime/Generic PPS"
   ],
+  "OFqFRiLb": [
+   "Ratrig/Generic PLA BigNozzle"
+  ],
   "OFqGRZyH": [
    "OrcaFilamentLibrary/Numakers PLA+"
   ],
@@ -4042,15 +4014,15 @@
    "OrcaFilamentLibrary/Panchroma PLA Matte",
    "Snapmaker/Panchroma PLA Matte"
   ],
+  "OFrZDhVt": [
+   "Flashforge/Flashforge ASA-GF"
+  ],
   "OFrdZ0cK": [
    "Creality/eSUN PETG+HS"
   ],
   "OFrjacXf": [
    "Flashforge/Flashforge PET-CF"
   ],
-  "OFrnkURQ": [
-   "Flashforge/Flashforge PLA  Metal"
-  ],
   "OFrr67nG": [
    "OrcaArena/Arena PC"
   ],
@@ -4081,9 +4053,6 @@
   "OFsHSVZc": [
    "OrcaFilamentLibrary/Bambu Support W"
   ],
-  "OFsNJjpc": [
-   "Ratrig/RatRig BigNozzle TPU"
-  ],
   "OFsP8PKH": [
    "Z-Bolt/Generic ABS HT"
   ],
@@ -4130,7 +4099,6 @@
   "OFtRn8X8": [
    "OrcaFilamentLibrary/FDplast SBS"
   ],
-  "OFtTYl9Q": [],
   "OFtefokm": [
    "OrcaFilamentLibrary/FilAr PLA-mate Blanco"
   ],
@@ -4138,9 +4106,6 @@
    "BBL/COEX ASA PRIME",
    "OrcaFilamentLibrary/COEX ASA PRIME"
   ],
-  "OFtplX8o": [
-   "Ratrig/RatRig BigNozzle ABS"
-  ],
   "OFtr8eZw": [
    "OrcaFilamentLibrary/FDplast PLA"
   ],
@@ -4165,11 +4130,8 @@
    "Ratrig/Generic PCTG",
    "Tiertime/Generic PCTG"
   ],
-  "OFuFqYyG": [
-   "Flashforge/Flashforge PAHT-CF"
-  ],
-  "OFuGRMNV": [
-   "Flashforge/Flashforge PA-CF"
+  "OFuFEtKX": [
+   "Flashforge/Flashforge PETG-CF"
   ],
   "OFuJ49uH": [
    "Qidi/QIDI PETG Basic"
@@ -4212,6 +4174,9 @@
   "OFuxH0Uz": [
    "Volumic/Volumic FLEX93 Ultra"
   ],
+  "OFvD0Qqt": [
+   "Ratrig/Generic PETG BigNozzle"
+  ],
   "OFvDbkFq": [
    "Prusa/Prusament PC Blend"
   ],
@@ -4228,12 +4193,12 @@
    "BBL/COEX PETG",
    "OrcaFilamentLibrary/COEX PETG"
   ],
-  "OFvVxvzZ": [
-   "Flashforge/Flashforge PLA Metal"
-  ],
   "OFvVy7yo": [
    "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant"
   ],
+  "OFvaLVML": [
+   "Flashforge/Flashforge HIPS"
+  ],
   "OFvdZ2bx": [
    "Qidi/QIDI WOOD Rapido"
   ],
@@ -4284,6 +4249,12 @@
   "OFwhLMs4": [
    "Snapmaker/Snapmaker PLA SnapSpeed"
   ],
+  "OFwjMiKL": [
+   "Flashforge/Flashforge PETG Transparent"
+  ],
+  "OFwlZ7gH": [
+   "Flashforge/Flashforge TPU-90A"
+  ],
   "OFwu7IAG": [
    "BBL/COEX PCTG PRIME",
    "OrcaFilamentLibrary/COEX PCTG PRIME"
@@ -4294,6 +4265,9 @@
   "OFwyt1xt": [
    "Eryone/Eryone ASA-CF"
   ],
+  "OFx0WlzS": [
+   "Flashforge/Flashforge TPU-95A"
+  ],
   "OFx8Lmsd": [
    "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant"
   ],
@@ -4306,9 +4280,6 @@
   "OFxJRuVF": [
    "Anycubic/Anycubic PC-GF"
   ],
-  "OFxMGIPt": [
-   "Flashforge/Flashforge PPS"
-  ],
   "OFxOHhZw": [
    "Elegoo/Elegoo ABS",
    "OrcaFilamentLibrary/Elegoo ABS"
@@ -5295,20 +5266,6 @@
   "FLSun/Generic PLA-CF @FLSun",
   "FLSun/Generic PVA @FLSun",
   "FLSun/Generic TPU @FLSun",
-  "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle",
-  "Flashforge/FlashForge PC @FF G4 0.6 nozzle",
-  "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle",
-  "Flashforge/FlashForge PC @FF G4P 0.6 HF nozzle",
-  "Flashforge/FlashForge PC @FF G4P 0.6 nozzle",
-  "Flashforge/FlashForge PC @FF G4P 0.8 HF nozzle",
-  "Flashforge/FlashForge PPS @FF G4 0.6 HF nozzle",
-  "Flashforge/FlashForge PPS @FF G4 0.6 nozzle",
-  "Flashforge/FlashForge PPS @FF G4 0.8 HF nozzle",
-  "Flashforge/FlashForge PPS @FF G4P 0.6 HF nozzle",
-  "Flashforge/FlashForge PPS @FF G4P 0.6 nozzle",
-  "Flashforge/FlashForge PPS @FF G4P 0.8 HF nozzle",
-  "Flashforge/FlashForge PPS-CF @FF G4 0.6 nozzle",
-  "Flashforge/FlashForge PPS-CF @FF G4P 0.6 nozzle",
   "Flashforge/Flashforge ABS",
   "Flashforge/Flashforge ABS Basic",
   "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle",
@@ -5436,10 +5393,12 @@
   "Flashforge/Flashforge PA12-CF",
   "Flashforge/Flashforge PA6-CF",
   "Flashforge/Flashforge PA66-CF",
-  "Flashforge/Flashforge PAHT-CF @FF C5",
-  "Flashforge/Flashforge PAHT-CF @FF C5P",
-  "Flashforge/Flashforge PAHT-CF @FF G4",
-  "Flashforge/Flashforge PAHT-CF @FF G4P",
+  "Flashforge/Flashforge PC @FF G4 0.6 HF nozzle",
+  "Flashforge/Flashforge PC @FF G4 0.6 nozzle",
+  "Flashforge/Flashforge PC @FF G4 0.8 HF nozzle",
+  "Flashforge/Flashforge PC @FF G4P 0.6 HF nozzle",
+  "Flashforge/Flashforge PC @FF G4P 0.6 nozzle",
+  "Flashforge/Flashforge PC @FF G4P 0.8 HF nozzle",
   "Flashforge/Flashforge PET-CF",
   "Flashforge/Flashforge PET-CF @FF C5",
   "Flashforge/Flashforge PET-CF @FF C5P",
@@ -5497,12 +5456,6 @@
   "Flashforge/Flashforge PETG-CF @FF G4P",
   "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle",
   "Flashforge/Flashforge PLA",
-  "Flashforge/Flashforge PLA  Matte @FF C5",
-  "Flashforge/Flashforge PLA  Matte @FF C5P",
-  "Flashforge/Flashforge PLA  Metal @FF C5",
-  "Flashforge/Flashforge PLA  Metal @FF C5P",
-  "Flashforge/Flashforge PLA  Pro @FF C5",
-  "Flashforge/Flashforge PLA  Pro @FF C5P",
   "Flashforge/Flashforge PLA Basic",
   "Flashforge/Flashforge PLA Basic @FF AD5M 0.25 nozzle",
   "Flashforge/Flashforge PLA Basic @FF AD5X",
@@ -5523,8 +5476,6 @@
   "Flashforge/Flashforge PLA Basic @FF G4P 0.6 nozzle",
   "Flashforge/Flashforge PLA Basic @FF G4P 0.8 HF nozzle",
   "Flashforge/Flashforge PLA Basic @FF G4P HF",
-  "Flashforge/Flashforge PLA Buint Ti @FF G4 0.8 nozzle",
-  "Flashforge/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle",
   "Flashforge/Flashforge PLA Color Change",
   "Flashforge/Flashforge PLA Color Change @FF AD5M 0.25 nozzle",
   "Flashforge/Flashforge PLA Color Change @FF AD5X",
@@ -5589,6 +5540,8 @@
   "Flashforge/Flashforge PLA Matte @FF AD5X 0.25 nozzle",
   "Flashforge/Flashforge PLA Matte @FF AD5X 0.6 nozzle",
   "Flashforge/Flashforge PLA Matte @FF AD5X 0.8 nozzle",
+  "Flashforge/Flashforge PLA Matte @FF C5",
+  "Flashforge/Flashforge PLA Matte @FF C5P",
   "Flashforge/Flashforge PLA Matte @FF G4",
   "Flashforge/Flashforge PLA Matte @FF G4 0.25 nozzle",
   "Flashforge/Flashforge PLA Matte @FF G4 0.6 HF nozzle",
@@ -5607,6 +5560,8 @@
   "Flashforge/Flashforge PLA Metal @FF AD5X 0.25 nozzle",
   "Flashforge/Flashforge PLA Metal @FF AD5X 0.6 nozzle",
   "Flashforge/Flashforge PLA Metal @FF AD5X 0.8 nozzle",
+  "Flashforge/Flashforge PLA Metal @FF C5",
+  "Flashforge/Flashforge PLA Metal @FF C5P",
   "Flashforge/Flashforge PLA Metal @FF G4",
   "Flashforge/Flashforge PLA Metal @FF G4 0.25 nozzle",
   "Flashforge/Flashforge PLA Metal @FF G4 0.6 HF nozzle",
@@ -5625,6 +5580,8 @@
   "Flashforge/Flashforge PLA Pro @FF AD5X 0.25 nozzle",
   "Flashforge/Flashforge PLA Pro @FF AD5X 0.6 nozzle",
   "Flashforge/Flashforge PLA Pro @FF AD5X 0.8 nozzle",
+  "Flashforge/Flashforge PLA Pro @FF C5",
+  "Flashforge/Flashforge PLA Pro @FF C5P",
   "Flashforge/Flashforge PLA Pro @FF G4",
   "Flashforge/Flashforge PLA Pro @FF G4 0.25 nozzle",
   "Flashforge/Flashforge PLA Pro @FF G4 0.6 HF nozzle",
@@ -5688,12 +5645,20 @@
   "Flashforge/Flashforge PPA-CF @FF C5P",
   "Flashforge/Flashforge PPA-GF",
   "Flashforge/Flashforge PPS @FF G4",
+  "Flashforge/Flashforge PPS @FF G4 0.6 HF nozzle",
+  "Flashforge/Flashforge PPS @FF G4 0.6 nozzle",
+  "Flashforge/Flashforge PPS @FF G4 0.8 HF nozzle",
   "Flashforge/Flashforge PPS @FF G4P",
+  "Flashforge/Flashforge PPS @FF G4P 0.6 HF nozzle",
+  "Flashforge/Flashforge PPS @FF G4P 0.6 nozzle",
+  "Flashforge/Flashforge PPS @FF G4P 0.8 HF nozzle",
   "Flashforge/Flashforge PPS-CF",
   "Flashforge/Flashforge PPS-CF @FF C5",
   "Flashforge/Flashforge PPS-CF @FF C5P",
   "Flashforge/Flashforge PPS-CF @FF G4",
+  "Flashforge/Flashforge PPS-CF @FF G4 0.6 nozzle",
   "Flashforge/Flashforge PPS-CF @FF G4P",
+  "Flashforge/Flashforge PPS-CF @FF G4P 0.6 nozzle",
   "Flashforge/Flashforge PVA @FF C5",
   "Flashforge/Flashforge PVA @FF C5P",
   "Flashforge/Flashforge TPU 65D @FF G4 0.6 HF nozzle",
@@ -6761,22 +6726,22 @@
   "RH3D/Generic PLA @E3NG v1.2S",
   "RH3D/Generic TPU @E3NG v1.2S",
   "Ratrig/Generic ABS @RatRig",
+  "Ratrig/Generic ABS BigNozzle @RatRig",
   "Ratrig/Generic ASA @RatRig",
+  "Ratrig/Generic ASA BigNozzle @RatRig",
   "Ratrig/Generic PA @RatRig",
   "Ratrig/Generic PA-CF @RatRig",
   "Ratrig/Generic PC @RatRig",
   "Ratrig/Generic PCTG @RatRig",
+  "Ratrig/Generic PCTG BigNozzle @RatRig",
   "Ratrig/Generic PETG @RatRig",
+  "Ratrig/Generic PETG BigNozzle @RatRig",
   "Ratrig/Generic PLA @RatRig",
+  "Ratrig/Generic PLA BigNozzle @RatRig",
   "Ratrig/Generic PLA-CF @RatRig",
   "Ratrig/Generic PVA @RatRig",
   "Ratrig/Generic TPU @RatRig",
-  "Ratrig/RatRig BigNozzle ABS",
-  "Ratrig/RatRig BigNozzle ASA",
-  "Ratrig/RatRig BigNozzle PCTG",
-  "Ratrig/RatRig BigNozzle PETG",
-  "Ratrig/RatRig BigNozzle PLA",
-  "Ratrig/RatRig BigNozzle TPU",
+  "Ratrig/Generic TPU BigNozzle @RatRig",
   "Ratrig/RatRig PunkFil ABS",
   "Ratrig/RatRig PunkFil PETG",
   "Ratrig/RatRig PunkFil PETG CF",
@@ -7177,13 +7142,6 @@
     "QIDI ASA-CF"
    ]
   ],
-  "OF1bQyX2": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Matte"
-   ]
-  ],
   "OF1d7c3A": [
    [
     "Snapmaker",
@@ -7254,13 +7212,6 @@
     "FilAr PETG Azul Imperial"
    ]
   ],
-  "OF2bZtyg": [
-   [
-    "Generic",
-    "PLA-CF",
-    "Flashforge PLA-CF"
-   ]
-  ],
   "OF2hfMcG": [
    [
     "Orca Arena",
@@ -7352,13 +7303,6 @@
     "InfiMech PLA Hyper"
    ]
   ],
-  "OF41jaTh": [
-   [
-    "Generic",
-    "TPU-90A",
-    "Flashforge TPU-90A"
-   ]
-  ],
   "OF43Raws": [
    [
     "Polymaker",
@@ -7387,6 +7331,13 @@
     "Hyper PAHT-CF"
    ]
   ],
+  "OF4GM5qX": [
+   [
+    "Generic",
+    "ASA",
+    "Generic ASA BigNozzle"
+   ]
+  ],
   "OF4KsW72": [
    [
     "FilAr",
@@ -7492,13 +7443,6 @@
     "PolyLite PLA"
    ]
   ],
-  "OF5NQFKI": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Galaxy"
-   ]
-  ],
   "OF5NqBfC": [
    [
     "Yumi",
@@ -7576,6 +7520,13 @@
     "FilAr PETG"
    ]
   ],
+  "OF5tX6va": [
+   [
+    "Generic",
+    "TPU",
+    "Generic TPU BigNozzle"
+   ]
+  ],
   "OF5umxxT": [
    [
     "Polymaker",
@@ -7590,13 +7541,6 @@
     "FilAr PLA-mate Azul"
    ]
   ],
-  "OF5w29Kq": [
-   [
-    "Generic",
-    "PETG",
-    "Flashforge HS PETG"
-   ]
-  ],
   "OF65InrS": [
    [
     "Snapmaker",
@@ -7660,6 +7604,13 @@
     "Fiberthree PACF Pro P2"
    ]
   ],
+  "OF6qAuyi": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA Matte"
+   ]
+  ],
   "OF6rdQ6M": [
    [
     "Generic",
@@ -7667,13 +7618,6 @@
     "Generic PPS-CF"
    ]
   ],
-  "OF6ueBwd": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA  Pro"
-   ]
-  ],
   "OF70zbGS": [
    [
     "Creality",
@@ -7772,6 +7716,13 @@
     "Hyper ABS"
    ]
   ],
+  "OF8GtyKJ": [
+   [
+    "Flashforge",
+    "TPU-64D",
+    "Flashforge TPU-64D"
+   ]
+  ],
   "OF8Hx3Pi": [
    [
     "Cubicon",
@@ -7786,6 +7737,13 @@
     "Snapmaker J1 PET"
    ]
   ],
+  "OF8O09RG": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge HS PLA Burnt Ti"
+   ]
+  ],
   "OF8Tlg47": [
    [
     "Generic",
@@ -7842,13 +7800,6 @@
     "Artillery PETG Basic"
    ]
   ],
-  "OF995YXg": [
-   [
-    "Generic",
-    "TPU-64D",
-    "Flashforge TPU-64D"
-   ]
-  ],
   "OF99UMPq": [
    [
     "COEX 3D",
@@ -7898,6 +7849,13 @@
     "Anycubic PETG-CF"
    ]
   ],
+  "OF9cAwMK": [
+   [
+    "Flashforge",
+    "PLA-CF",
+    "Flashforge PLA-CF"
+   ]
+  ],
   "OF9emAI9": [
    [
     "RatRig",
@@ -7954,11 +7912,11 @@
     "Artillery PLA-CF"
    ]
   ],
-  "OFAf9pJF": [
+  "OFAebKg8": [
    [
-    "Generic",
-    "TPU",
-    "Flashforge TPU 95A"
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA Metal"
    ]
   ],
   "OFAnyRUI": [
@@ -7996,13 +7954,6 @@
     "LHS PCTG"
    ]
   ],
-  "OFBK6zAi": [
-   [
-    "Generic",
-    "PETG-CF",
-    "Flashforge PETG-CF"
-   ]
-  ],
   "OFBLktDy": [
    [
     "Creality",
@@ -8297,6 +8248,13 @@
     "Bambu PLA Sparkle"
    ]
   ],
+  "OFDxxTpW": [
+   [
+    "Flashforge",
+    "PETG",
+    "Flashforge HS PETG"
+   ]
+  ],
   "OFE0NFRh": [
    [
     "COEX 3D",
@@ -8311,13 +8269,6 @@
     "Bambu PLA Silk"
    ]
   ],
-  "OFEMfQsX": [
-   [
-    "Generic",
-    "PETG",
-    "Flashforge PETG Basic"
-   ]
-  ],
   "OFEOnBj6": [
    [
     "Snapmaker",
@@ -8409,6 +8360,13 @@
     "Bambu PLA-CF"
    ]
   ],
+  "OFEvEfw5": [
+   [
+    "Flashforge",
+    "PA",
+    "Flashforge PA"
+   ]
+  ],
   "OFEwRwmL": [
    [
     "Cubicon",
@@ -8444,11 +8402,11 @@
     "QIDI PC-ABS-FR"
    ]
   ],
-  "OFFC0VqZ": [
+  "OFFFg2Pf": [
    [
-    "Generic",
-    "PETG",
-    "RatRig BigNozzle PCTG"
+    "Flashforge",
+    "ASA",
+    "Flashforge ASA Basic"
    ]
   ],
   "OFFNYwWR": [
@@ -8542,13 +8500,6 @@
     "FilAr PLA-mate Gris"
    ]
   ],
-  "OFGc282l": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA-SILK"
-   ]
-  ],
   "OFGcLA5R": [
    [
     "FilAr",
@@ -8598,6 +8549,13 @@
     "CR-Wood"
    ]
   ],
+  "OFGxuI0n": [
+   [
+    "Flashforge",
+    "PA-CF",
+    "Flashforge PA-CF"
+   ]
+  ],
   "OFH2nN08": [
    [
     "Eolas Prints",
@@ -8612,20 +8570,6 @@
     "Polymaker Silk PLA Family"
    ]
   ],
-  "OFH5UH6P": [
-   [
-    "Generic",
-    "ABS-GF",
-    "Flashforge ABS-GF"
-   ]
-  ],
-  "OFH6Pjxe": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA  Matte"
-   ]
-  ],
   "OFH7b12v": [
    [
     "Generic",
@@ -8710,6 +8654,13 @@
     "Anycubic PLA Matte"
    ]
   ],
+  "OFIK2H3G": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge HS PLA"
+   ]
+  ],
   "OFIKZxPF": [
    [
     "Generic",
@@ -8787,9 +8738,9 @@
     "PolyLite PLA Starlight"
    ]
   ],
-  "OFIxitiU": [
+  "OFJ3F2jm": [
    [
-    "Generic",
+    "Flashforge",
     "PLA",
     "Flashforge PLA Basic"
    ]
@@ -8808,6 +8759,13 @@
     "DREMC PLA+ HS"
    ]
   ],
+  "OFJJ0Ar3": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA Galaxy"
+   ]
+  ],
   "OFJNeELv": [
    [
     "FILL3D",
@@ -8829,6 +8787,13 @@
     "FilAr PETG Cristal"
    ]
   ],
+  "OFJS560n": [
+   [
+    "Flashforge",
+    "ASA",
+    "Flashforge ASA"
+   ]
+  ],
   "OFJWKoYG": [
    [
     "iQ Materials",
@@ -8885,13 +8850,6 @@
     "YUMI PLA Direct Drive"
    ]
   ],
-  "OFK74HJD": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Pro"
-   ]
-  ],
   "OFK8XHPn": [
    [
     "Overture",
@@ -8990,13 +8948,6 @@
     "Panchroma PLA Marble"
    ]
   ],
-  "OFKpQTJI": [
-   [
-    "Generic",
-    "TPU",
-    "Flashforge TPU 65D"
-   ]
-  ],
   "OFL9aRjN": [
    [
     "Snapmaker",
@@ -9060,13 +9011,6 @@
     "Elegoo Rapid PETG"
    ]
   ],
-  "OFLYDIb8": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Silk"
-   ]
-  ],
   "OFLYDngx": [
    [
     "Bambu Lab",
@@ -9151,13 +9095,6 @@
     "QIDI TPU-Aero"
    ]
   ],
-  "OFMIma8C": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Luminous"
-   ]
-  ],
   "OFMK5gVo": [
    [
     "WonderMaker",
@@ -9207,6 +9144,13 @@
     "Bambu PLA Wood"
    ]
   ],
+  "OFMkAW6r": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA Color Change"
+   ]
+  ],
   "OFMpxamb": [
    [
     "Flashforge",
@@ -9228,13 +9172,6 @@
     "Elas PLA Basic"
    ]
   ],
-  "OFMyLYV8": [
-   [
-    "Generic",
-    "PETG",
-    "Flashforge PETG Transparent"
-   ]
-  ],
   "OFN9fefN": [
    [
     "Cubicon",
@@ -9277,13 +9214,6 @@
     "FilAr PETG Azul Boreal"
    ]
   ],
-  "OFNWnx2c": [
-   [
-    "Generic",
-    "TPU-95A",
-    "Flashforge TPU-95A"
-   ]
-  ],
   "OFNemJM6": [
    [
     "FilAr",
@@ -9445,13 +9375,6 @@
     "HP-ASA"
    ]
   ],
-  "OFPQfNAf": [
-   [
-    "Generic",
-    "PETG",
-    "Flashforge PETG Pro"
-   ]
-  ],
   "OFPWPlSC": [
    [
     "FILL3D",
@@ -9592,13 +9515,6 @@
     "Snapmaker PET"
    ]
   ],
-  "OFQZeyZv": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Buint Ti"
-   ]
-  ],
   "OFQbjX3s": [
    [
     "FILL3D",
@@ -9620,13 +9536,6 @@
     "Anycubic PA6-CF"
    ]
   ],
-  "OFQiq4fb": [
-   [
-    "Generic",
-    "PVA",
-    "Flashforge PVA"
-   ]
-  ],
   "OFQyyO0l": [
    [
     "Polymaker",
@@ -9746,6 +9655,13 @@
     "Panchroma PLA Silk"
    ]
   ],
+  "OFSDfduA": [
+   [
+    "Flashforge",
+    "TPU",
+    "Flashforge TPU 65D"
+   ]
+  ],
   "OFSa39yP": [
    [
     "Snapmaker",
@@ -9760,11 +9676,11 @@
     "Arena PLA Basic"
    ]
   ],
-  "OFShw1X8": [
+  "OFSqIcJC": [
    [
-    "Generic",
-    "ABS",
-    "Flashforge ABS Basic"
+    "Flashforge",
+    "TPU",
+    "Flashforge TPU 95A"
    ]
   ],
   "OFSwbBWS": [
@@ -9886,13 +9802,6 @@
     "Volumic ASA Ultra (Performance)"
    ]
   ],
-  "OFUCpLaL": [
-   [
-    "Generic",
-    "PPS",
-    "FlashForge PPS"
-   ]
-  ],
   "OFUF7oA4": [
    [
     "Creality",
@@ -9956,6 +9865,13 @@
     "Snapmaker J1 TPE"
    ]
   ],
+  "OFV5c8hG": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA Sparkle"
+   ]
+  ],
   "OFV5tNw6": [
    [
     "Elegoo",
@@ -9970,6 +9886,13 @@
     "Afinia ABS"
    ]
   ],
+  "OFV8Mxqx": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA-SILK"
+   ]
+  ],
   "OFVBlUFH": [
    [
     "DREMC",
@@ -10054,6 +9977,13 @@
     "FilAr PLA Bronce"
    ]
   ],
+  "OFWXCbVF": [
+   [
+    "Flashforge",
+    "PC",
+    "Flashforge PC"
+   ]
+  ],
   "OFWYtgCa": [
    [
     "Elegoo",
@@ -10089,13 +10019,6 @@
     "Snapmaker PLA Silk"
    ]
   ],
-  "OFWnSvGu": [
-   [
-    "Generic",
-    "ASA-GF",
-    "Flashforge ASA-GF"
-   ]
-  ],
   "OFWwF7K7": [
    [
     "FilAr",
@@ -10166,6 +10089,13 @@
     "Afinia Value ABS"
    ]
   ],
+  "OFXiArjA": [
+   [
+    "Flashforge",
+    "PETG",
+    "Flashforge PETG Pro"
+   ]
+  ],
   "OFXk1emJ": [
    [
     "Artillery",
@@ -10278,6 +10208,20 @@
     "Generic PETG"
    ]
   ],
+  "OFYTIMbj": [
+   [
+    "Flashforge",
+    "ABS-CF",
+    "Flashforge ABS-CF"
+   ]
+  ],
+  "OFYYeMyQ": [
+   [
+    "Flashforge",
+    "PETG",
+    "Flashforge PETG Basic"
+   ]
+  ],
   "OFYd5uS3": [
    [
     "DREMC",
@@ -10292,6 +10236,13 @@
     "FlyingBear TPU"
    ]
   ],
+  "OFYfAcLY": [
+   [
+    "Generic",
+    "PETG",
+    "Generic PCTG BigNozzle"
+   ]
+  ],
   "OFYuowge": [
    [
     "Other",
@@ -10369,13 +10320,6 @@
     "Anycubic PC"
    ]
   ],
-  "OFaBwRvT": [
-   [
-    "Generic",
-    "ASA",
-    "Flashforge ASA Basic"
-   ]
-  ],
   "OFaDOaNt": [
    [
     "FilAr",
@@ -10439,6 +10383,13 @@
     "Elas PLA Pro"
    ]
   ],
+  "OFaaddbQ": [
+   [
+    "Flashforge",
+    "PVA",
+    "Flashforge PVA"
+   ]
+  ],
   "OFaeIx7W": [
    [
     "iQ Materials",
@@ -10467,13 +10418,6 @@
     "FilAr PLA-mate Rosa"
    ]
   ],
-  "OFaz8VoR": [
-   [
-    "Generic",
-    "HIPS",
-    "Flashforge HIPS"
-   ]
-  ],
   "OFb5EEM3": [
    [
     "Artillery",
@@ -10656,6 +10600,13 @@
     "Cubicon PLAi21"
    ]
   ],
+  "OFdqkWtz": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA Luminous"
+   ]
+  ],
   "OFdrYBmI": [
    [
     "Tiertime",
@@ -10684,13 +10635,6 @@
     "RatRig PunkFil PETG CF"
    ]
   ],
-  "OFe6sfXS": [
-   [
-    "Generic",
-    "PC",
-    "FlashForge PC"
-   ]
-  ],
   "OFe8tuNb": [
    [
     "Tiertime",
@@ -10740,13 +10684,6 @@
     "Fiberon PPS-GF20"
    ]
   ],
-  "OFec7Qiw": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Sparkle"
-   ]
-  ],
   "OFeelsSM": [
    [
     "HATCHBOX",
@@ -11006,13 +10943,6 @@
     "Generic TPU"
    ]
   ],
-  "OFgcryz4": [
-   [
-    "Generic",
-    "ASA",
-    "RatRig BigNozzle ASA"
-   ]
-  ],
   "OFgdaBOt": [
    [
     "Polymaker",
@@ -11027,11 +10957,11 @@
     "Flashforge PA12-CF"
    ]
   ],
-  "OFgf4gZa": [
+  "OFgjgN35": [
    [
-    "Generic",
-    "PA",
-    "Flashforge PA"
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA Silk"
    ]
   ],
   "OFglhKLM": [
@@ -11237,13 +11167,6 @@
     "Generic PLA-Silk"
    ]
   ],
-  "OFi7Bf0F": [
-   [
-    "Generic",
-    "ABS-CF",
-    "Flashforge ABS-CF"
-   ]
-  ],
   "OFi90KlM": [
    [
     "Volumic",
@@ -11272,6 +11195,13 @@
     "DREMC PPA-CF"
    ]
   ],
+  "OFibWuBd": [
+   [
+    "Flashforge",
+    "ABS",
+    "Flashforge ABS Basic"
+   ]
+  ],
   "OFilAA3b": [
    [
     "Eryone",
@@ -11307,13 +11237,6 @@
     "PolyLite PLA Neon"
    ]
   ],
-  "OFiuJSmy": [
-   [
-    "Generic",
-    "PLA",
-    "RatRig BigNozzle PLA"
-   ]
-  ],
   "OFiwEbze": [
    [
     "Volumic",
@@ -11545,13 +11468,6 @@
     "EN-PLA+"
    ]
   ],
-  "OFkwIWwc": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Color Change"
-   ]
-  ],
   "OFkx5MEe": [
    [
     "Artillery",
@@ -11601,6 +11517,13 @@
     "Eolas Prints ASA"
    ]
   ],
+  "OFlgMgNM": [
+   [
+    "Flashforge",
+    "PPS",
+    "Flashforge PPS"
+   ]
+  ],
   "OFllmFhT": [
    [
     "Generic",
@@ -11643,6 +11566,13 @@
     "Elegoo PLA Basic"
    ]
   ],
+  "OFm4SivL": [
+   [
+    "Flashforge",
+    "PLA",
+    "Flashforge PLA Pro"
+   ]
+  ],
   "OFm4ysMO": [
    [
     "FlyingBear",
@@ -11692,13 +11622,6 @@
     "Eryone PLA"
    ]
   ],
-  "OFmQkb3c": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge HS PLA Burnt Ti"
-   ]
-  ],
   "OFmY0l6t": [
    [
     "Generic",
@@ -11720,13 +11643,6 @@
     "FilAr PLA-mate Naranja"
    ]
   ],
-  "OFmexHIS": [
-   [
-    "Generic",
-    "PETG",
-    "RatRig BigNozzle PETG"
-   ]
-  ],
   "OFmfizbq": [
    [
     "Orca Arena",
@@ -11797,13 +11713,6 @@
     "eSUN PLA-CF"
    ]
   ],
-  "OFnMv3W5": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge HS PLA"
-   ]
-  ],
   "OFnO4wnf": [
    [
     "Prusa Polymers",
@@ -11888,6 +11797,13 @@
     "Anycubic PLA+"
    ]
   ],
+  "OFnyHfcv": [
+   [
+    "Generic",
+    "ABS",
+    "Generic ABS BigNozzle"
+   ]
+  ],
   "OFo15hcT": [
    [
     "QIDI",
@@ -11944,13 +11860,6 @@
     "AliZ PETG"
    ]
   ],
-  "OFogbnCb": [
-   [
-    "Generic",
-    "PPS-CF",
-    "FlashForge PPS-CF"
-   ]
-  ],
   "OFoiVqVM": [
    [
     "Bambu Lab",
@@ -11958,6 +11867,13 @@
     "Bambu PLA Basic"
    ]
   ],
+  "OFojbdhR": [
+   [
+    "Flashforge",
+    "ABS-GF",
+    "Flashforge ABS-GF"
+   ]
+  ],
   "OForhBi4": [
    [
     "Cubicon",
@@ -12063,6 +11979,13 @@
     "Generic PPS"
    ]
   ],
+  "OFqFRiLb": [
+   [
+    "Generic",
+    "PLA",
+    "Generic PLA BigNozzle"
+   ]
+  ],
   "OFqGRZyH": [
    [
     "Numakers",
@@ -12140,6 +12063,13 @@
     "Panchroma PLA Matte"
    ]
   ],
+  "OFrZDhVt": [
+   [
+    "Flashforge",
+    "ASA-GF",
+    "Flashforge ASA-GF"
+   ]
+  ],
   "OFrdZ0cK": [
    [
     "eSUN",
@@ -12154,13 +12084,6 @@
     "Flashforge PET-CF"
    ]
   ],
-  "OFrnkURQ": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA  Metal"
-   ]
-  ],
   "OFrr67nG": [
    [
     "Orca Arena",
@@ -12217,13 +12140,6 @@
     "Bambu Support W"
    ]
   ],
-  "OFsNJjpc": [
-   [
-    "Generic",
-    "TPU",
-    "RatRig BigNozzle TPU"
-   ]
-  ],
   "OFsP8PKH": [
    [
     "Generic",
@@ -12329,13 +12245,6 @@
     "FDplast SBS"
    ]
   ],
-  "OFtTYl9Q": [
-   [
-    "Generic",
-    "ASA",
-    "Flashforge ASA"
-   ]
-  ],
   "OFtefokm": [
    [
     "FilAr",
@@ -12350,13 +12259,6 @@
     "COEX ASA PRIME"
    ]
   ],
-  "OFtplX8o": [
-   [
-    "Generic",
-    "ABS",
-    "RatRig BigNozzle ABS"
-   ]
-  ],
   "OFtr8eZw": [
    [
     "FDplast",
@@ -12406,18 +12308,11 @@
     "Generic PCTG"
    ]
   ],
-  "OFuFqYyG": [
+  "OFuFEtKX": [
    [
-    "Generic",
-    "PAHT-CF",
-    "Flashforge PAHT-CF"
-   ]
-  ],
-  "OFuGRMNV": [
-   [
-    "Generic",
-    "PA-CF",
-    "Flashforge PA-CF"
+    "Flashforge",
+    "PETG-CF",
+    "Flashforge PETG-CF"
    ]
   ],
   "OFuJ49uH": [
@@ -12511,6 +12406,13 @@
     "Volumic FLEX93 Ultra"
    ]
   ],
+  "OFvD0Qqt": [
+   [
+    "Generic",
+    "PETG",
+    "Generic PETG BigNozzle"
+   ]
+  ],
   "OFvDbkFq": [
    [
     "Prusa Polymers",
@@ -12546,13 +12448,6 @@
     "COEX PETG"
    ]
   ],
-  "OFvVxvzZ": [
-   [
-    "Generic",
-    "PLA",
-    "Flashforge PLA Metal"
-   ]
-  ],
   "OFvVy7yo": [
    [
     "Eolas Prints",
@@ -12560,6 +12455,13 @@
     "Eolas Prints TPU D60 UV Resistant"
    ]
   ],
+  "OFvaLVML": [
+   [
+    "Flashforge",
+    "HIPS",
+    "Flashforge HIPS"
+   ]
+  ],
   "OFvdZ2bx": [
    [
     "QIDI",
@@ -12672,6 +12574,20 @@
     "Snapmaker PLA SnapSpeed"
    ]
   ],
+  "OFwjMiKL": [
+   [
+    "Flashforge",
+    "PETG",
+    "Flashforge PETG Transparent"
+   ]
+  ],
+  "OFwlZ7gH": [
+   [
+    "Flashforge",
+    "TPU-90A",
+    "Flashforge TPU-90A"
+   ]
+  ],
   "OFwu7IAG": [
    [
     "COEX 3D",
@@ -12693,6 +12609,13 @@
     "Eryone ASA-CF"
    ]
   ],
+  "OFx0WlzS": [
+   [
+    "Flashforge",
+    "TPU-95A",
+    "Flashforge TPU-95A"
+   ]
+  ],
   "OFx8Lmsd": [
    [
     "Eolas Prints",
@@ -12721,13 +12644,6 @@
     "Anycubic PC-GF"
    ]
   ],
-  "OFxMGIPt": [
-   [
-    "Generic",
-    "PPS",
-    "Flashforge PPS"
-   ]
-  ],
   "OFxOHhZw": [
    [
     "Elegoo",