diff --git a/resources/profiles/Afinia.json b/resources/profiles/Afinia.json
new file mode 100644
index 0000000000..b25329b0ed
--- /dev/null
+++ b/resources/profiles/Afinia.json
@@ -0,0 +1,194 @@
+{
+    "name": "Afinia",
+    "version": "02.03.01.01",
+    "force_update": "0",
+    "description": "Afinia configurations",
+    "machine_model_list": [
+        {
+            "name": "Afinia H+1(HS)",
+            "sub_path": "machine/Afinia H+1(HS).json"
+        }
+    ],
+    "process_list": [
+        {
+            "name": "fdm_process_common",
+            "sub_path": "process/fdm_process_common.json"
+        },
+        {
+            "name": "fdm_process_afinia_common",
+            "sub_path": "process/fdm_process_afinia_common.json"
+        },
+        {
+            "name": "fdm_process_afinia_HS_common",
+            "sub_path": "process/fdm_process_afinia_HS_common.json"
+        },
+        {
+            "name": "0.12mm Fine @Afinia H+1(HS)",
+            "sub_path": "process/0.12mm Fine @Afinia H+1(HS).json"
+        },
+        {
+            "name": "0.16mm Optimal @Afinia H+1(HS)",
+            "sub_path": "process/0.16mm Optimal @Afinia H+1(HS).json"
+        },
+        {
+            "name": "0.20mm Standard @Afinia H+1(HS)",
+            "sub_path": "process/0.20mm Standard @Afinia H+1(HS).json"
+        },
+        {
+            "name": "0.24mm Draft @Afinia H+1(HS)",
+            "sub_path": "process/0.24mm Draft @Afinia H+1(HS).json"
+        },
+        {
+            "name": "0.28mm Extra Draft @Afinia H+1(HS)",
+            "sub_path": "process/0.28mm Extra Draft @Afinia H+1(HS).json"
+        },
+        {
+            "name": "fdm_process_afinia_0.18_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.24_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.24_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.30_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.30_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.36_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.36_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.42_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.42_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.18_nozzle_0.6_HS",
+            "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6_HS.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.24_nozzle_0.6_HS",
+            "sub_path": "process/fdm_process_afinia_0.24_nozzle_0.6_HS.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.30_nozzle_0.6_HS",
+            "sub_path": "process/fdm_process_afinia_0.30_nozzle_0.6_HS.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.36_nozzle_0.6_HS",
+            "sub_path": "process/fdm_process_afinia_0.36_nozzle_0.6_HS.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.42_nozzle_0.6_HS",
+            "sub_path": "process/fdm_process_afinia_0.42_nozzle_0.6_HS.json"
+        },
+        {
+            "name": "0.18mm Fine @Afinia H+1(HS) 0.6 nozzle",
+            "sub_path": "process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json"
+        },
+        {
+            "name": "0.24mm Standard @Afinia H+1(HS) 0.6 nozzle",
+            "sub_path": "process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json"
+        },
+        {
+            "name": "0.30mm Standard @Afinia H+1(HS) 0.6 nozzle",
+            "sub_path": "process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json"
+        },
+        {
+            "name": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle",
+            "sub_path": "process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json"
+        },
+        {
+            "name": "0.36mm Draft @Afinia H+1(HS) 0.6 nozzle",
+            "sub_path": "process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json"
+        },
+        {
+            "name": "0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle",
+            "sub_path": "process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json"
+        }
+    ],
+    "filament_list": [
+        {
+            "name": "fdm_filament_common",
+            "sub_path": "filament/fdm_filament_common.json"
+        },
+        {
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
+        },
+        {
+            "name": "fdm_filament_abs",
+            "sub_path": "filament/fdm_filament_abs.json"
+        },
+        {
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
+        },
+        {
+            "name": "Afinia PLA",
+            "sub_path": "filament/Afinia PLA.json"
+        },
+        {
+            "name": "Afinia Value PLA",
+            "sub_path": "filament/Afinia Value PLA.json"
+        },
+        {
+            "name": "Afinia ABS",
+            "sub_path": "filament/Afinia ABS.json"
+        },
+        {
+            "name": "Afinia ABS+",
+            "sub_path": "filament/Afinia ABS+.json"
+        },
+        {
+            "name": "Afinia Value ABS",
+            "sub_path": "filament/Afinia Value ABS.json"
+        },
+        {
+            "name": "Afinia TPU",
+            "sub_path": "filament/Afinia TPU.json"
+        },
+        {
+            "name": "Afinia PLA@HS",
+            "sub_path": "filament/Afinia PLA@HS.json"
+        },
+        {
+            "name": "Afinia Value PLA@HS",
+            "sub_path": "filament/Afinia Value PLA@HS.json"
+        },
+        {
+            "name": "Afinia ABS@HS",
+            "sub_path": "filament/Afinia ABS@HS.json"
+        },
+        {
+            "name": "Afinia Value ABS@HS",
+            "sub_path": "filament/Afinia Value ABS@HS.json"
+        },
+        {
+            "name": "Afinia ABS+@HS",
+            "sub_path": "filament/Afinia ABS+@HS.json"
+        },
+        {
+            "name": "Afinia TPU@HS",
+            "sub_path": "filament/Afinia TPU@HS.json"
+        }
+    ],
+    "machine_list": [
+        {
+            "name": "fdm_machine_common",
+            "sub_path": "machine/fdm_machine_common.json"
+        },
+        {
+            "name": "fdm_afinia_common",
+            "sub_path": "machine/fdm_afinia_common.json"
+        },
+        {
+            "name": "Afinia H+1(HS) 0.4 nozzle",
+            "sub_path": "machine/Afinia H+1(HS) 0.4 nozzle.json"
+        },
+        {
+            "name": "Afinia H+1(HS) 0.6 nozzle",
+            "sub_path": "machine/Afinia H+1(HS) 0.6 nozzle.json"
+        }
+    ]
+}
diff --git a/resources/profiles/Afinia/Afinia H+1(HS)_cover.png b/resources/profiles/Afinia/Afinia H+1(HS)_cover.png
new file mode 100644
index 0000000000..c16a5f37eb
Binary files /dev/null and b/resources/profiles/Afinia/Afinia H+1(HS)_cover.png differ
diff --git a/resources/profiles/Afinia/filament/Afinia ABS+.json b/resources/profiles/Afinia/filament/Afinia ABS+.json
new file mode 100644
index 0000000000..354711d667
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia ABS+.json	
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "filament_id": "GFB00",
+    "setting_id": "GFSB00",
+    "name": "Afinia ABS+",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "nozzle_temperature": [
+        "275"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "275"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Afinia H400 Pro 0.4 nozzle",
+        "Afinia H400 Pro 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia ABS+@HS.json b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json
new file mode 100644
index 0000000000..7d682604ad
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json	
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "filament_id": "GFB00_01",
+    "setting_id": "GFSB00",
+    "name": "Afinia ABS+@HS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "nozzle_temperature": [
+        "275"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "275"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle",
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia ABS.json b/resources/profiles/Afinia/filament/Afinia ABS.json
new file mode 100644
index 0000000000..b0029f46c6
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia ABS.json	
@@ -0,0 +1,31 @@
+{
+    "type": "filament",
+    "filament_id": "GFB00",
+    "setting_id": "GFSB00",
+    "name": "Afinia ABS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Afinia H400 Pro 0.4 nozzle",
+        "Afinia H400 Pro 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia ABS@HS.json b/resources/profiles/Afinia/filament/Afinia ABS@HS.json
new file mode 100644
index 0000000000..b82219c42d
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia ABS@HS.json	
@@ -0,0 +1,31 @@
+{
+    "type": "filament",
+    "filament_id": "GFB00_01",
+    "setting_id": "GFSB00",
+    "name": "Afinia ABS@HS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle",
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia PLA.json b/resources/profiles/Afinia/filament/Afinia PLA.json
new file mode 100644
index 0000000000..05906f0ea1
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia PLA.json	
@@ -0,0 +1,34 @@
+{
+    "type": "filament",
+    "filament_id": "GFA00",
+    "setting_id": "GFSA00",
+    "name": "Afinia PLA",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_density": [
+        "1.26"
+    ],
+    "filament_flow_ratio": [
+        "0.98"
+    ],
+    "filament_max_volumetric_speed": [
+        "21"
+    ],
+    "filament_vendor": [    
+        "Afinia"
+    ],
+    "filament_long_retractions_when_cut": [
+        "1"
+    ],
+    "filament_retraction_distances_when_cut": [
+        "18"
+    ],
+    "compatible_printers": [
+        "Afinia H400 Pro 0.4 nozzle",
+        "Afinia H400 Pro 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia PLA@HS.json b/resources/profiles/Afinia/filament/Afinia PLA@HS.json
new file mode 100644
index 0000000000..b2950ed1d6
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia PLA@HS.json	
@@ -0,0 +1,34 @@
+{
+    "type": "filament",
+    "filament_id": "GFA00_01",
+    "setting_id": "GFSA00",
+    "name": "Afinia PLA@HS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_density": [
+        "1.26"
+    ],
+    "filament_flow_ratio": [
+        "0.98"
+    ],
+    "filament_max_volumetric_speed": [
+        "21"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "filament_long_retractions_when_cut": [
+        "1"
+    ],
+    "filament_retraction_distances_when_cut": [
+        "18"
+    ],
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle",
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia TPU.json b/resources/profiles/Afinia/filament/Afinia TPU.json
new file mode 100644
index 0000000000..bc5c8691a0
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia TPU.json	
@@ -0,0 +1,27 @@
+{
+    "type": "filament",
+    "name": "Afinia TPU",
+    "inherits": "fdm_filament_tpu",
+    "from": "system",
+    "filament_id": "GFU01",
+    "instantiation": "true",
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "filament_density": [
+        "1.22"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "230"
+    ],
+    "filament_cost": [
+        "41.99"
+    ],
+    "nozzle_temperature": [
+        "230"
+    ],
+    "compatible_printers": [
+        "Afinia H400 Pro 0.4 nozzle",
+        "Afinia H400 Pro 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia TPU@HS.json b/resources/profiles/Afinia/filament/Afinia TPU@HS.json
new file mode 100644
index 0000000000..b6ba69eacb
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia TPU@HS.json	
@@ -0,0 +1,27 @@
+{
+    "type": "filament",
+    "name": "Afinia TPU@HS",
+    "inherits": "fdm_filament_tpu",
+    "from": "system",
+    "filament_id": "GFU01_01",
+    "instantiation": "true",
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "filament_density": [
+        "1.22"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "230"
+    ],
+    "filament_cost": [
+        "41.99"
+    ],
+    "nozzle_temperature": [
+        "230"
+    ],
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle",
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS.json b/resources/profiles/Afinia/filament/Afinia Value ABS.json
new file mode 100644
index 0000000000..301dcf5ab6
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia Value ABS.json	
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "filament_id": "GFB00",
+    "setting_id": "GFSB00",
+    "name": "Afinia Value ABS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "nozzle_temperature": [
+        "245"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "245"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Afinia H400 Pro 0.4 nozzle",
+        "Afinia H400 Pro 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json
new file mode 100644
index 0000000000..611b61ad64
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json	
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "filament_id": "GFB00_01",
+    "setting_id": "GFSB00",
+    "name": "Afinia Value ABS@HS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "nozzle_temperature": [
+        "245"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "245"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle",
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA.json b/resources/profiles/Afinia/filament/Afinia Value PLA.json
new file mode 100644
index 0000000000..f8904735fe
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia Value PLA.json	
@@ -0,0 +1,40 @@
+{
+    "type": "filament",
+    "filament_id": "GFA00",
+    "setting_id": "GFSA00",
+    "name": "Afinia Value PLA",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_density": [
+        "1.26"
+    ],
+    "filament_flow_ratio": [
+        "0.98"
+    ],
+    "filament_max_volumetric_speed": [
+        "21"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "filament_long_retractions_when_cut": [
+        "1"
+    ],
+    "filament_retraction_distances_when_cut": [
+        "18"
+    ],
+    "nozzle_temperature": [
+        "190"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "190"
+    ],
+    "compatible_printers": [
+        "Afinia H400 Pro 0.4 nozzle",
+        "Afinia H400 Pro 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json
new file mode 100644
index 0000000000..77e496b5ec
--- /dev/null
+++ b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json	
@@ -0,0 +1,40 @@
+{
+    "type": "filament",
+    "filament_id": "GFA00_01",
+    "setting_id": "GFSA00",
+    "name": "Afinia Value PLA@HS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_density": [
+        "1.26"
+    ],
+    "filament_flow_ratio": [
+        "0.98"
+    ],
+    "filament_max_volumetric_speed": [
+        "21"
+    ],
+    "filament_vendor": [
+        "Afinia"
+    ],
+    "filament_long_retractions_when_cut": [
+        "1"
+    ],
+    "filament_retraction_distances_when_cut": [
+        "18"
+    ],
+    "nozzle_temperature": [
+        "190"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "190"
+    ],
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle",
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/fdm_filament_abs.json b/resources/profiles/Afinia/filament/fdm_filament_abs.json
new file mode 100644
index 0000000000..50dc3facf1
--- /dev/null
+++ b/resources/profiles/Afinia/filament/fdm_filament_abs.json
@@ -0,0 +1,82 @@
+{
+    "type": "filament",
+    "name": "fdm_filament_abs",
+    "inherits": "fdm_filament_common",
+    "from": "system",
+    "instantiation": "false",
+    "activate_air_filtration": [
+        "0"
+    ],
+    "cool_plate_temp": [
+        "0"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "0"
+    ],
+    "eng_plate_temp": [
+        "90"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "90"
+    ],
+    "fan_cooling_layer_time": [
+        "30"
+    ],
+    "fan_max_speed": [
+        "80"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "filament_cost": [
+        "20"
+    ],
+    "filament_density": [
+        "1.04"
+    ],
+    "filament_max_volumetric_speed": [
+        "28.6"
+    ],
+    "filament_type": [
+        "ABS"
+    ],
+    "hot_plate_temp": [
+        "90"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "90"
+    ],
+    "nozzle_temperature": [
+        "270"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "270"
+    ],
+    "nozzle_temperature_range_high": [
+        "280"
+    ],
+    "nozzle_temperature_range_low": [
+        "240"
+    ],
+    "overhang_fan_speed": [
+        "80"
+    ],
+    "overhang_fan_threshold": [
+        "25%"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "1"
+    ],
+    "slow_down_layer_time": [
+        "3"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "textured_plate_temp": [
+        "90"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "90"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/fdm_filament_common.json b/resources/profiles/Afinia/filament/fdm_filament_common.json
new file mode 100644
index 0000000000..3fb3a8da5e
--- /dev/null
+++ b/resources/profiles/Afinia/filament/fdm_filament_common.json
@@ -0,0 +1,166 @@
+{
+    "type": "filament",
+    "name": "fdm_filament_common",
+    "from": "system",
+    "instantiation": "false",
+    "activate_air_filtration": [
+        "0"
+    ],
+    "chamber_temperatures": [
+        "0"
+    ],
+    "close_fan_the_first_x_layers": [
+        "3"
+    ],
+    "complete_print_exhaust_fan_speed": [
+        "70"
+    ],
+    "cool_plate_temp": [
+        "60"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "60"
+    ],
+    "during_print_exhaust_fan_speed": [
+        "70"
+    ],
+    "eng_plate_temp": [
+        "60"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "60"
+    ],
+    "fan_cooling_layer_time": [
+        "60"
+    ],
+    "fan_max_speed": [
+        "100"
+    ],
+    "fan_min_speed": [
+        "35"
+    ],
+    "filament_cost": [
+        "0"
+    ],
+    "filament_density": [
+        "0"
+    ],
+    "filament_deretraction_speed": [
+        "nil"
+    ],
+    "filament_diameter": [
+        "1.75"
+    ],
+    "filament_flow_ratio": [
+        "1"
+    ],
+    "filament_is_support": [
+        "0"
+    ],
+    "filament_long_retractions_when_cut": [
+        "nil"
+    ],
+    "filament_max_volumetric_speed": [
+        "0"
+    ],
+    "filament_minimal_purge_on_wipe_tower": [
+        "15"
+    ],
+    "filament_retract_before_wipe": [
+        "nil"
+    ],
+    "filament_retract_restart_extra": [
+        "nil"
+    ],
+    "filament_retract_when_changing_layer": [
+        "nil"
+    ],
+    "filament_retraction_distances_when_cut": [
+        "nil"
+    ],
+    "filament_retraction_length": [
+        "nil"
+    ],
+    "filament_retraction_minimum_travel": [
+        "nil"
+    ],
+    "filament_retraction_speed": [
+        "nil"
+    ],
+    "filament_settings_id": [
+        ""
+    ],
+    "filament_soluble": [
+        "0"
+    ],
+    "filament_type": [
+        "PLA"
+    ],
+    "filament_vendor": [
+        "Generic"
+    ],
+    "filament_wipe": [
+        "nil"
+    ],
+    "filament_wipe_distance": [
+        "nil"
+    ],
+    "filament_z_hop": [
+        "nil"
+    ],
+    "filament_z_hop_types": [
+        "nil"
+    ],
+    "full_fan_speed_layer": [
+        "0"
+    ],
+    "hot_plate_temp": [
+        "60"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "60"
+    ],
+    "nozzle_temperature": [
+        "200"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "200"
+    ],
+    "overhang_fan_speed": [
+        "100"
+    ],
+    "overhang_fan_threshold": [
+        "95%"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "0"
+    ],
+    "required_nozzle_HRC": [
+        "3"
+    ],
+    "slow_down_for_layer_cooling": [
+        "1"
+    ],
+    "slow_down_layer_time": [
+        "8"
+    ],
+    "slow_down_min_speed": [
+        "10"
+    ],
+    "temperature_vitrification": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "60"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "60"
+    ],
+    "compatible_printers": [],
+    "filament_start_gcode": [
+        "; Filament gcode\n;{if activate_air_filtration[current_extruder] && support_air_filtration}\n;M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n;{endif}"
+    ],
+    "filament_end_gcode": [
+        "; filament end gcode \n;M106 P3 S0\n"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/fdm_filament_pla.json b/resources/profiles/Afinia/filament/fdm_filament_pla.json
new file mode 100644
index 0000000000..349acbdcc5
--- /dev/null
+++ b/resources/profiles/Afinia/filament/fdm_filament_pla.json
@@ -0,0 +1,82 @@
+{
+    "type": "filament",
+    "name": "fdm_filament_pla",
+    "inherits": "fdm_filament_common",
+    "from": "system",
+    "instantiation": "false",
+    "fan_cooling_layer_time": [
+        "100"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "filament_density": [
+        "1.24"
+    ],
+    "filament_cost": [
+        "20"
+    ],
+    "cool_plate_temp": [
+        "35"
+    ],
+    "eng_plate_temp": [
+        "0"
+    ],
+    "hot_plate_temp": [
+        "60"
+    ],
+    "textured_plate_temp": [
+        "60"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "35"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "0"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "60"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "60"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "220"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "1"
+    ],
+    "fan_min_speed": [
+        "100"
+    ],
+    "overhang_fan_threshold": [
+        "50%"
+    ],
+    "close_fan_the_first_x_layers": [
+        "1"
+    ],
+    "nozzle_temperature": [
+        "220"
+    ],
+    "temperature_vitrification": [
+        "45"
+    ],
+    "nozzle_temperature_range_low": [
+        "190"
+    ],
+    "nozzle_temperature_range_high": [
+        "240"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "additional_cooling_fan_speed": [
+        "70"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n;{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n;{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n;{endif}\n\n;{if activate_air_filtration[current_extruder] && support_air_filtration}\n;M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n;{endif}"
+    ]
+}
diff --git a/resources/profiles/Afinia/filament/fdm_filament_tpu.json b/resources/profiles/Afinia/filament/fdm_filament_tpu.json
new file mode 100644
index 0000000000..1914ac3029
--- /dev/null
+++ b/resources/profiles/Afinia/filament/fdm_filament_tpu.json
@@ -0,0 +1,79 @@
+{
+    "type": "filament",
+    "name": "fdm_filament_tpu",
+    "inherits": "fdm_filament_common",
+    "from": "system",
+    "instantiation": "false",
+    "additional_cooling_fan_speed": [
+        "70"
+    ],
+    "close_fan_the_first_x_layers": [
+        "1"
+    ],
+    "cool_plate_temp": [
+        "30"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "30"
+    ],
+    "eng_plate_temp": [
+        "30"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "30"
+    ],
+    "fan_cooling_layer_time": [
+        "100"
+    ],
+    "fan_min_speed": [
+        "100"
+    ],
+    "filament_cost": [
+        "20"
+    ],
+    "filament_density": [
+        "1.24"
+    ],
+    "filament_max_volumetric_speed": [
+        "8"
+    ],
+    "filament_retraction_length": [
+        "2.0"
+    ],
+    "filament_type": [
+        "TPU"
+    ],
+    "hot_plate_temp": [
+        "35"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "35"
+    ],
+    "nozzle_temperature": [
+        "240"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "240"
+    ],
+    "nozzle_temperature_range_high": [
+        "250"
+    ],
+    "nozzle_temperature_range_low": [
+        "200"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "1"
+    ],
+    "temperature_vitrification": [
+        "30"
+    ],
+    "textured_plate_temp": [
+        "35"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "35"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ]
+}
diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json
new file mode 100644
index 0000000000..023c10c104
--- /dev/null
+++ b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json	
@@ -0,0 +1,21 @@
+{
+    "type": "machine",
+    "setting_id": "GM001",
+    "name": "Afinia H+1(HS) 0.4 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_afinia_common",
+    "printer_model": "Afinia H+1(HS)",
+    "default_print_profile": "0.20mm Standard @Afinia H+1(HS)",
+    "nozzle_diameter": [
+        "0.4"
+    ],
+    "printer_variant": "0.4",
+    "printable_area": [
+        "0x0",
+        "207x0",
+        "207x255",
+        "0x255"
+    ],
+    "printable_height": "230"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json
new file mode 100644
index 0000000000..f8d6a58926
--- /dev/null
+++ b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM001",
+    "name": "Afinia H+1(HS) 0.6 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Afinia H+1(HS) 0.4 nozzle",
+    "printer_model": "Afinia H+1(HS)",
+    "default_print_profile": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle",
+    "nozzle_diameter": [
+        "0.6"
+    ],
+    "printer_variant": "0.6",
+    "max_layer_height": [
+        "0.42"
+    ],
+    "min_layer_height": [
+        "0.18"
+    ],
+    "retraction_length": [
+        "1.4"
+    ],
+    "retraction_minimum_travel": [
+        "3"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS).json b/resources/profiles/Afinia/machine/Afinia H+1(HS).json
new file mode 100644
index 0000000000..9a882476eb
--- /dev/null
+++ b/resources/profiles/Afinia/machine/Afinia H+1(HS).json	
@@ -0,0 +1,12 @@
+{
+    "type": "machine_model",
+    "name": "Afinia H+1(HS)",
+    "model_id": "my_afinia_h_1_hs_01",
+    "nozzle_diameter": "0.4;0.6",
+    "machine_tech": "FFF",
+    "family": "Afinia",
+    "bed_model": "",
+    "bed_texture": "",
+    "hotend_model": "",
+    "default_materials": "Afinia ABS;Afinia PLA"
+}
diff --git a/resources/profiles/Afinia/machine/fdm_afinia_common.json b/resources/profiles/Afinia/machine/fdm_afinia_common.json
new file mode 100644
index 0000000000..4ba6250b3a
--- /dev/null
+++ b/resources/profiles/Afinia/machine/fdm_afinia_common.json
@@ -0,0 +1,60 @@
+{
+  "type": "machine",
+  "name": "fdm_afinia_common",
+  "from": "system",
+  "instantiation": "false",
+  "inherits": "fdm_machine_common",
+  "gcode_flavor": "klipper",
+  "machine_max_acceleration_e": ["5000", "5000"],
+  "machine_max_acceleration_extruding": ["20000", "20000"],
+  "machine_max_acceleration_retracting": ["5000", "5000"],
+  "machine_max_acceleration_travel": ["20000", "20000"],
+  "machine_max_acceleration_x": ["20000", "20000"],
+  "machine_max_acceleration_y": ["20000", "20000"],
+  "machine_max_acceleration_z": ["500", "200"],
+  "machine_max_speed_e": ["25", "25"],
+  "machine_max_speed_x": ["500", "200"],
+  "machine_max_speed_y": ["500", "200"],
+  "machine_max_speed_z": ["12", "12"],
+  "machine_max_jerk_e": ["2.5", "2.5"],
+  "machine_max_jerk_x": ["9", "9"],
+  "machine_max_jerk_y": ["9", "9"],
+  "machine_max_jerk_z": ["0.2", "0.4"],
+  "machine_min_extruding_rate": ["0", "0"],
+  "machine_min_travel_rate": ["0", "0"],
+  "max_layer_height": ["0.32"],
+  "min_layer_height": ["0.08"],
+  "printable_height": "250",
+  "extruder_clearance_radius": "65",
+  "extruder_clearance_height_to_rod": "36",
+  "extruder_clearance_height_to_lid": "140",
+  "printer_settings_id": "",
+  "printer_technology": "FFF",
+  "printer_variant": "0.4",
+  "retraction_minimum_travel": ["1"],
+  "retract_before_wipe": ["70%"],
+  "retract_when_changing_layer": ["1"],
+  "retraction_length": ["0.8"],
+  "retract_length_toolchange": ["2"],
+  "z_hop": ["0.4"],
+  "retract_restart_extra": ["0"],
+  "retract_restart_extra_toolchange": ["0"],
+  "retraction_speed": ["30"],
+  "deretraction_speed": ["30"],
+  "z_hop_types": "Normal Lift",
+  "silent_mode": "0",
+  "single_extruder_multi_material": "1",
+  "change_filament_gcode": "",
+  "wipe": ["1"],
+  "default_filament_profile": [""],
+  "default_print_profile": "0.20mm Standard @Afinia H+1(HS)",
+  "bed_exclude_area": ["0x0"],
+  "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n",
+  "machine_end_gcode": "PRINT_END",
+  "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
+  "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+  "machine_pause_gcode": "PAUSE",
+  "scan_first_layer": "0",
+  "nozzle_type": "undefine",
+  "auxiliary_fan": "0"
+}
diff --git a/resources/profiles/Afinia/machine/fdm_machine_common.json b/resources/profiles/Afinia/machine/fdm_machine_common.json
new file mode 100644
index 0000000000..5785f57b19
--- /dev/null
+++ b/resources/profiles/Afinia/machine/fdm_machine_common.json
@@ -0,0 +1,119 @@
+{
+    "type": "machine",
+    "name": "fdm_machine_common",
+    "from": "system",
+    "instantiation": "false",
+    "printer_technology": "FFF",
+    "deretraction_speed": [
+        "40"
+    ],
+    "extruder_colour": [
+        "#FCE94F"
+    ],
+    "extruder_offset": [
+        "0x0"
+    ],
+    "gcode_flavor": "marlin",
+    "silent_mode": "0",
+    "machine_max_acceleration_e": [
+        "5000"
+    ],
+    "machine_max_acceleration_extruding": [
+        "10000"
+    ],
+    "machine_max_acceleration_retracting": [
+        "1000"
+    ],
+    "machine_max_acceleration_x": [
+        "10000"
+    ],
+    "machine_max_acceleration_y": [
+        "10000"
+    ],
+    "machine_max_acceleration_z": [
+        "500"
+    ],
+    "machine_max_speed_e": [
+        "60"
+    ],
+    "machine_max_speed_x": [
+        "500"
+    ],
+    "machine_max_speed_y": [
+        "500"
+    ],
+    "machine_max_speed_z": [
+        "10"
+    ],
+    "machine_max_jerk_e": [
+        "5"
+    ],
+    "machine_max_jerk_x": [
+        "8"
+    ],
+    "machine_max_jerk_y": [
+        "8"
+    ],
+    "machine_max_jerk_z": [
+        "0.4"
+    ],
+    "machine_min_extruding_rate": [
+        "0"
+    ],
+    "machine_min_travel_rate": [
+        "0"
+    ],
+    "max_layer_height": [
+        "0.32"
+    ],
+    "min_layer_height": [
+        "0.08"
+    ],
+    "printable_height": "250",
+    "extruder_clearance_radius": "65",
+    "extruder_clearance_height_to_rod": "36",
+    "extruder_clearance_height_to_lid": "140",
+    "nozzle_diameter": [
+        "0.4"
+    ],
+    "printer_settings_id": "",
+    "printer_variant": "0.4",
+    "retraction_minimum_travel": [
+        "2"
+    ],
+    "retract_before_wipe": [
+        "70%"
+    ],
+    "retract_when_changing_layer": [
+        "1"
+    ],
+    "retraction_length": [
+        "5"
+    ],
+    "retract_length_toolchange": [
+        "1"
+    ],
+    "z_hop": [
+        "0"
+    ],
+    "retract_restart_extra": [
+        "0"
+    ],
+    "retract_restart_extra_toolchange": [
+        "0"
+    ],
+    "retraction_speed": [
+        "60"
+    ],
+    "single_extruder_multi_material": "1",
+    "change_filament_gcode": "",
+    "wipe": [
+        "1"
+    ],
+    "default_print_profile": "",
+    "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
+    "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end",
+    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
+    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+    "machine_pause_gcode": "M601"
+}
diff --git a/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json
new file mode 100644
index 0000000000..23bdba8295
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json	
@@ -0,0 +1,30 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.12mm Fine @Afinia H+1(HS)",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_afinia_HS_common",
+    "layer_height": "0.12",
+    "bottom_shell_layers": "5",
+    "elefant_foot_compensation": "0.15",
+    "top_shell_layers": "5",
+    "top_shell_thickness": "0.6",
+    "bridge_flow": "1",
+    "initial_layer_speed": "50",
+    "initial_layer_infill_speed": "105",
+    "outer_wall_speed": "150",
+    "inner_wall_speed": "200",
+    "sparse_infill_speed": "200",
+    "internal_solid_infill_speed": "200",
+    "gap_infill_speed": "150",
+    "overhang_1_4_speed": "60",
+    "overhang_2_4_speed": "30",
+    "overhang_3_4_speed": "10",
+    "support_threshold_angle": "20",
+    "support_top_z_distance": "0.12",
+    "support_bottom_z_distance": "0.12",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json
new file mode 100644
index 0000000000..525f159f5a
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json	
@@ -0,0 +1,30 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.16mm Optimal @Afinia H+1(HS)",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_afinia_HS_common",
+    "layer_height": "0.16",
+    "elefant_foot_compensation": "0.15",
+    "bottom_shell_layers": "4",
+    "top_shell_layers": "6",
+    "top_shell_thickness": "1.0",
+    "bridge_flow": "1",
+    "initial_layer_speed": "50",
+    "initial_layer_infill_speed": "105",
+    "outer_wall_speed": "150",
+    "inner_wall_speed": "200",
+    "sparse_infill_speed": "200",
+    "internal_solid_infill_speed": "200",
+    "gap_infill_speed": "150",
+    "overhang_1_4_speed": "60",
+    "overhang_2_4_speed": "30",
+    "overhang_3_4_speed": "10",
+    "support_threshold_angle": "25",
+    "support_top_z_distance": "0.16",
+    "support_bottom_z_distance": "0.16",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json
new file mode 100644
index 0000000000..7de0121d05
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json	
@@ -0,0 +1,15 @@
+{
+    "type": "process",
+    "name": "0.18mm Fine @Afinia H+1(HS) 0.6 nozzle",
+    "inherits": "fdm_process_afinia_0.18_nozzle_0.6_HS",
+    "from": "system",
+    "setting_id": "GP021",
+    "instantiation": "true",
+    "description": "It has a smaller layer height and results in smoother surface and higher printing quality.",
+    "elefant_foot_compensation": "0.15",
+    "smooth_coefficient": "150",
+    "overhang_totally_speed": "50",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json
new file mode 100644
index 0000000000..54d7f74bf4
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json	
@@ -0,0 +1,22 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.20mm Standard @Afinia H+1(HS)",
+    "from": "system",
+    "inherits": "fdm_process_afinia_HS_common",
+    "instantiation": "true",
+    "elefant_foot_compensation": "0.15",
+    "top_shell_thickness": "1.0",
+    "bridge_flow": "1",
+    "initial_layer_speed": "50",
+    "initial_layer_infill_speed": "105",
+    "outer_wall_speed": "150",
+    "inner_wall_speed": "200",
+    "sparse_infill_speed": "200",
+    "internal_solid_infill_speed": "200",
+    "gap_infill_speed": "150",
+    "top_shell_layers": "5",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle"
+    ]
+}
diff --git a/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json
new file mode 100644
index 0000000000..3a34b22d3b
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json	
@@ -0,0 +1,25 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.24mm Draft @Afinia H+1(HS)",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_afinia_HS_common",
+    "layer_height": "0.24",
+    "elefant_foot_compensation": "0.15",
+    "top_surface_line_width": "0.45",
+    "top_shell_thickness": "1.0",
+    "bridge_flow": "1",
+    "initial_layer_speed": "50",
+    "initial_layer_infill_speed": "105",
+    "outer_wall_speed": "150",
+    "inner_wall_speed": "200",
+    "sparse_infill_speed": "200",
+    "internal_solid_infill_speed": "200",
+    "gap_infill_speed": "150",
+    "support_threshold_angle": "35",
+    "top_shell_layers": "4",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json
new file mode 100644
index 0000000000..6c6fc996ea
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json	
@@ -0,0 +1,15 @@
+{
+    "type": "process",
+    "name": "0.24mm Standard @Afinia H+1(HS) 0.6 nozzle",
+    "inherits": "fdm_process_afinia_0.24_nozzle_0.6_HS",
+    "from": "system",
+    "setting_id": "GP022",
+    "instantiation": "true",
+    "description": "It has a balanced layer height for good quality and reasonable printing time.",
+    "elefant_foot_compensation": "0.15",
+    "smooth_coefficient": "150",
+    "overhang_totally_speed": "50",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json
new file mode 100644
index 0000000000..fb6ac16d7b
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json	
@@ -0,0 +1,25 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.28mm Extra Draft @Afinia H+1(HS)",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_afinia_HS_common",
+    "layer_height": "0.28",
+    "elefant_foot_compensation": "0.15",
+    "top_surface_line_width": "0.45",
+    "top_shell_thickness": "1.0",
+    "bridge_flow": "1",
+    "initial_layer_speed": "50",
+    "initial_layer_infill_speed": "105",
+    "outer_wall_speed": "200",
+    "inner_wall_speed": "200",
+    "sparse_infill_speed": "200",
+    "internal_solid_infill_speed": "200",
+    "gap_infill_speed": "200",
+    "support_threshold_angle": "40",
+    "top_shell_layers": "4",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json
new file mode 100644
index 0000000000..4c0c79a151
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json	
@@ -0,0 +1,15 @@
+{
+    "type": "process",
+    "name": "0.30mm Standard @Afinia H+1(HS) 0.6 nozzle",
+    "inherits": "fdm_process_afinia_0.30_nozzle_0.6_HS",
+    "from": "system",
+    "setting_id": "GP023",
+    "instantiation": "true",
+    "description": "It has a big layer height, and results in apparent layer lines and ordinary printing quality and printing time.",
+    "elefant_foot_compensation": "0.15",
+    "smooth_coefficient": "150",
+    "overhang_totally_speed": "50",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json
new file mode 100644
index 0000000000..16702b9da4
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json	
@@ -0,0 +1,17 @@
+{
+    "type": "process",
+    "name": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle",
+    "inherits": "fdm_process_afinia_0.30_nozzle_0.6_HS",
+    "from": "system",
+    "setting_id": "GP024",
+    "instantiation": "true",
+    "description": "It has a big layer height with optimized settings for stronger parts.",
+    "elefant_foot_compensation": "0.15",
+    "smooth_coefficient": "150",
+    "overhang_totally_speed": "50",
+    "sparse_infill_density": "25%",
+    "wall_loops": "3",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json
new file mode 100644
index 0000000000..c1e1b6564f
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json	
@@ -0,0 +1,15 @@
+{
+    "type": "process",
+    "name": "0.36mm Draft @Afinia H+1(HS) 0.6 nozzle",
+    "inherits": "fdm_process_afinia_0.36_nozzle_0.6_HS",
+    "from": "system",
+    "setting_id": "GP025",
+    "instantiation": "true",
+    "description": "It has a bigger layer height for faster printing but with more visible layer lines.",
+    "elefant_foot_compensation": "0.15",
+    "smooth_coefficient": "150",
+    "overhang_totally_speed": "50",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json
new file mode 100644
index 0000000000..4d8c101bde
--- /dev/null
+++ b/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json	
@@ -0,0 +1,15 @@
+{
+    "type": "process",
+    "name": "0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle",
+    "inherits": "fdm_process_afinia_0.42_nozzle_0.6_HS",
+    "from": "system",
+    "setting_id": "GP026",
+    "instantiation": "true",
+    "description": "It has the biggest layer height for fastest printing but with very visible layer lines.",
+    "elefant_foot_compensation": "0.15",
+    "smooth_coefficient": "150",
+    "overhang_totally_speed": "50",
+    "compatible_printers": [
+        "Afinia H+1(HS) 0.6 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json
new file mode 100644
index 0000000000..e9fb7c853c
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.18_nozzle_0.6",
+    "inherits": "fdm_process_afinia_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.18",
+    "initial_layer_print_height": "0.18",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "120",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json
new file mode 100644
index 0000000000..f4328e6f49
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.18_nozzle_0.6_HS",
+    "inherits": "fdm_process_afinia_HS_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.18",
+    "initial_layer_print_height": "0.18",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "120",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json
new file mode 100644
index 0000000000..f953c4cfe0
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.24_nozzle_0.6",
+    "inherits": "fdm_process_afinia_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.24",
+    "initial_layer_print_height": "0.24",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "130",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json
new file mode 100644
index 0000000000..c1f989f703
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.24_nozzle_0.6_HS",
+    "inherits": "fdm_process_afinia_HS_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.24",
+    "initial_layer_print_height": "0.24",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "130",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json
new file mode 100644
index 0000000000..850260615c
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.30_nozzle_0.6",
+    "inherits": "fdm_process_afinia_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.3",
+    "initial_layer_print_height": "0.3",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "150",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json
new file mode 100644
index 0000000000..4ef5a8b928
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.30_nozzle_0.6_HS",
+    "inherits": "fdm_process_afinia_HS_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.3",
+    "initial_layer_print_height": "0.3",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "150",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json
new file mode 100644
index 0000000000..884e6114c0
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.36_nozzle_0.6",
+    "inherits": "fdm_process_afinia_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.36",
+    "initial_layer_print_height": "0.36",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "140",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json
new file mode 100644
index 0000000000..b1ec86fd36
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.36_nozzle_0.6_HS",
+    "inherits": "fdm_process_afinia_HS_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.36",
+    "initial_layer_print_height": "0.36",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "140",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json
new file mode 100644
index 0000000000..501f2ba435
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.42_nozzle_0.6",
+    "inherits": "fdm_process_afinia_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.42",
+    "initial_layer_print_height": "0.42",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "130",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json
new file mode 100644
index 0000000000..e5876d9843
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json
@@ -0,0 +1,26 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_0.42_nozzle_0.6_HS",
+    "inherits": "fdm_process_afinia_HS_common",
+    "from": "system",
+    "instantiation": "false",
+    "layer_height": "0.42",
+    "initial_layer_print_height": "0.42",
+    "bridge_flow": "1",
+    "line_width": "0.62",
+    "outer_wall_line_width": "0.62",
+    "ironing_inset": "0.31",
+    "initial_layer_line_width": "0.62",
+    "sparse_infill_line_width": "0.62",
+    "inner_wall_line_width": "0.62",
+    "internal_solid_infill_line_width": "0.62",
+    "support_line_width": "0.62",
+    "top_surface_line_width": "0.62",
+    "initial_layer_speed": "35",
+    "initial_layer_infill_speed": "55",
+    "sparse_infill_speed": "100",
+    "top_surface_speed": "130",
+    "bridge_speed": "30",
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json b/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json
new file mode 100644
index 0000000000..c8ea47e3b5
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json
@@ -0,0 +1,15 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_HS_common",
+    "inherits": "fdm_process_afinia_common",
+    "from": "system",
+    "instantiation": "false",
+    "default_acceleration": "4000",
+    "travel_acceleration": "4000",
+    "outer_wall_acceleration": "2500",
+    "inner_wall_acceleration": "3000",
+    "initial_layer_acceleration": "500",
+    "top_surface_acceleration": "2000",
+    "travel_speed": "200",
+    "compatible_printers": []
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_common.json b/resources/profiles/Afinia/process/fdm_process_afinia_common.json
new file mode 100644
index 0000000000..09a0c06458
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_afinia_common.json
@@ -0,0 +1,79 @@
+{
+    "type": "process",
+    "name": "fdm_process_afinia_common",
+    "inherits": "fdm_process_common",
+    "from": "system",
+    "instantiation": "false",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_speed": "50",
+    "brim_object_gap": "0.1",
+    "compatible_printers_condition": "",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0",
+    "enable_arc_fitting": "1",
+    "default_acceleration": "6000",
+    "travel_acceleration": "6000",
+    "outer_wall_acceleration": "3000",
+    "inner_wall_acceleration": "5000",
+    "top_surface_acceleration": "2000",
+    "initial_layer_acceleration": "500",
+    "line_width": "0.42",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_speed": "50",
+    "initial_layer_infill_speed": "90",
+    "outer_wall_speed": "120",
+    "inner_wall_speed": "160",
+    "gap_infill_speed": "50",
+    "sparse_infill_speed": "250",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "30",
+    "ironing_type": "no ironing",
+    "layer_height": "0.2",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[0]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "seam_position": "aligned",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.42",
+    "internal_solid_infill_speed": "180",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "200",
+    "support_interface_speed": "80",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_speed": "200",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.8",
+    "travel_speed": "500",
+    "enable_prime_tower": "1",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "35",
+    "wall_generator": "classic",
+    "exclude_object": "1",
+    "wall_infill_order": "outer wall/inner wall/infill",
+    "compatible_printers": []
+}
\ No newline at end of file
diff --git a/resources/profiles/Afinia/process/fdm_process_common.json b/resources/profiles/Afinia/process/fdm_process_common.json
new file mode 100644
index 0000000000..2d65f5f50e
--- /dev/null
+++ b/resources/profiles/Afinia/process/fdm_process_common.json
@@ -0,0 +1,72 @@
+{
+    "type": "process",
+    "name": "fdm_process_common",
+    "from": "system",
+    "instantiation": "false",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "bridge_flow": "0.95",
+    "bridge_speed": "50",
+    "brim_width": "5",
+    "print_sequence": "by layer",
+    "default_acceleration": "10000",
+    "bridge_no_support": "0",
+    "elefant_foot_compensation": "0.1",
+    "outer_wall_line_width": "0.42",
+    "outer_wall_speed": "120",
+    "inner_wall_speed": "160",
+    "line_width": "0.45",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "crosshatch",
+    "initial_layer_line_width": "0.42",
+    "initial_layer_print_height": "0.2",
+    "initial_layer_speed": "50",
+    "initial_layer_infill_speed": "90",
+    "gap_infill_speed": "50",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.45",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "200",
+    "interface_shells": "0",
+    "detect_overhang_wall": "0",
+    "reduce_infill_retraction": "0",
+    "filename_format": "{input_filename_base}.gcode",
+    "wall_loops": "2",
+    "inner_wall_line_width": "0.45",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "nearest",
+    "skirt_distance": "2",
+    "skirt_height": "2",
+    "minimum_sparse_infill_area": "0",
+    "internal_solid_infill_line_width": "0.45",
+    "internal_solid_infill_speed": "180",
+    "spiral_mode": "0",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "support_filament": "0",
+    "support_line_width": "0.42",
+    "support_interface_filament": "0",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.15",
+    "support_interface_loop_pattern": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_spacing": "0",
+    "support_interface_speed": "80",
+    "support_interface_pattern": "auto",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2",
+    "support_speed": "200",
+    "support_threshold_angle": "40",
+    "support_object_xy_distance": "0.5",
+    "detect_thin_wall": "0",
+    "top_surface_line_width": "0.42",
+    "top_surface_speed": "120",
+    "travel_speed": "400",
+    "enable_prime_tower": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "compatible_printers": []
+}
\ No newline at end of file
diff --git a/resources/profiles/Tiertime.json b/resources/profiles/Tiertime.json
index cb07038908..c9bf2cccc8 100644
--- a/resources/profiles/Tiertime.json
+++ b/resources/profiles/Tiertime.json
@@ -1,20 +1,20 @@
 {
     "name": "Tiertime",
-    "version": "02.03.01.00",
+    "version": "02.03.01.01",
     "force_update": "0",
     "description": "Tiertime configurations",
     "machine_model_list": [
         {
-            "name": "Tiertime UP300 HS",
-            "sub_path": "machine/Tiertime UP300 HS.json"
+            "name": "Tiertime UP400 Pro",
+            "sub_path": "machine/Tiertime UP400 Pro.json"
         },
         {
             "name": "Tiertime UP310 Pro",
             "sub_path": "machine/Tiertime UP310 Pro.json"
         },
         {
-            "name": "Tiertime UP400 Pro",
-            "sub_path": "machine/Tiertime UP400 Pro.json"
+            "name": "Tiertime UP300 HS",
+            "sub_path": "machine/Tiertime UP300 HS.json"
         },
         {
             "name": "Tiertime UP600 HS",
@@ -31,44 +31,88 @@
             "sub_path": "process/fdm_process_tiertime_common.json"
         },
         {
-            "name": "0.12mm Fine @Tiertime UP310 Pro",
-            "sub_path": "process/0.12mm Fine @Tiertime UP310 Pro.json"
+            "name": "fdm_process_tiertime_HS_common",
+            "sub_path": "process/fdm_process_tiertime_HS_common.json"
         },
         {
             "name": "0.12mm Fine @Tiertime UP400 Pro",
             "sub_path": "process/0.12mm Fine @Tiertime UP400 Pro.json"
         },
-        {
-            "name": "0.16mm Optimal @Tiertime UP310 Pro",
-            "sub_path": "process/0.16mm Optimal @Tiertime UP310 Pro.json"
-        },
         {
             "name": "0.16mm Optimal @Tiertime UP400 Pro",
             "sub_path": "process/0.16mm Optimal @Tiertime UP400 Pro.json"
         },
-        {
-            "name": "0.20mm Standard @Tiertime UP310 Pro",
-            "sub_path": "process/0.20mm Standard @Tiertime UP310 Pro.json"
-        },
         {
             "name": "0.20mm Standard @Tiertime UP400 Pro",
             "sub_path": "process/0.20mm Standard @Tiertime UP400 Pro.json"
         },
-        {
-            "name": "0.24mm Draft @Tiertime UP310 Pro",
-            "sub_path": "process/0.24mm Draft @Tiertime UP310 Pro.json"
-        },
         {
             "name": "0.24mm Draft @Tiertime UP400 Pro",
             "sub_path": "process/0.24mm Draft @Tiertime UP400 Pro.json"
         },
+        {
+            "name": "0.28mm Extra Draft @Tiertime UP400 Pro",
+            "sub_path": "process/0.28mm Extra Draft @Tiertime UP400 Pro.json"
+        },
+        {
+            "name": "0.12mm Fine @Tiertime UP310 Pro",
+            "sub_path": "process/0.12mm Fine @Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "0.16mm Optimal @Tiertime UP310 Pro",
+            "sub_path": "process/0.16mm Optimal @Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "0.20mm Standard @Tiertime UP310 Pro",
+            "sub_path": "process/0.20mm Standard @Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "0.24mm Draft @Tiertime UP310 Pro",
+            "sub_path": "process/0.24mm Draft @Tiertime UP310 Pro.json"
+        },
         {
             "name": "0.28mm Extra Draft @Tiertime UP310 Pro",
             "sub_path": "process/0.28mm Extra Draft @Tiertime UP310 Pro.json"
         },
         {
-            "name": "0.28mm Extra Draft @Tiertime UP400 Pro",
-            "sub_path": "process/0.28mm Extra Draft @Tiertime UP400 Pro.json"
+            "name": "0.12mm Fine @Tiertime UP300 HS",
+            "sub_path": "process/0.12mm Fine @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.16mm Optimal @Tiertime UP300 HS",
+            "sub_path": "process/0.16mm Optimal @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.20mm Standard @Tiertime UP300 HS",
+            "sub_path": "process/0.20mm Standard @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.24mm Draft @Tiertime UP300 HS",
+            "sub_path": "process/0.24mm Draft @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.28mm Extra Draft @Tiertime UP300 HS",
+            "sub_path": "process/0.28mm Extra Draft @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.12mm Fine @Tiertime UP600 HS",
+            "sub_path": "process/0.12mm Fine @Tiertime UP600 HS.json"
+        },
+        {
+            "name": "0.16mm Optimal @Tiertime UP600 HS",
+            "sub_path": "process/0.16mm Optimal @Tiertime UP600 HS.json"
+        },
+        {
+            "name": "0.20mm Standard @Tiertime UP600 HS",
+            "sub_path": "process/0.20mm Standard @Tiertime UP600 HS.json"
+        },
+        {
+            "name": "0.24mm Draft @Tiertime UP600 HS",
+            "sub_path": "process/0.24mm Draft @Tiertime UP600 HS.json"
+        },
+        {
+            "name": "0.28mm Extra Draft @Tiertime UP600 HS",
+            "sub_path": "process/0.28mm Extra Draft @Tiertime UP600 HS.json"
         },
         {
             "name": "fdm_process_tiertime_0.18_nozzle_0.6",
@@ -78,30 +122,30 @@
             "name": "fdm_process_tiertime_0.24_nozzle_0.6",
             "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.6.json"
         },
-        {
-            "name": "fdm_process_tiertime_0.24_nozzle_0.8",
-            "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8.json"
-        },
         {
             "name": "fdm_process_tiertime_0.30_nozzle_0.6",
             "sub_path": "process/fdm_process_tiertime_0.30_nozzle_0.6.json"
         },
-        {
-            "name": "fdm_process_tiertime_0.32_nozzle_0.8",
-            "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8.json"
-        },
         {
             "name": "fdm_process_tiertime_0.36_nozzle_0.6",
             "sub_path": "process/fdm_process_tiertime_0.36_nozzle_0.6.json"
         },
-        {
-            "name": "fdm_process_tiertime_0.40_nozzle_0.8",
-            "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8.json"
-        },
         {
             "name": "fdm_process_tiertime_0.42_nozzle_0.6",
             "sub_path": "process/fdm_process_tiertime_0.42_nozzle_0.6.json"
         },
+        {
+            "name": "fdm_process_tiertime_0.24_nozzle_0.8",
+            "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8.json"
+        },
+        {
+            "name": "fdm_process_tiertime_0.32_nozzle_0.8",
+            "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8.json"
+        },
+        {
+            "name": "fdm_process_tiertime_0.40_nozzle_0.8",
+            "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8.json"
+        },
         {
             "name": "fdm_process_tiertime_0.48_nozzle_0.8",
             "sub_path": "process/fdm_process_tiertime_0.48_nozzle_0.8.json"
@@ -110,94 +154,6 @@
             "name": "fdm_process_tiertime_0.56_nozzle_0.8",
             "sub_path": "process/fdm_process_tiertime_0.56_nozzle_0.8.json"
         },
-        {
-            "name": "fdm_process_tiertime_HS_common",
-            "sub_path": "process/fdm_process_tiertime_HS_common.json"
-        },
-        {
-            "name": "0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle",
-            "sub_path": "process/0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle",
-            "sub_path": "process/0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle",
-            "sub_path": "process/0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle",
-            "sub_path": "process/0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle",
-            "sub_path": "process/0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle",
-            "sub_path": "process/0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle",
-            "sub_path": "process/0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle",
-            "sub_path": "process/0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle",
-            "sub_path": "process/0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle",
-            "sub_path": "process/0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle",
-            "sub_path": "process/0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.12mm Fine @Tiertime UP300 HS",
-            "sub_path": "process/0.12mm Fine @Tiertime UP300 HS.json"
-        },
-        {
-            "name": "0.12mm Fine @Tiertime UP600 HS",
-            "sub_path": "process/0.12mm Fine @Tiertime UP600 HS.json"
-        },
-        {
-            "name": "0.16mm Optimal @Tiertime UP300 HS",
-            "sub_path": "process/0.16mm Optimal @Tiertime UP300 HS.json"
-        },
-        {
-            "name": "0.16mm Optimal @Tiertime UP600 HS",
-            "sub_path": "process/0.16mm Optimal @Tiertime UP600 HS.json"
-        },
-        {
-            "name": "0.20mm Standard @Tiertime UP300 HS",
-            "sub_path": "process/0.20mm Standard @Tiertime UP300 HS.json"
-        },
-        {
-            "name": "0.20mm Standard @Tiertime UP600 HS",
-            "sub_path": "process/0.20mm Standard @Tiertime UP600 HS.json"
-        },
-        {
-            "name": "0.24mm Draft @Tiertime UP300 HS",
-            "sub_path": "process/0.24mm Draft @Tiertime UP300 HS.json"
-        },
-        {
-            "name": "0.24mm Draft @Tiertime UP600 HS",
-            "sub_path": "process/0.24mm Draft @Tiertime UP600 HS.json"
-        },
-        {
-            "name": "0.28mm Extra Draft @Tiertime UP300 HS",
-            "sub_path": "process/0.28mm Extra Draft @Tiertime UP300 HS.json"
-        },
-        {
-            "name": "0.28mm Extra Draft @Tiertime UP600 HS",
-            "sub_path": "process/0.28mm Extra Draft @Tiertime UP600 HS.json"
-        },
         {
             "name": "fdm_process_tiertime_0.18_nozzle_0.6_HS",
             "sub_path": "process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json"
@@ -206,30 +162,30 @@
             "name": "fdm_process_tiertime_0.24_nozzle_0.6_HS",
             "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json"
         },
-        {
-            "name": "fdm_process_tiertime_0.24_nozzle_0.8_HS",
-            "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json"
-        },
         {
             "name": "fdm_process_tiertime_0.30_nozzle_0.6_HS",
             "sub_path": "process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json"
         },
-        {
-            "name": "fdm_process_tiertime_0.32_nozzle_0.8_HS",
-            "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json"
-        },
         {
             "name": "fdm_process_tiertime_0.36_nozzle_0.6_HS",
             "sub_path": "process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json"
         },
-        {
-            "name": "fdm_process_tiertime_0.40_nozzle_0.8_HS",
-            "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json"
-        },
         {
             "name": "fdm_process_tiertime_0.42_nozzle_0.6_HS",
             "sub_path": "process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json"
         },
+        {
+            "name": "fdm_process_tiertime_0.24_nozzle_0.8_HS",
+            "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json"
+        },
+        {
+            "name": "fdm_process_tiertime_0.32_nozzle_0.8_HS",
+            "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json"
+        },
+        {
+            "name": "fdm_process_tiertime_0.40_nozzle_0.8_HS",
+            "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json"
+        },
         {
             "name": "fdm_process_tiertime_0.48_nozzle_0.8_HS",
             "sub_path": "process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json"
@@ -238,6 +194,30 @@
             "name": "fdm_process_tiertime_0.56_nozzle_0.8_HS",
             "sub_path": "process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json"
         },
+        {
+            "name": "0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle",
+            "sub_path": "process/0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle",
+            "sub_path": "process/0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle",
+            "sub_path": "process/0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle",
+            "sub_path": "process/0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle",
+            "sub_path": "process/0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle",
+            "sub_path": "process/0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle.json"
+        },
         {
             "name": "0.18mm Fine @Tiertime UP600 HS 0.6 nozzle",
             "sub_path": "process/0.18mm Fine @Tiertime UP600 HS 0.6 nozzle.json"
@@ -246,10 +226,6 @@
             "name": "0.24mm Standard @Tiertime UP600 HS 0.6 nozzle",
             "sub_path": "process/0.24mm Standard @Tiertime UP600 HS 0.6 nozzle.json"
         },
-        {
-            "name": "0.24mm Fine @Tiertime UP600 HS 0.8 nozzle",
-            "sub_path": "process/0.24mm Fine @Tiertime UP600 HS 0.8 nozzle.json"
-        },
         {
             "name": "0.30mm Standard @Tiertime UP600 HS 0.6 nozzle",
             "sub_path": "process/0.30mm Standard @Tiertime UP600 HS 0.6 nozzle.json"
@@ -258,22 +234,46 @@
             "name": "0.30mm Strength @Tiertime UP600 HS 0.6 nozzle",
             "sub_path": "process/0.30mm Strength @Tiertime UP600 HS 0.6 nozzle.json"
         },
-        {
-            "name": "0.32mm Standard @Tiertime UP600 HS 0.8 nozzle",
-            "sub_path": "process/0.32mm Standard @Tiertime UP600 HS 0.8 nozzle.json"
-        },
         {
             "name": "0.36mm Draft @Tiertime UP600 HS 0.6 nozzle",
             "sub_path": "process/0.36mm Draft @Tiertime UP600 HS 0.6 nozzle.json"
         },
-        {
-            "name": "0.40mm Standard @Tiertime UP600 HS 0.8 nozzle",
-            "sub_path": "process/0.40mm Standard @Tiertime UP600 HS 0.8 nozzle.json"
-        },
         {
             "name": "0.42mm Extra Draft @Tiertime UP600 HS 0.6 nozzle",
             "sub_path": "process/0.42mm Extra Draft @Tiertime UP600 HS 0.6 nozzle.json"
         },
+        {
+            "name": "0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle",
+            "sub_path": "process/0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle",
+            "sub_path": "process/0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle",
+            "sub_path": "process/0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle",
+            "sub_path": "process/0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle",
+            "sub_path": "process/0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.24mm Fine @Tiertime UP600 HS 0.8 nozzle",
+            "sub_path": "process/0.24mm Fine @Tiertime UP600 HS 0.8 nozzle.json"
+        },
+        {
+            "name": "0.32mm Standard @Tiertime UP600 HS 0.8 nozzle",
+            "sub_path": "process/0.32mm Standard @Tiertime UP600 HS 0.8 nozzle.json"
+        },
+        {
+            "name": "0.40mm Standard @Tiertime UP600 HS 0.8 nozzle",
+            "sub_path": "process/0.40mm Standard @Tiertime UP600 HS 0.8 nozzle.json"
+        },
         {
             "name": "0.48mm Draft @Tiertime UP600 HS 0.8 nozzle",
             "sub_path": "process/0.48mm Draft @Tiertime UP600 HS 0.8 nozzle.json"
@@ -288,29 +288,21 @@
             "name": "fdm_filament_common",
             "sub_path": "filament/fdm_filament_common.json"
         },
+        {
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
+        },
         {
             "name": "fdm_filament_abs",
             "sub_path": "filament/fdm_filament_abs.json"
         },
         {
-            "name": "fdm_filament_asa",
-            "sub_path": "filament/fdm_filament_asa.json"
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "fdm_filament_bvoh",
-            "sub_path": "filament/fdm_filament_bvoh.json"
-        },
-        {
-            "name": "fdm_filament_eva",
-            "sub_path": "filament/fdm_filament_eva.json"
-        },
-        {
-            "name": "fdm_filament_hips",
-            "sub_path": "filament/fdm_filament_hips.json"
-        },
-        {
-            "name": "fdm_filament_pa",
-            "sub_path": "filament/fdm_filament_pa.json"
+            "name": "fdm_filament_pet",
+            "sub_path": "filament/fdm_filament_pet.json"
         },
         {
             "name": "fdm_filament_pc",
@@ -321,164 +313,176 @@
             "sub_path": "filament/fdm_filament_pctg.json"
         },
         {
-            "name": "fdm_filament_pe",
-            "sub_path": "filament/fdm_filament_pe.json"
-        },
-        {
-            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_pet.json"
-        },
-        {
-            "name": "fdm_filament_pha",
-            "sub_path": "filament/fdm_filament_pha.json"
-        },
-        {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
-        },
-        {
-            "name": "fdm_filament_pp",
-            "sub_path": "filament/fdm_filament_pp.json"
-        },
-        {
-            "name": "fdm_filament_ppa",
-            "sub_path": "filament/fdm_filament_ppa.json"
-        },
-        {
-            "name": "fdm_filament_pps",
-            "sub_path": "filament/fdm_filament_pps.json"
+            "name": "fdm_filament_asa",
+            "sub_path": "filament/fdm_filament_asa.json"
         },
         {
             "name": "fdm_filament_pva",
             "sub_path": "filament/fdm_filament_pva.json"
         },
         {
-            "name": "fdm_filament_sbs",
-            "sub_path": "filament/fdm_filament_sbs.json"
+            "name": "fdm_filament_pa",
+            "sub_path": "filament/fdm_filament_pa.json"
         },
         {
-            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_tpu.json"
+            "name": "fdm_filament_hips",
+            "sub_path": "filament/fdm_filament_hips.json"
+        },
+        {
+            "name": "fdm_filament_pps",
+            "sub_path": "filament/fdm_filament_pps.json"
+        },
+        {
+            "name": "fdm_filament_ppa",
+            "sub_path": "filament/fdm_filament_ppa.json"
+        },
+        {
+            "name": "fdm_filament_pe",
+            "sub_path": "filament/fdm_filament_pe.json"
+        },
+        {
+            "name": "fdm_filament_pp",
+            "sub_path": "filament/fdm_filament_pp.json"
+        },
+        {
+            "name": "fdm_filament_eva",
+            "sub_path": "filament/fdm_filament_eva.json"
+        },
+        {
+            "name": "fdm_filament_pha",
+            "sub_path": "filament/fdm_filament_pha.json"
+        },
+        {
+            "name": "fdm_filament_bvoh",
+            "sub_path": "filament/fdm_filament_bvoh.json"
+        },
+        {
+          "name": "fdm_filament_sbs",
+          "sub_path": "filament/fdm_filament_sbs.json"
+        },
+        {
+            "name": "Tiertime PLA",
+            "sub_path": "filament/Tiertime PLA.json"
         },
         {
             "name": "Tiertime ABS",
             "sub_path": "filament/Tiertime ABS.json"
         },
-        {
-            "name": "Tiertime ABS@300HS",
-            "sub_path": "filament/Tiertime ABS@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic ABS",
-            "sub_path": "filament/Tiertime Generic ABS.json"
-        },
-        {
-            "name": "Tiertime Generic ABS@300HS",
-            "sub_path": "filament/Tiertime Generic ABS@300HS.json"
-        },
         {
             "name": "Tiertime ASA",
             "sub_path": "filament/Tiertime ASA.json"
         },
-        {
-            "name": "Tiertime ASA@300HS",
-            "sub_path": "filament/Tiertime ASA@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic ASA",
-            "sub_path": "filament/Tiertime Generic ASA.json"
-        },
-        {
-            "name": "Tiertime Generic ASA@300HS",
-            "sub_path": "filament/Tiertime Generic ASA@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic BVOH",
-            "sub_path": "filament/Tiertime Generic BVOH.json"
-        },
-        {
-            "name": "Tiertime Generic BVOH@300HS",
-            "sub_path": "filament/Tiertime Generic BVOH@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic EVA",
-            "sub_path": "filament/Tiertime Generic EVA.json"
-        },
-        {
-            "name": "Tiertime Generic EVA@300HS",
-            "sub_path": "filament/Tiertime Generic EVA@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic HIPS",
-            "sub_path": "filament/Tiertime Generic HIPS.json"
-        },
-        {
-            "name": "Tiertime Generic HIPS@300HS",
-            "sub_path": "filament/Tiertime Generic HIPS@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic PA",
-            "sub_path": "filament/Tiertime Generic PA.json"
-        },
-        {
-            "name": "Tiertime Generic PA-CF",
-            "sub_path": "filament/Tiertime Generic PA-CF.json"
-        },
-        {
-            "name": "Tiertime Generic PA-CF@300HS",
-            "sub_path": "filament/Tiertime Generic PA-CF@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic PA@300HS",
-            "sub_path": "filament/Tiertime Generic PA@300HS.json"
-        },
         {
             "name": "Tiertime PA6-CF",
             "sub_path": "filament/Tiertime PA6-CF.json"
         },
-        {
-            "name": "Tiertime PA6-CF@300HS",
-            "sub_path": "filament/Tiertime PA6-CF@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic PC",
-            "sub_path": "filament/Tiertime Generic PC.json"
-        },
-        {
-            "name": "Tiertime Generic PC@300HS",
-            "sub_path": "filament/Tiertime Generic PC@300HS.json"
-        },
         {
             "name": "Tiertime PC",
             "sub_path": "filament/Tiertime PC.json"
         },
+        {
+            "name": "Tiertime PET-CF",
+            "sub_path": "filament/Tiertime PET-CF.json"
+        },
+        {
+            "name": "Tiertime PETG",
+            "sub_path": "filament/Tiertime PETG.json"
+        },
+        {
+            "name": "Tiertime PLA-CF",
+            "sub_path": "filament/Tiertime PLA-CF.json"
+        },
+        {
+            "name": "Tiertime PVA",
+            "sub_path": "filament/Tiertime PVA.json"
+        },
+        {
+            "name": "Tiertime TPU 95A",
+            "sub_path": "filament/Tiertime TPU 95A.json"
+        },
+        {
+            "name": "Tiertime PLA@300HS",
+            "sub_path": "filament/Tiertime PLA@300HS.json"
+        },
+        {
+            "name": "Tiertime ABS@300HS",
+            "sub_path": "filament/Tiertime ABS@300HS.json"
+        },
+        {
+            "name": "Tiertime ASA@300HS",
+            "sub_path": "filament/Tiertime ASA@300HS.json"
+        },
+        {
+            "name": "Tiertime PA6-CF@300HS",
+            "sub_path": "filament/Tiertime PA6-CF@300HS.json"
+        },
         {
             "name": "Tiertime PC@300HS",
             "sub_path": "filament/Tiertime PC@300HS.json"
         },
+        {
+            "name": "Tiertime PET-CF@300HS",
+            "sub_path": "filament/Tiertime PET-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime PETG@300HS",
+            "sub_path": "filament/Tiertime PETG@300HS.json"
+        },
+        {
+            "name": "Tiertime PLA-CF@300HS",
+            "sub_path": "filament/Tiertime PLA-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime PVA@300HS",
+            "sub_path": "filament/Tiertime PVA@300HS.json"
+        },
+        {
+            "name": "Tiertime TPU 95A@300HS",
+            "sub_path": "filament/Tiertime TPU 95A@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic ABS",
+            "sub_path": "filament/Tiertime Generic ABS.json"
+        },
+        {
+            "name": "Tiertime Generic ASA",
+            "sub_path": "filament/Tiertime Generic ASA.json"
+        },
+        {
+            "name": "Tiertime Generic BVOH",
+            "sub_path": "filament/Tiertime Generic BVOH.json"
+        },
+        {
+            "name": "Tiertime Generic EVA",
+            "sub_path": "filament/Tiertime Generic EVA.json"
+        },
+        {
+            "name": "Tiertime Generic HIPS",
+            "sub_path": "filament/Tiertime Generic HIPS.json"
+        },
+        {
+            "name": "Tiertime Generic PA-CF",
+            "sub_path": "filament/Tiertime Generic PA-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PA",
+            "sub_path": "filament/Tiertime Generic PA.json"
+        },
+        {
+            "name": "Tiertime Generic PC",
+            "sub_path": "filament/Tiertime Generic PC.json"
+        },
         {
             "name": "Tiertime Generic PCTG",
             "sub_path": "filament/Tiertime Generic PCTG.json"
         },
-        {
-            "name": "Tiertime Generic PCTG@300HS",
-            "sub_path": "filament/Tiertime Generic PCTG@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic PE",
-            "sub_path": "filament/Tiertime Generic PE.json"
-        },
         {
             "name": "Tiertime Generic PE-CF",
             "sub_path": "filament/Tiertime Generic PE-CF.json"
         },
         {
-            "name": "Tiertime Generic PE-CF@300HS",
-            "sub_path": "filament/Tiertime Generic PE-CF@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic PE@300HS",
-            "sub_path": "filament/Tiertime Generic PE@300HS.json"
+            "name": "Tiertime Generic PE",
+            "sub_path": "filament/Tiertime Generic PE.json"
         },
         {
             "name": "Tiertime Generic PETG",
@@ -488,62 +492,131 @@
             "name": "Tiertime Generic PETG-CF",
             "sub_path": "filament/Tiertime Generic PETG-CF.json"
         },
-        {
-            "name": "Tiertime Generic PETG-CF@300HS",
-            "sub_path": "filament/Tiertime Generic PETG-CF@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic PETG@300HS",
-            "sub_path": "filament/Tiertime Generic PETG@300HS.json"
-        },
-        {
-            "name": "Tiertime PET-CF",
-            "sub_path": "filament/Tiertime PET-CF.json"
-        },
-        {
-            "name": "Tiertime PET-CF@300HS",
-            "sub_path": "filament/Tiertime PET-CF@300HS.json"
-        },
-        {
-            "name": "Tiertime PETG",
-            "sub_path": "filament/Tiertime PETG.json"
-        },
-        {
-            "name": "Tiertime PETG@300HS",
-            "sub_path": "filament/Tiertime PETG@300HS.json"
-        },
         {
             "name": "Tiertime Generic PHA",
             "sub_path": "filament/Tiertime Generic PHA.json"
         },
-        {
-            "name": "Tiertime Generic PHA@300HS",
-            "sub_path": "filament/Tiertime Generic PHA@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic PLA",
-            "sub_path": "filament/Tiertime Generic PLA.json"
-        },
         {
             "name": "Tiertime Generic PLA High Speed",
             "sub_path": "filament/Tiertime Generic PLA High Speed.json"
         },
-        {
-            "name": "Tiertime Generic PLA High Speed@300HS",
-            "sub_path": "filament/Tiertime Generic PLA High Speed@300HS.json"
-        },
         {
             "name": "Tiertime Generic PLA Silk",
             "sub_path": "filament/Tiertime Generic PLA Silk.json"
         },
-        {
-            "name": "Tiertime Generic PLA Silk@300HS",
-            "sub_path": "filament/Tiertime Generic PLA Silk@300HS.json"
-        },
         {
             "name": "Tiertime Generic PLA-CF",
             "sub_path": "filament/Tiertime Generic PLA-CF.json"
         },
+        {
+            "name": "Tiertime Generic PLA",
+            "sub_path": "filament/Tiertime Generic PLA.json"
+        },
+        {
+            "name": "Tiertime Generic PP-CF",
+            "sub_path": "filament/Tiertime Generic PP-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PP-GF",
+            "sub_path": "filament/Tiertime Generic PP-GF.json"
+        },
+        {
+            "name": "Tiertime Generic PP",
+            "sub_path": "filament/Tiertime Generic PP.json"
+        },
+        {
+            "name": "Tiertime Generic PPA-CF",
+            "sub_path": "filament/Tiertime Generic PPA-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PPA-GF",
+            "sub_path": "filament/Tiertime Generic PPA-GF.json"
+        },
+        {
+            "name": "Tiertime Generic PPS-CF",
+            "sub_path": "filament/Tiertime Generic PPS-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PPS",
+            "sub_path": "filament/Tiertime Generic PPS.json"
+        },
+        {
+            "name": "Tiertime Generic PVA",
+            "sub_path": "filament/Tiertime Generic PVA.json"
+        },
+        {
+            "name": "Tiertime Generic SBS",
+            "sub_path": "filament/Tiertime Generic SBS.json"
+        }
+        ,
+        {
+            "name": "Tiertime Generic TPU",
+            "sub_path": "filament/Tiertime Generic TPU.json"
+        },
+        {
+            "name": "Tiertime Generic ABS@300HS",
+            "sub_path": "filament/Tiertime Generic ABS@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic ASA@300HS",
+            "sub_path": "filament/Tiertime Generic ASA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic BVOH@300HS",
+            "sub_path": "filament/Tiertime Generic BVOH@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic EVA@300HS",
+            "sub_path": "filament/Tiertime Generic EVA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic HIPS@300HS",
+            "sub_path": "filament/Tiertime Generic HIPS@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PA-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PA-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PA@300HS",
+            "sub_path": "filament/Tiertime Generic PA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PC@300HS",
+            "sub_path": "filament/Tiertime Generic PC@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PCTG@300HS",
+            "sub_path": "filament/Tiertime Generic PCTG@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PE-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PE-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PE@300HS",
+            "sub_path": "filament/Tiertime Generic PE@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PETG@300HS",
+            "sub_path": "filament/Tiertime Generic PETG@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PETG-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PETG-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PHA@300HS",
+            "sub_path": "filament/Tiertime Generic PHA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PLA High Speed@300HS",
+            "sub_path": "filament/Tiertime Generic PLA High Speed@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PLA Silk@300HS",
+            "sub_path": "filament/Tiertime Generic PLA Silk@300HS.json"
+        },
         {
             "name": "Tiertime Generic PLA-CF@300HS",
             "sub_path": "filament/Tiertime Generic PLA-CF@300HS.json"
@@ -552,38 +625,10 @@
             "name": "Tiertime Generic PLA@300HS",
             "sub_path": "filament/Tiertime Generic PLA@300HS.json"
         },
-        {
-            "name": "Tiertime PLA",
-            "sub_path": "filament/Tiertime PLA.json"
-        },
-        {
-            "name": "Tiertime PLA-CF",
-            "sub_path": "filament/Tiertime PLA-CF.json"
-        },
-        {
-            "name": "Tiertime PLA-CF@300HS",
-            "sub_path": "filament/Tiertime PLA-CF@300HS.json"
-        },
-        {
-            "name": "Tiertime PLA@300HS",
-            "sub_path": "filament/Tiertime PLA@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic PP",
-            "sub_path": "filament/Tiertime Generic PP.json"
-        },
-        {
-            "name": "Tiertime Generic PP-CF",
-            "sub_path": "filament/Tiertime Generic PP-CF.json"
-        },
         {
             "name": "Tiertime Generic PP-CF@300HS",
             "sub_path": "filament/Tiertime Generic PP-CF@300HS.json"
         },
-        {
-            "name": "Tiertime Generic PP-GF",
-            "sub_path": "filament/Tiertime Generic PP-GF.json"
-        },
         {
             "name": "Tiertime Generic PP-GF@300HS",
             "sub_path": "filament/Tiertime Generic PP-GF@300HS.json"
@@ -592,30 +637,14 @@
             "name": "Tiertime Generic PP@300HS",
             "sub_path": "filament/Tiertime Generic PP@300HS.json"
         },
-        {
-            "name": "Tiertime Generic PPA-CF",
-            "sub_path": "filament/Tiertime Generic PPA-CF.json"
-        },
         {
             "name": "Tiertime Generic PPA-CF@300HS",
             "sub_path": "filament/Tiertime Generic PPA-CF@300HS.json"
         },
-        {
-            "name": "Tiertime Generic PPA-GF",
-            "sub_path": "filament/Tiertime Generic PPA-GF.json"
-        },
         {
             "name": "Tiertime Generic PPA-GF@300HS",
             "sub_path": "filament/Tiertime Generic PPA-GF@300HS.json"
         },
-        {
-            "name": "Tiertime Generic PPS",
-            "sub_path": "filament/Tiertime Generic PPS.json"
-        },
-        {
-            "name": "Tiertime Generic PPS-CF",
-            "sub_path": "filament/Tiertime Generic PPS-CF.json"
-        },
         {
             "name": "Tiertime Generic PPS-CF@300HS",
             "sub_path": "filament/Tiertime Generic PPS-CF@300HS.json"
@@ -624,45 +653,18 @@
             "name": "Tiertime Generic PPS@300HS",
             "sub_path": "filament/Tiertime Generic PPS@300HS.json"
         },
-        {
-            "name": "Tiertime Generic PVA",
-            "sub_path": "filament/Tiertime Generic PVA.json"
-        },
         {
             "name": "Tiertime Generic PVA@300HS",
             "sub_path": "filament/Tiertime Generic PVA@300HS.json"
         },
-        {
-            "name": "Tiertime PVA",
-            "sub_path": "filament/Tiertime PVA.json"
-        },
-        {
-            "name": "Tiertime PVA@300HS",
-            "sub_path": "filament/Tiertime PVA@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic SBS",
-            "sub_path": "filament/Tiertime Generic SBS.json"
-        },
         {
             "name": "Tiertime Generic SBS@300HS",
             "sub_path": "filament/Tiertime Generic SBS@300HS.json"
-        },
-        {
-            "name": "Tiertime Generic TPU",
-            "sub_path": "filament/Tiertime Generic TPU.json"
-        },
+        }
+        ,
         {
             "name": "Tiertime Generic TPU@300HS",
             "sub_path": "filament/Tiertime Generic TPU@300HS.json"
-        },
-        {
-            "name": "Tiertime TPU 95A",
-            "sub_path": "filament/Tiertime TPU 95A.json"
-        },
-        {
-            "name": "Tiertime TPU 95A@300HS",
-            "sub_path": "filament/Tiertime TPU 95A@300HS.json"
         }
     ],
     "machine_list": [
@@ -675,16 +677,16 @@
             "sub_path": "machine/fdm_tiertime_common.json"
         },
         {
-            "name": "Tiertime UP300 HS 0.4 nozzle",
-            "sub_path": "machine/Tiertime UP300 HS 0.4 nozzle.json"
+            "name": "Tiertime UP400 Pro 0.4 nozzle",
+            "sub_path": "machine/Tiertime UP400 Pro 0.4 nozzle.json"
         },
         {
             "name": "Tiertime UP310 Pro 0.4 nozzle",
             "sub_path": "machine/Tiertime UP310 Pro 0.4 nozzle.json"
         },
         {
-            "name": "Tiertime UP400 Pro 0.4 nozzle",
-            "sub_path": "machine/Tiertime UP400 Pro 0.4 nozzle.json"
+            "name": "Tiertime UP300 HS 0.4 nozzle",
+            "sub_path": "machine/Tiertime UP300 HS 0.4 nozzle.json"
         },
         {
             "name": "Tiertime UP600 HS 0.4 nozzle",
@@ -707,4 +709,4 @@
             "sub_path": "machine/Tiertime UP600 HS 0.8 nozzle.json"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS.json b/resources/profiles/Tiertime/filament/Tiertime ABS.json
index 0d1f7453ee..70b94c9aa7 100644
--- a/resources/profiles/Tiertime/filament/Tiertime ABS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime ABS.json	
@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Tiertime ABS",
-    "inherits": "fdm_filament_abs",
-    "from": "system",
-    "setting_id": "GFSB00",
     "filament_id": "GFB00",
+    "setting_id": "GFSB00",
+    "name": "Tiertime ABS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_abs",
     "filament_flow_ratio": [
         "0.95"
     ],
@@ -30,4 +30,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json
index a9a29e2591..fb743e6bff 100644
--- a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json	
@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Tiertime ABS@300HS",
-    "inherits": "fdm_filament_abs",
-    "from": "system",
-    "setting_id": "GFSB00",
     "filament_id": "GFB00_01",
+    "setting_id": "GFSB00",
+    "name": "Tiertime ABS@300HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_abs",
     "filament_flow_ratio": [
         "0.95"
     ],
@@ -30,4 +30,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime ASA.json b/resources/profiles/Tiertime/filament/Tiertime ASA.json
index e483aba7d2..ae29f1ed8e 100644
--- a/resources/profiles/Tiertime/filament/Tiertime ASA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime ASA.json	
@@ -41,4 +41,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json
index 092151f031..f238c443c4 100644
--- a/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json	
@@ -41,4 +41,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json
index c0b16c6d4a..f01903df40 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json	
@@ -35,4 +35,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json
index 463e8e8d37..7b4eb78abe 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json	
@@ -35,4 +35,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json b/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json
index e1f4a66477..41f3ab6f7d 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json	
@@ -29,4 +29,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json
index 9b9aeb188b..5a616e10ff 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json	
@@ -29,4 +29,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json
index 3fd96b3326..b3193bce62 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json	
@@ -11,4 +11,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json
index c04269f3b8..9937ba29b9 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json	
@@ -11,4 +11,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json b/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json
index 375ac412af..86b3c4b7e4 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json	
@@ -89,4 +89,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json
index 87a30d57b1..a7b6895227 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json	
@@ -89,4 +89,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json
index 79625ac208..30e66d1c20 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json	
@@ -14,4 +14,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json
index 744206b3bc..a47793a81a 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json	
@@ -14,4 +14,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json
index c5215c816a..2ca188ada0 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json	
@@ -3,8 +3,8 @@
     "name": "Tiertime Generic PA-CF",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "setting_id": "GFSN99",
     "filament_id": "GFN98",
+    "setting_id": "GFSN99",
     "instantiation": "true",
     "fan_cooling_layer_time": [
         "5"
@@ -36,4 +36,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json
index 558399b876..cd43e74d13 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json	
@@ -3,8 +3,8 @@
     "name": "Tiertime Generic PA-CF@300HS",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "setting_id": "GFSN99",
     "filament_id": "GFN98_02",
+    "setting_id": "GFSN99",
     "instantiation": "true",
     "fan_cooling_layer_time": [
         "5"
@@ -36,4 +36,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA.json
index 20f1b1cd45..3b73d30ef6 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA.json	
@@ -3,8 +3,8 @@
     "name": "Tiertime Generic PA",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "setting_id": "GFSN98",
     "filament_id": "GFN99",
+    "setting_id": "GFSN98",
     "instantiation": "true",
     "chamber_temperatures": [
         "60"
@@ -54,4 +54,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json
index 83195885de..139f935a58 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json	
@@ -3,8 +3,8 @@
     "name": "Tiertime Generic PA@300HS",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "setting_id": "GFSN98",
     "filament_id": "GFN99_01",
+    "setting_id": "GFSN98",
     "instantiation": "true",
     "chamber_temperatures": [
         "60"
@@ -54,4 +54,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json b/resources/profiles/Tiertime/filament/Tiertime Generic PC.json
index c44ac1ce53..28a4b501a3 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PC.json	
@@ -17,4 +17,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json
index 6b99e8c28b..7249c99ff8 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json	
@@ -17,4 +17,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json
index be670f1234..a4ebf5fb4f 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json	
@@ -77,4 +77,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json
index f4668b0e90..f5c6a5492f 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json	
@@ -77,4 +77,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json
index a1f9c363b3..291aba7a9c 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json	
@@ -41,4 +41,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json
index e328e6d2cf..cb3ab02dce 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json	
@@ -41,4 +41,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE.json
index 5a2912f7a0..ecc9fd25e0 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE.json	
@@ -38,4 +38,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json
index 0edd1dcde0..7f685e648f 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json	
@@ -38,4 +38,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json
index 2e6c956c3e..e0e164f4f7 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json	
@@ -83,4 +83,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json
index 16af90a8ea..31173b9ded 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json	
@@ -83,4 +83,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json
index 2ffe424260..2032234129 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json	
@@ -68,4 +68,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json
index 4f278cb47b..6cd353ffa1 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json	
@@ -68,4 +68,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json
index e224f44dd8..1d5a367141 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json	
@@ -11,4 +11,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json
index 5498471a7f..e1a25d2df5 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json	
@@ -11,4 +11,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json
index 54652180a6..fac65fd7c6 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json	
@@ -20,4 +20,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json
index 6ca59aa567..ce33779722 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json	
@@ -20,4 +20,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json
index d08d8bad3f..28a68d3fec 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json	
@@ -26,4 +26,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json
index 52aafebe1b..1f162fc058 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json	
@@ -26,4 +26,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json
index d2a296d932..99532b4f11 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json	
@@ -56,4 +56,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json
index acb3477896..dd3e9f5985 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json	
@@ -56,4 +56,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json
index d6b048de43..222385001e 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json	
@@ -20,4 +20,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json
index f5ec4c2930..ada01e9059 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json	
@@ -20,4 +20,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json
index 74c54d5226..ed6cb19d75 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json	
@@ -23,4 +23,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json
index c85e1d364e..aa5f757db4 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json	
@@ -23,4 +23,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json
index e096bded4f..954b8fcb72 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json	
@@ -23,4 +23,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json
index 74e8c9148e..0867a0f2f1 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json	
@@ -23,4 +23,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP.json
index 5cf5251643..21a2be9083 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP.json	
@@ -11,4 +11,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json
index d8a7d01582..edb94271d3 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json	
@@ -11,4 +11,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json
index 6457434cb8..1230f920c2 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json	
@@ -23,4 +23,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json
index c182a49c40..3e27e9b7ee 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json	
@@ -23,4 +23,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json
index 1cff829916..43a767c865 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json	
@@ -17,4 +17,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json
index 786241f02a..dc83f5bdae 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json	
@@ -17,4 +17,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json
index a6a54ff66d..cc406f7537 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json	
@@ -32,4 +32,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json
index 44912355fa..70db00a4b1 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json	
@@ -32,4 +32,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json
index 38faa40d78..83240e1929 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json	
@@ -11,4 +11,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json
index b1474b2420..f3ef115c75 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json	
@@ -11,4 +11,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json
index 82c8766013..c551a1ccc8 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json	
@@ -23,4 +23,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json
index d2c6d51ed5..7d8828d15d 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json	
@@ -23,4 +23,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json
index ec346ed02b..f3d348eb08 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json	
@@ -20,4 +20,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json
index dd9dfbe305..cc6aea2af0 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json	
@@ -20,4 +20,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json b/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json
index be7234c2aa..0fa7680147 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json	
@@ -3,8 +3,8 @@
     "name": "Tiertime Generic TPU",
     "inherits": "fdm_filament_tpu",
     "from": "system",
-    "setting_id": "GFSR99",
     "filament_id": "GFU99",
+    "setting_id": "GFSR99",
     "instantiation": "true",
     "filament_max_volumetric_speed": [
         "3.2"
@@ -18,4 +18,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif} \n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json
index 1caff87b0c..ab95bc93e0 100644
--- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json	
@@ -3,8 +3,8 @@
     "name": "Tiertime Generic TPU@300HS",
     "inherits": "fdm_filament_tpu",
     "from": "system",
-    "setting_id": "GFSR99",
     "filament_id": "GFU99_01",
+    "setting_id": "GFSR99",
     "instantiation": "true",
     "filament_max_volumetric_speed": [
         "3.2"
@@ -18,4 +18,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif} \n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json b/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json
index 9b292fda34..8e43b34eb5 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json	
@@ -50,4 +50,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json
index cd05cca583..3212fd312f 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json	
@@ -45,9 +45,9 @@
         "170"
     ],
     "compatible_printers": [
-        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP300 HS 0.4 nozzle", 
         "Tiertime UP600 HS 0.4 nozzle",
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PC.json b/resources/profiles/Tiertime/filament/Tiertime PC.json
index edb08356c1..9fa8363812 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PC.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PC.json	
@@ -26,4 +26,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json
index 6d3d7a8bad..cf6557da45 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json	
@@ -26,4 +26,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PET-CF.json b/resources/profiles/Tiertime/filament/Tiertime PET-CF.json
index 47fcb26213..a6bfd29226 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PET-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PET-CF.json	
@@ -95,4 +95,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json
index 774075b1c1..0109e4d32e 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json	
@@ -95,4 +95,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PETG.json b/resources/profiles/Tiertime/filament/Tiertime PETG.json
index 14a7bddfb6..01de631e60 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PETG.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PETG.json	
@@ -83,4 +83,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json
index a16922700a..a4c1ffb7b7 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json	
@@ -83,4 +83,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json b/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json
index 8434f34187..09c2d5e179 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json	
@@ -59,4 +59,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json
index 705abe102c..d56dd450b4 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json	
@@ -59,4 +59,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA.json b/resources/profiles/Tiertime/filament/Tiertime PLA.json
index 9089f32246..04621989ea 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PLA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PLA.json	
@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Tiertime PLA",
-    "inherits": "fdm_filament_pla",
-    "from": "system",
-    "setting_id": "GFSA00",
     "filament_id": "GFA00",
+    "setting_id": "GFSA00",
+    "name": "Tiertime PLA",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_pla",
     "filament_cost": [
         "24.99"
     ],
@@ -33,4 +33,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json
index 70d6cfbb42..20361a44d3 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json	
@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Tiertime PLA@300HS",
-    "inherits": "fdm_filament_pla",
-    "from": "system",
-    "setting_id": "GFSA00",
     "filament_id": "GFA00_01",
+    "setting_id": "GFSA00",
+    "name": "Tiertime PLA@300HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_pla",
     "filament_cost": [
         "24.99"
     ],
@@ -33,4 +33,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PVA.json b/resources/profiles/Tiertime/filament/Tiertime PVA.json
index 05d4f33fe2..33bc46167e 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PVA.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PVA.json	
@@ -41,4 +41,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json
index c62e163d35..46a6cddee7 100644
--- a/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json	
@@ -41,4 +41,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json b/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json
index 7ec3883348..aa8ae677e8 100644
--- a/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json	
@@ -26,4 +26,4 @@
         "Tiertime UP400 Pro 0.8 nozzle",
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json b/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json
index 884fede020..717c794ade 100644
--- a/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json	
+++ b/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json	
@@ -26,4 +26,4 @@
         "Tiertime UP600 HS 0.6 nozzle",
         "Tiertime UP600 HS 0.8 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_abs.json b/resources/profiles/Tiertime/filament/fdm_filament_abs.json
index e870d17029..50dc3facf1 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_abs.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_abs.json
@@ -79,4 +79,4 @@
     "textured_plate_temp_initial_layer": [
         "90"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_asa.json b/resources/profiles/Tiertime/filament/fdm_filament_asa.json
index a0da767a75..62d3faef09 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_asa.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_asa.json
@@ -79,4 +79,4 @@
     "textured_plate_temp_initial_layer": [
         "90"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json b/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json
index 2b481e35d8..6431a87bd2 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json
@@ -82,4 +82,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_common.json b/resources/profiles/Tiertime/filament/fdm_filament_common.json
index 8ee05fd399..3fb3a8da5e 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_common.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_common.json
@@ -163,4 +163,4 @@
     "filament_end_gcode": [
         "; filament end gcode \n;M106 P3 S0\n"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_eva.json b/resources/profiles/Tiertime/filament/fdm_filament_eva.json
index 1b2efe2999..3ce2b1844e 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_eva.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_eva.json
@@ -7,4 +7,4 @@
     "filament_type": [
         "EVA"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_hips.json b/resources/profiles/Tiertime/filament/fdm_filament_hips.json
index 4d1b09d37a..50ee869f2c 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_hips.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_hips.json
@@ -76,4 +76,4 @@
     "additional_cooling_fan_speed": [
         "0"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pa.json b/resources/profiles/Tiertime/filament/fdm_filament_pa.json
index 1cd78ec77f..06ddafc639 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pa.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pa.json
@@ -79,4 +79,4 @@
     "textured_plate_temp_initial_layer": [
         "100"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pc.json b/resources/profiles/Tiertime/filament/fdm_filament_pc.json
index 03bc9e5663..6ffb3ad9ff 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pc.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pc.json
@@ -79,4 +79,4 @@
     "textured_plate_temp_initial_layer": [
         "110"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pctg.json b/resources/profiles/Tiertime/filament/fdm_filament_pctg.json
index f31c08b83b..70b72a506b 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pctg.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pctg.json
@@ -1,64 +1,64 @@
 {
-    "type": "filament",
-    "name": "fdm_filament_pctg",
-    "inherits": "fdm_filament_common",
-    "from": "system",
-    "instantiation": "false",
-    "eng_plate_temp": [
-        "0"
-    ],
-    "eng_plate_temp_initial_layer": [
-        "0"
-    ],
-    "fan_cooling_layer_time": [
-        "20"
-    ],
-    "fan_min_speed": [
-        "20"
-    ],
-    "filament_cost": [
-        "30"
-    ],
-    "filament_density": [
-        "1.27"
-    ],
-    "filament_max_volumetric_speed": [
-        "25"
-    ],
-    "filament_type": [
-        "PCTG"
-    ],
-    "hot_plate_temp": [
-        "80"
-    ],
-    "hot_plate_temp_initial_layer": [
-        "80"
-    ],
-    "nozzle_temperature": [
-        "255"
-    ],
-    "nozzle_temperature_initial_layer": [
-        "255"
-    ],
-    "nozzle_temperature_range_high": [
-        "260"
-    ],
-    "nozzle_temperature_range_low": [
-        "220"
-    ],
-    "reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "temperature_vitrification": [
-        "70"
-    ],
-    "textured_plate_temp": [
-        "80"
-    ],
-    "textured_plate_temp_initial_layer": [
-        "80"
-    ],
-    "filament_start_gcode": [
-        "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
-    ]
-}
\ No newline at end of file
+  "type": "filament",
+  "name": "fdm_filament_pctg",
+  "inherits": "fdm_filament_common",
+  "from": "system",
+  "instantiation": "false",
+  "eng_plate_temp": [
+      "0"
+  ],
+  "eng_plate_temp_initial_layer": [
+      "0"
+  ],
+  "fan_cooling_layer_time": [
+      "20"
+  ],
+  "fan_min_speed": [
+      "20"
+  ],
+  "filament_cost": [
+      "30"
+  ],
+  "filament_density": [
+      "1.27"
+  ],
+  "filament_max_volumetric_speed": [
+      "25"
+  ],
+  "filament_type": [
+      "PCTG"
+  ],
+  "hot_plate_temp": [
+      "80"
+  ],
+  "hot_plate_temp_initial_layer": [
+      "80"
+  ],
+  "nozzle_temperature": [
+      "255"
+  ],
+  "nozzle_temperature_initial_layer": [
+      "255"
+  ],
+  "nozzle_temperature_range_high": [
+      "260"
+  ],
+  "nozzle_temperature_range_low": [
+      "220"
+  ],
+  "reduce_fan_stop_start_freq": [
+      "1"
+  ],
+  "temperature_vitrification": [
+      "70"
+  ],
+  "textured_plate_temp": [
+      "80"
+  ],
+  "textured_plate_temp_initial_layer": [
+      "80"
+  ],
+  "filament_start_gcode": [
+      "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+  ]
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pe.json b/resources/profiles/Tiertime/filament/fdm_filament_pe.json
index 8ce20df68a..5c18673ae8 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pe.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pe.json
@@ -82,4 +82,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pet.json b/resources/profiles/Tiertime/filament/fdm_filament_pet.json
index 4a5f6085ca..d563dd7cc4 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pet.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pet.json
@@ -61,4 +61,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pha.json b/resources/profiles/Tiertime/filament/fdm_filament_pha.json
index 82519f1b2e..a51be2dcf7 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pha.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pha.json
@@ -82,4 +82,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pla.json b/resources/profiles/Tiertime/filament/fdm_filament_pla.json
index ca4425056d..349acbdcc5 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pla.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pla.json
@@ -79,4 +79,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n;{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n;{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n;{endif}\n\n;{if activate_air_filtration[current_extruder] && support_air_filtration}\n;M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n;{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pp.json b/resources/profiles/Tiertime/filament/fdm_filament_pp.json
index 83a4278250..cc4e584569 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pp.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pp.json
@@ -82,4 +82,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_ppa.json b/resources/profiles/Tiertime/filament/fdm_filament_ppa.json
index f2ea53d315..74159abeb5 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_ppa.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_ppa.json
@@ -85,4 +85,4 @@
     "textured_plate_temp_initial_layer": [
         "100"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pps.json b/resources/profiles/Tiertime/filament/fdm_filament_pps.json
index a3f104b6f3..881609b890 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pps.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pps.json
@@ -76,4 +76,4 @@
     "textured_plate_temp_initial_layer": [
         "110"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pva.json b/resources/profiles/Tiertime/filament/fdm_filament_pva.json
index 7d0bdf1b4a..4ef2acf185 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_pva.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_pva.json
@@ -88,4 +88,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_sbs.json b/resources/profiles/Tiertime/filament/fdm_filament_sbs.json
index e7cd5788de..5f9bdb4d2f 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_sbs.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_sbs.json
@@ -11,7 +11,7 @@
         "23"
     ],
     "filament_type": [
-        "SBS"
+      "SBS"
     ],
     "filament_density": [
         "1.02"
@@ -82,4 +82,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/filament/fdm_filament_tpu.json b/resources/profiles/Tiertime/filament/fdm_filament_tpu.json
index 461f76f202..1914ac3029 100644
--- a/resources/profiles/Tiertime/filament/fdm_filament_tpu.json
+++ b/resources/profiles/Tiertime/filament/fdm_filament_tpu.json
@@ -76,4 +76,4 @@
     "filament_start_gcode": [
         "; filament start gcode\n{if  (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json
index be6f8e1644..f719989ecf 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "machine",
-    "name": "Tiertime UP300 HS 0.4 nozzle",
-    "inherits": "fdm_tiertime_common",
-    "from": "system",
     "setting_id": "GM001",
+    "name": "Tiertime UP300 HS 0.4 nozzle",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_tiertime_common",
     "printer_model": "Tiertime UP300 HS",
     "nozzle_diameter": [
         "0.4"
@@ -16,5 +16,6 @@
         "207x255",
         "0x255"
     ],
+
     "printable_height": "230"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json b/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json
index 3e5cae8859..0434ec601d 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json	
@@ -9,4 +9,4 @@
     "bed_texture": "",
     "hotend_model": "",
     "default_materials": "Tiertime ABS;Tiertime PLA"
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json
index ea8ec79657..9824250597 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "machine",
-    "name": "Tiertime UP310 Pro 0.4 nozzle",
-    "inherits": "fdm_tiertime_common",
-    "from": "system",
     "setting_id": "GM001",
+    "name": "Tiertime UP310 Pro 0.4 nozzle",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_tiertime_common",
     "printer_model": "Tiertime UP310 Pro",
     "nozzle_diameter": [
         "0.4"
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json
index 4dbe0b1806..1f528a5619 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json	
@@ -9,4 +9,4 @@
     "bed_texture": "",
     "hotend_model": "",
     "default_materials": "Tiertime ABS;Tiertime PLA"
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json
index ffe0c54e80..d64c6d7215 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "machine",
-    "name": "Tiertime UP400 Pro 0.4 nozzle",
-    "inherits": "fdm_tiertime_common",
-    "from": "system",
     "setting_id": "GM001",
+    "name": "Tiertime UP400 Pro 0.4 nozzle",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_tiertime_common",
     "printer_model": "Tiertime UP400 Pro",
     "nozzle_diameter": [
         "0.4"
@@ -16,5 +16,6 @@
         "400x350",
         "0x350"
     ],
+
     "printable_height": "380"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json
index a64e7d9fc7..a9b5f873b5 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "machine",
-    "name": "Tiertime UP400 Pro 0.6 nozzle",
-    "inherits": "Tiertime UP400 Pro 0.4 nozzle",
-    "from": "system",
     "setting_id": "GM007",
+    "name": "Tiertime UP400 Pro 0.6 nozzle",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "Tiertime UP400 Pro 0.4 nozzle",
     "printer_model": "Tiertime UP400 Pro",
     "nozzle_diameter": [
         "0.6"
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json
index 2f860276a7..0210838f37 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "machine",
-    "name": "Tiertime UP400 Pro 0.8 nozzle",
-    "inherits": "Tiertime UP400 Pro 0.4 nozzle",
-    "from": "system",
     "setting_id": "GM008",
+    "name": "Tiertime UP400 Pro 0.8 nozzle",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "Tiertime UP400 Pro 0.4 nozzle",
     "printer_model": "Tiertime UP400 Pro",
     "nozzle_diameter": [
         "0.8"
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json
index 1cfcbfef5f..74d5686112 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json	
@@ -9,4 +9,4 @@
     "bed_texture": "",
     "hotend_model": "",
     "default_materials": "Tiertime ABS;Tiertime PLA"
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json
index 5f93151cf0..a1444ca656 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "machine",
-    "name": "Tiertime UP600 HS 0.4 nozzle",
-    "inherits": "fdm_tiertime_common",
-    "from": "system",
     "setting_id": "GM006",
+    "name": "Tiertime UP600 HS 0.4 nozzle",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_tiertime_common",
     "printer_model": "Tiertime UP600 HS",
     "nozzle_diameter": [
         "0.4"
@@ -16,5 +16,6 @@
         "500x400",
         "0x400"
     ],
+
     "printable_height": "600"
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json
index f1fd8db2c1..d9099fc198 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "machine",
-    "name": "Tiertime UP600 HS 0.6 nozzle",
-    "inherits": "Tiertime UP600 HS 0.4 nozzle",
-    "from": "system",
     "setting_id": "GM009",
+    "name": "Tiertime UP600 HS 0.6 nozzle",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "Tiertime UP600 HS 0.4 nozzle",
     "printer_model": "Tiertime UP600 HS",
     "nozzle_diameter": [
         "0.6"
diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json
index ea3d0a7751..3c855e3a3b 100644
--- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json	
+++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "machine",
-    "name": "Tiertime UP600 HS 0.8 nozzle",
-    "inherits": "Tiertime UP600 HS 0.4 nozzle",
-    "from": "system",
     "setting_id": "GM010",
+    "name": "Tiertime UP600 HS 0.8 nozzle",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "Tiertime UP600 HS 0.4 nozzle",
     "printer_model": "Tiertime UP600 HS",
     "nozzle_diameter": [
         "0.8"
diff --git a/resources/profiles/Tiertime/machine/fdm_machine_common.json b/resources/profiles/Tiertime/machine/fdm_machine_common.json
index 01be62eb16..5785f57b19 100644
--- a/resources/profiles/Tiertime/machine/fdm_machine_common.json
+++ b/resources/profiles/Tiertime/machine/fdm_machine_common.json
@@ -116,4 +116,4 @@
     "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
     "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
     "machine_pause_gcode": "M601"
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/machine/fdm_tiertime_common.json b/resources/profiles/Tiertime/machine/fdm_tiertime_common.json
index 7a25ceb3c0..55f8ddc4d0 100644
--- a/resources/profiles/Tiertime/machine/fdm_tiertime_common.json
+++ b/resources/profiles/Tiertime/machine/fdm_tiertime_common.json
@@ -1,141 +1,60 @@
 {
-    "type": "machine",
-    "name": "fdm_tiertime_common",
-    "inherits": "fdm_machine_common",
-    "from": "system",
-    "instantiation": "false",
-    "gcode_flavor": "klipper",
-    "machine_max_acceleration_e": [
-        "5000",
-        "5000"
-    ],
-    "machine_max_acceleration_extruding": [
-        "20000",
-        "20000"
-    ],
-    "machine_max_acceleration_retracting": [
-        "5000",
-        "5000"
-    ],
-    "machine_max_acceleration_travel": [
-        "20000",
-        "20000"
-    ],
-    "machine_max_acceleration_x": [
-        "20000",
-        "20000"
-    ],
-    "machine_max_acceleration_y": [
-        "20000",
-        "20000"
-    ],
-    "machine_max_acceleration_z": [
-        "500",
-        "200"
-    ],
-    "machine_max_speed_e": [
-        "25",
-        "25"
-    ],
-    "machine_max_speed_x": [
-        "500",
-        "200"
-    ],
-    "machine_max_speed_y": [
-        "500",
-        "200"
-    ],
-    "machine_max_speed_z": [
-        "12",
-        "12"
-    ],
-    "machine_max_jerk_e": [
-        "2.5",
-        "2.5"
-    ],
-    "machine_max_jerk_x": [
-        "9",
-        "9"
-    ],
-    "machine_max_jerk_y": [
-        "9",
-        "9"
-    ],
-    "machine_max_jerk_z": [
-        "0.2",
-        "0.4"
-    ],
-    "machine_min_extruding_rate": [
-        "0",
-        "0"
-    ],
-    "machine_min_travel_rate": [
-        "0",
-        "0"
-    ],
-    "max_layer_height": [
-        "0.32"
-    ],
-    "min_layer_height": [
-        "0.08"
-    ],
-    "printable_height": "250",
-    "extruder_clearance_radius": "65",
-    "extruder_clearance_height_to_rod": "36",
-    "extruder_clearance_height_to_lid": "140",
-    "printer_settings_id": "",
-    "printer_technology": "FFF",
-    "printer_variant": "0.4",
-    "retraction_minimum_travel": [
-        "1"
-    ],
-    "retract_before_wipe": [
-        "70%"
-    ],
-    "retract_when_changing_layer": [
-        "1"
-    ],
-    "retraction_length": [
-        "0.8"
-    ],
-    "retract_length_toolchange": [
-        "2"
-    ],
-    "z_hop": [
-        "0.4"
-    ],
-    "retract_restart_extra": [
-        "0"
-    ],
-    "retract_restart_extra_toolchange": [
-        "0"
-    ],
-    "retraction_speed": [
-        "30"
-    ],
-    "deretraction_speed": [
-        "30"
-    ],
-    "z_hop_types": "Normal Lift",
-    "silent_mode": "0",
-    "single_extruder_multi_material": "1",
-    "change_filament_gcode": "",
-    "wipe": [
-        "1"
-    ],
-    "default_filament_profile": [
-        ""
-    ],
-    "default_print_profile": "0.20mm Standard @Tiertime UP400 Pro",
-    "bed_exclude_area": [
-        "0x0"
-    ],
-    "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n",
-    "machine_end_gcode": "PRINT_END",
-    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
-    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
-    "machine_pause_gcode": "PAUSE",
-    "scan_first_layer": "0",
-    "nozzle_type": "undefine",
-    "auxiliary_fan": "0"
-}
\ No newline at end of file
+  "type": "machine",
+  "name": "fdm_tiertime_common",
+  "from": "system",
+  "instantiation": "false",
+  "inherits": "fdm_machine_common",
+  "gcode_flavor": "klipper",
+  "machine_max_acceleration_e": ["5000", "5000"],
+  "machine_max_acceleration_extruding": ["20000", "20000"],
+  "machine_max_acceleration_retracting": ["5000", "5000"],
+  "machine_max_acceleration_travel": ["20000", "20000"],
+  "machine_max_acceleration_x": ["20000", "20000"],
+  "machine_max_acceleration_y": ["20000", "20000"],
+  "machine_max_acceleration_z": ["500", "200"],
+  "machine_max_speed_e": ["25", "25"],
+  "machine_max_speed_x": ["500", "200"],
+  "machine_max_speed_y": ["500", "200"],
+  "machine_max_speed_z": ["12", "12"],
+  "machine_max_jerk_e": ["2.5", "2.5"],
+  "machine_max_jerk_x": ["9", "9"],
+  "machine_max_jerk_y": ["9", "9"],
+  "machine_max_jerk_z": ["0.2", "0.4"],
+  "machine_min_extruding_rate": ["0", "0"],
+  "machine_min_travel_rate": ["0", "0"],
+  "max_layer_height": ["0.32"],
+  "min_layer_height": ["0.08"],
+  "printable_height": "250",
+  "extruder_clearance_radius": "65",
+  "extruder_clearance_height_to_rod": "36",
+  "extruder_clearance_height_to_lid": "140",
+  "printer_settings_id": "",
+  "printer_technology": "FFF",
+  "printer_variant": "0.4",
+  "retraction_minimum_travel": ["1"],
+  "retract_before_wipe": ["70%"],
+  "retract_when_changing_layer": ["1"],
+  "retraction_length": ["0.8"],
+  "retract_length_toolchange": ["2"],
+  "z_hop": ["0.4"],
+  "retract_restart_extra": ["0"],
+  "retract_restart_extra_toolchange": ["0"],
+  "retraction_speed": ["30"],
+  "deretraction_speed": ["30"],
+  "z_hop_types": "Normal Lift",
+  "silent_mode": "0",
+  "single_extruder_multi_material": "1",
+  "change_filament_gcode": "",
+  "wipe": ["1"],
+  "default_filament_profile": [""],
+  "default_print_profile": "0.20mm Standard @Tiertime UP400 Pro",
+  "bed_exclude_area": ["0x0"],
+  "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n",
+  "machine_end_gcode": "PRINT_END",
+  "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
+  "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+  "machine_pause_gcode": "PAUSE",
+  "scan_first_layer": "0",
+  "nozzle_type": "undefine",
+  "auxiliary_fan": "0"
+}
diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json
index 326af9a794..0b28527515 100644
--- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json	
+++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.12mm Fine @Tiertime UP300 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.12mm Fine @Tiertime UP300 HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_HS_common",
     "layer_height": "0.12",
     "bottom_shell_layers": "5",
     "elefant_foot_compensation": "0.15",
diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json
index a4e64fe16c..3010fb6621 100644
--- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.12mm Fine @Tiertime UP310 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.12mm Fine @Tiertime UP310 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.12",
     "bottom_shell_layers": "5",
     "elefant_foot_compensation": "0.15",
diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json
index ce4402d958..7f816d75e1 100644
--- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.12mm Fine @Tiertime UP400 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.12mm Fine @Tiertime UP400 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.12",
     "bottom_shell_layers": "5",
     "elefant_foot_compensation": "0.15",
diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json
index 550d745f45..648f276690 100644
--- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json	
+++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.12mm Fine @Tiertime UP600 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP026",
+    "name": "0.12mm Fine @Tiertime UP600 HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_HS_common",
     "layer_height": "0.12",
     "elefant_foot_compensation": "0.15",
     "bottom_shell_layers": "5",
@@ -27,4 +27,4 @@
     "compatible_printers": [
         "Tiertime UP600 HS 0.4 nozzle"
     ]
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json
index 5ae46e69eb..d1cb291fe3 100644
--- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json	
+++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.16mm Optimal @Tiertime UP300 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.16mm Optimal @Tiertime UP300 HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_HS_common",
     "layer_height": "0.16",
     "elefant_foot_compensation": "0.15",
     "bottom_shell_layers": "4",
diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json
index 71f3a2c18d..1ba9ce59de 100644
--- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.16mm Optimal @Tiertime UP310 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.16mm Optimal @Tiertime UP310 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.16",
     "elefant_foot_compensation": "0.15",
     "bottom_shell_layers": "4",
diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json
index 69be2579fc..2ed7fee647 100644
--- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.16mm Optimal @Tiertime UP400 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.16mm Optimal @Tiertime UP400 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.16",
     "elefant_foot_compensation": "0.15",
     "bottom_shell_layers": "4",
@@ -27,4 +27,4 @@
     "compatible_printers": [
         "Tiertime UP400 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json
index 7e882d8673..871a8026d0 100644
--- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json	
+++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.16mm Optimal @Tiertime UP600 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP025",
+    "name": "0.16mm Optimal @Tiertime UP600 HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_HS_common",
     "layer_height": "0.16",
     "elefant_foot_compensation": "0.15",
     "bottom_shell_layers": "4",
@@ -27,4 +27,4 @@
     "compatible_printers": [
         "Tiertime UP600 HS 0.4 nozzle"
     ]
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json
index 70321a808e..c0eda5e055 100644
--- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json	
+++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json	
@@ -1,9 +1,9 @@
 {
     "type": "process",
-    "name": "0.20mm Standard @Tiertime UP300 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.20mm Standard @Tiertime UP300 HS",
+    "from": "system",
+    "inherits": "fdm_process_tiertime_HS_common",
     "instantiation": "true",
     "elefant_foot_compensation": "0.15",
     "top_shell_thickness": "1.0",
@@ -19,4 +19,4 @@
     "compatible_printers": [
         "Tiertime UP300 HS 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json
index 9c9b5b045b..75b76f4af9 100644
--- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json	
@@ -1,9 +1,9 @@
 {
     "type": "process",
-    "name": "0.20mm Standard @Tiertime UP310 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.20mm Standard @Tiertime UP310 Pro",
+    "from": "system",
+    "inherits": "fdm_process_tiertime_common",
     "instantiation": "true",
     "elefant_foot_compensation": "0.15",
     "top_shell_thickness": "1.0",
@@ -19,4 +19,4 @@
     "compatible_printers": [
         "Tiertime UP310 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json
index ef3e54e73c..03983e92b6 100644
--- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.20mm Standard @Tiertime UP400 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP001",
+    "name": "0.20mm Standard @Tiertime UP400 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.2",
     "initial_layer_speed": "50",
     "initial_layer_infill_speed": "105",
@@ -17,4 +17,4 @@
     "compatible_printers": [
         "Tiertime UP400 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json
index 4c6211ac25..6c91083e77 100644
--- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json	
+++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json	
@@ -1,9 +1,9 @@
 {
     "type": "process",
-    "name": "0.20mm Standard @Tiertime UP600 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP024",
+    "name": "0.20mm Standard @Tiertime UP600 HS",
+    "from": "system",
+    "inherits": "fdm_process_tiertime_HS_common",
     "instantiation": "true",
     "elefant_foot_compensation": "0.15",
     "top_shell_thickness": "1.0",
@@ -19,4 +19,4 @@
     "compatible_printers": [
         "Tiertime UP600 HS 0.4 nozzle"
     ]
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json
index 01a55cee4e..aff711e457 100644
--- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json	
+++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.24mm Draft @Tiertime UP300 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.24mm Draft @Tiertime UP300 HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_HS_common",
     "layer_height": "0.24",
     "elefant_foot_compensation": "0.15",
     "top_surface_line_width": "0.45",
diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json
index 5d62a10904..e18ab49b6f 100644
--- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.24mm Draft @Tiertime UP310 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.24mm Draft @Tiertime UP310 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.24",
     "elefant_foot_compensation": "0.15",
     "top_surface_line_width": "0.45",
diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json
index 3b26042dc7..b871e7fca2 100644
--- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.24mm Draft @Tiertime UP400 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.24mm Draft @Tiertime UP400 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.24",
     "elefant_foot_compensation": "0.15",
     "top_surface_line_width": "0.45",
@@ -22,4 +22,4 @@
     "compatible_printers": [
         "Tiertime UP400 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json
index 74f9ccc3d3..42a539e1da 100644
--- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json	
+++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.24mm Draft @Tiertime UP600 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP027",
+    "name": "0.24mm Draft @Tiertime UP600 HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_HS_common",
     "layer_height": "0.24",
     "elefant_foot_compensation": "0.15",
     "bottom_shell_layers": "3",
@@ -27,4 +27,4 @@
     "compatible_printers": [
         "Tiertime UP600 HS 0.4 nozzle"
     ]
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json
index 01bcedb5db..55bf4aecd5 100644
--- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json	
+++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.28mm Extra Draft @Tiertime UP300 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.28mm Extra Draft @Tiertime UP300 HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_HS_common",
     "layer_height": "0.28",
     "elefant_foot_compensation": "0.15",
     "top_surface_line_width": "0.45",
diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json
index 69170d2057..e583827013 100644
--- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.28mm Extra Draft @Tiertime UP310 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.28mm Extra Draft @Tiertime UP310 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.28",
     "elefant_foot_compensation": "0.15",
     "top_surface_line_width": "0.45",
diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json
index 459e27b9ba..0d1f98665b 100644
--- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json	
+++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.28mm Extra Draft @Tiertime UP400 Pro",
-    "inherits": "fdm_process_tiertime_common",
-    "from": "system",
     "setting_id": "GP004",
+    "name": "0.28mm Extra Draft @Tiertime UP400 Pro",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_common",
     "layer_height": "0.28",
     "elefant_foot_compensation": "0.15",
     "top_surface_line_width": "0.45",
@@ -22,4 +22,4 @@
     "compatible_printers": [
         "Tiertime UP400 Pro 0.4 nozzle"
     ]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json
index 46c6a5fb50..a0bd17c20b 100644
--- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json	
+++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json	
@@ -1,10 +1,10 @@
 {
     "type": "process",
-    "name": "0.28mm Extra Draft @Tiertime UP600 HS",
-    "inherits": "fdm_process_tiertime_HS_common",
-    "from": "system",
     "setting_id": "GP028",
+    "name": "0.28mm Extra Draft @Tiertime UP600 HS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_process_tiertime_HS_common",
     "layer_height": "0.28",
     "elefant_foot_compensation": "0.15",
     "bottom_shell_layers": "3",
@@ -27,4 +27,4 @@
     "compatible_printers": [
         "Tiertime UP600 HS 0.4 nozzle"
     ]
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json
index 13961dd979..8e7f118a94 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "120",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json
index 1eb3a4491f..6512606b9e 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "120",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json
index 9ceb2da962..256b2e3124 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "130",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json
index cc947e167d..a4049ab8f0 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "130",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json
index e9ffae1651..ac2c993a6d 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "120",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "20"
+    "overhang_3_4_speed": "20",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json
index b704c6ad40..415ee1bf21 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "120",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "20"
+    "overhang_3_4_speed": "20",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json
index 2def5b7b96..86aa4ec504 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "150",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json
index 5f2bf52824..dd8522a52c 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "150",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json
index 2417c30e35..b3c7020260 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json
@@ -23,5 +23,6 @@
     "top_surface_speed": "140",
     "bridge_speed": "30",
     "overhang_3_4_speed": "20",
-    "overhang_4_4_speed": "5"
+    "overhang_4_4_speed": "5",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json
index 7badd7801c..296d8f7338 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json
@@ -23,5 +23,6 @@
     "top_surface_speed": "140",
     "bridge_speed": "30",
     "overhang_3_4_speed": "20",
-    "overhang_4_4_speed": "5"
+    "overhang_4_4_speed": "5",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json
index 85788f980c..641a49b777 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "140",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json
index dde41c32d2..57bfafa56a 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "140",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json
index 68349a763c..6755c7569c 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json
@@ -23,5 +23,6 @@
     "top_surface_speed": "150",
     "bridge_speed": "30",
     "overhang_3_4_speed": "25",
-    "overhang_4_4_speed": "5"
+    "overhang_4_4_speed": "5",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json
index 289483483b..159c20878c 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json
@@ -23,5 +23,6 @@
     "top_surface_speed": "150",
     "bridge_speed": "30",
     "overhang_3_4_speed": "25",
-    "overhang_4_4_speed": "5"
+    "overhang_4_4_speed": "5",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json
index 969968a6bf..884975e49c 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "130",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json
index c12e5c1cf8..419ff22f46 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json
@@ -21,5 +21,6 @@
     "sparse_infill_speed": "100",
     "top_surface_speed": "130",
     "bridge_speed": "30",
-    "overhang_3_4_speed": "15"
+    "overhang_3_4_speed": "15",
+    "tree_support_tip_diameter": "1.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json
index 05a58aaa18..265c418baf 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json
@@ -23,5 +23,6 @@
     "top_surface_speed": "140",
     "bridge_speed": "30",
     "overhang_3_4_speed": "25",
-    "overhang_4_4_speed": "5"
+    "overhang_4_4_speed": "5",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json
index 6ffa082868..f444321ccd 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json
@@ -23,5 +23,6 @@
     "top_surface_speed": "140",
     "bridge_speed": "30",
     "overhang_3_4_speed": "25",
-    "overhang_4_4_speed": "5"
+    "overhang_4_4_speed": "5",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json
index 33125e016a..398a51f122 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json
@@ -23,5 +23,6 @@
     "top_surface_speed": "130",
     "bridge_speed": "30",
     "overhang_3_4_speed": "25",
-    "overhang_4_4_speed": "5"
+    "overhang_4_4_speed": "5",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json
index 3ce5cc331d..99d3ac7b7e 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json
@@ -23,5 +23,6 @@
     "top_surface_speed": "130",
     "bridge_speed": "30",
     "overhang_3_4_speed": "25",
-    "overhang_4_4_speed": "5"
+    "overhang_4_4_speed": "5",
+    "tree_support_tip_diameter": "2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json
index deaf9a5bd7..d15757f153 100644
--- a/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json
+++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json
@@ -20,7 +20,6 @@
     "inner_wall_acceleration": "5000",
     "top_surface_acceleration": "2000",
     "initial_layer_acceleration": "500",
-    "wall_infill_order": "outer wall/inner wall/infill",
     "line_width": "0.42",
     "internal_bridge_support_thickness": "0.8",
     "initial_layer_line_width": "0.5",
@@ -75,5 +74,6 @@
     "prime_tower_width": "35",
     "wall_generator": "classic",
     "exclude_object": "1",
+    "wall_infill_order": "outer wall/inner wall/infill",
     "compatible_printers": []
 }
\ No newline at end of file