diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json
index 9f4d613849..926df43021 100644
--- a/resources/profiles/BBL.json
+++ b/resources/profiles/BBL.json
@@ -995,7 +995,7 @@
         },
         {
             "name": "eSUN PLA+ @base",
-            "sub_path": "filament/eSUN PLA+ @base.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @base.json"
         },
         {
             "name": "Generic PP @base",
@@ -2763,19 +2763,19 @@
         },
         {
             "name": "eSUN PLA+ @BBL A1",
-            "sub_path": "filament/eSUN PLA+ @BBL A1.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL A1.json"
         },
         {
             "name": "eSUN PLA+ @BBL A1 0.2 nozzle",
-            "sub_path": "filament/eSUN PLA+ @BBL A1 0.2 nozzle.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL A1 0.2 nozzle.json"
         },
         {
             "name": "eSUN PLA+ @BBL A1M",
-            "sub_path": "filament/eSUN PLA+ @BBL A1M.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL A1M.json"
         },
         {
             "name": "eSUN PLA+ @BBL A1M 0.2 nozzle",
-            "sub_path": "filament/eSUN PLA+ @BBL A1M 0.2 nozzle.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL A1M 0.2 nozzle.json"
         },
         {
             "name": "eSUN PLA+ @BBL P1P",
@@ -2787,15 +2787,15 @@
         },
         {
             "name": "eSUN PLA+ @BBL X1",
-            "sub_path": "filament/eSUN PLA+ @BBL X1.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL X1.json"
         },
         {
             "name": "eSUN PLA+ @BBL X1C",
-            "sub_path": "filament/eSUN PLA+ @BBL X1C.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL X1C.json"
         },
         {
             "name": "eSUN PLA+ @BBL X1C 0.2 nozzle",
-            "sub_path": "filament/eSUN PLA+ @BBL X1C 0.2 nozzle.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL X1C 0.2 nozzle.json"
         },
         {
             "name": "Generic PP @BBL A1",
@@ -3404,4 +3404,4 @@
             "sub_path": "machine/Bambu Lab A1 0.8 nozzle.json"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/BBL/filament/eSUN PLA+ @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL A1 0.2 nozzle.json
similarity index 100%
rename from resources/profiles/BBL/filament/eSUN PLA+ @BBL A1 0.2 nozzle.json
rename to resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL A1 0.2 nozzle.json
diff --git a/resources/profiles/BBL/filament/eSUN PLA+ @BBL A1.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL A1.json
similarity index 100%
rename from resources/profiles/BBL/filament/eSUN PLA+ @BBL A1.json
rename to resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL A1.json
diff --git a/resources/profiles/BBL/filament/eSUN PLA+ @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL A1M 0.2 nozzle.json
similarity index 100%
rename from resources/profiles/BBL/filament/eSUN PLA+ @BBL A1M 0.2 nozzle.json
rename to resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL A1M 0.2 nozzle.json
diff --git a/resources/profiles/BBL/filament/eSUN PLA+ @BBL A1M.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL A1M.json
similarity index 100%
rename from resources/profiles/BBL/filament/eSUN PLA+ @BBL A1M.json
rename to resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL A1M.json
diff --git a/resources/profiles/BBL/filament/eSUN PLA+ @BBL X1.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL X1.json
similarity index 100%
rename from resources/profiles/BBL/filament/eSUN PLA+ @BBL X1.json
rename to resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL X1.json
diff --git a/resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL X1C 0.2 nozzle.json
similarity index 100%
rename from resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C 0.2 nozzle.json
rename to resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL X1C 0.2 nozzle.json
diff --git a/resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL X1C.json
similarity index 100%
rename from resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C.json
rename to resources/profiles/BBL/filament/eSUN/eSUN PLA+ @BBL X1C.json
diff --git a/resources/profiles/BBL/filament/eSUN PLA+ @base.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @base.json
similarity index 100%
rename from resources/profiles/BBL/filament/eSUN PLA+ @base.json
rename to resources/profiles/BBL/filament/eSUN/eSUN PLA+ @base.json
diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json
index c1a9109840..23e78e97a6 100644
--- a/resources/profiles/OrcaFilamentLibrary.json
+++ b/resources/profiles/OrcaFilamentLibrary.json
@@ -404,6 +404,10 @@
             "name": "eSUN PLA+ @base",
             "sub_path": "filament/eSUN/eSUN PLA+ @base.json"
         },
+        {
+            "name": "eSUN PETG @base",
+            "sub_path": "filament/eSUN/eSUN PETG @base.json"
+        },
         {
             "name": "fdm_filament_pla_silk",
             "sub_path": "filament/base/fdm_filament_pla_silk.json"
@@ -724,6 +728,14 @@
             "name": "eSUN PLA+ @System",
             "sub_path": "filament/eSUN/eSUN PLA+ @System.json"
         },
+        {
+            "name": "eSUN ePLA-LW @System",
+            "sub_path": "filament/eSUN/eSUN ePLA-LW @System.json"
+        },
+        {
+            "name": "eSUN PETG @System",
+            "sub_path": "filament/eSUN/eSUN PETG @System.json"
+        },
         {
             "name": "Generic PLA Silk @System",
             "sub_path": "filament/Generic PLA Silk @System.json"
@@ -753,4 +765,4 @@
             "sub_path": "filament/AliZ/AliZ PETG-Metal @System.json"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @System.json
new file mode 100644
index 0000000000..eacb079c86
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @System.json	
@@ -0,0 +1,9 @@
+{
+    "type": "filament",
+    "name": "eSUN PETG @System",
+    "inherits": "eSUN PETG @base",
+    "from": "system",
+    "setting_id": "PET01_00",
+    "instantiation": "true",
+    "compatible_printers": []
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @base.json
new file mode 100644
index 0000000000..3a4492379e
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @base.json	
@@ -0,0 +1,54 @@
+{
+    "type": "filament",
+    "name": "eSUN PETG @base",
+    "inherits": "fdm_filament_pet",
+    "from": "system",
+    "filament_id": "ESN03",
+    "instantiation": "false",
+    "filament_vendor": [
+        "eSUN"
+    ],
+    "filament_density": [
+        "1.27"
+    ],
+    "filament_flow_ratio": [
+        "0.98"
+    ],
+    "filament_max_volumetric_speed": [
+        "20"
+    ],
+    "fan_max_speed": [
+        "100"
+    ],
+    "fan_min_speed": [
+        "30"
+    ],
+    "nozzle_temperature": [
+        "240"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "240"
+    ],
+    "nozzle_temperature_range_high": [
+        "250"
+    ],
+    "nozzle_temperature_range_low": [
+        "230"
+    ],
+    "temperature_vitrification": [
+        "64"
+    ],
+    "hot_plate_temp": [
+        "65"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "65"
+    ],
+    "textured_plate_temp": [
+        "65"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "65"
+    ],
+    "compatible_printers": []
+}
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN ePLA-LW @System.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN ePLA-LW @System.json
new file mode 100644
index 0000000000..e56766f01a
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN ePLA-LW @System.json	
@@ -0,0 +1,44 @@
+{
+    "type": "filament",
+    "name": "eSUN ePLA-LW @System",
+    "inherits": "fdm_filament_pla",
+    "from": "system",
+    "filament_id": "ESN02",
+    "setting_id": "LWSL02_00",
+    "instantiation": "true",
+    "filament_type": ["PLA-AERO"],
+    "filament_cost": [
+        "33.99"
+    ],
+    "filament_density": [
+        "1.2"
+    ],
+    "filament_flow_ratio": [
+        "0.48"
+    ],
+    "filament_max_volumetric_speed": [
+        "6"
+    ],
+    "filament_vendor": [
+        "eSUN"
+    ],
+    "filament_scarf_seam_type": [
+        "none"
+    ],
+    "nozzle_temperature": [
+        "243"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "243"
+    ],
+    "nozzle_temperature_range_low": [
+        "190"
+    ],
+    "nozzle_temperature_range_high": [
+        "270"
+    ],
+    "temperature_vitrification": [
+        "53"
+    ],
+    "compatible_printers": []
+}