diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json
index 9f84a8eb78..3a8f620a4a 100644
--- a/resources/profiles/Qidi.json
+++ b/resources/profiles/Qidi.json
@@ -575,8 +575,11 @@
         {
             "name": "Qidi Generic TPU",
             "sub_path": "filament/Qidi Generic TPU.json"
+        },
+        {
+            "name": "QIDI ABS-GF10",
+            "sub_path": "filament/QIDI ABS-GF10.json"
         }
-
     ],
     "machine_list": [
         {
diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10.json
new file mode 100644
index 0000000000..9a85b0da85
--- /dev/null
+++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10.json	
@@ -0,0 +1,24 @@
+{
+    "type": "filament",
+    "filament_id": "GFB99",
+    "setting_id": "GFSA04",
+    "name": "QIDI ABS-GF10",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "QIDI ABS-GF25",
+        "filament_flow_ratio": [
+            "0.94"
+        ],
+        "filament_max_volumetric_speed": [
+            "14"
+        ],
+        "nozzle_temperature": [
+            "280"
+        ],
+        "nozzle_temperature_range_high": [
+            "280"
+        ],
+        "pressure_advance": [
+            "0.02"
+        ]
+}
diff --git a/resources/profiles/Qidi/process/0.36mm Standard @Qidi XPlus3 0.6 nozzle.json b/resources/profiles/Qidi/process/0.36mm Standard @Qidi XPlus3 0.6 nozzle.json
index 0b4c1b1bde..3242750466 100644
--- a/resources/profiles/Qidi/process/0.36mm Standard @Qidi XPlus3 0.6 nozzle.json	
+++ b/resources/profiles/Qidi/process/0.36mm Standard @Qidi XPlus3 0.6 nozzle.json	
@@ -8,5 +8,4 @@
   "compatible_printers": [
     "Qidi X-Plus 3 0.6 nozzle"
   ]
-}
-s
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron.json b/resources/profiles/Voron.json
index 7fa1c56822..2aa2c2594d 100644
--- a/resources/profiles/Voron.json
+++ b/resources/profiles/Voron.json
@@ -46,10 +46,18 @@
             "name": "fdm_process_voron_common",
             "sub_path": "process/fdm_process_voron_common.json"
         },
+        {
+            "name": "fdm_process_voron_common_0_1_5",
+            "sub_path": "process/fdm_process_voron_common_0_1_5.json"
+        },
         {
             "name": "fdm_process_voron_common_0_2",
             "sub_path": "process/fdm_process_voron_common_0_2.json"
         },
+        {
+            "name": "fdm_process_voron_common_0_2_5",
+            "sub_path": "process/fdm_process_voron_common_0_2_5.json"
+        },
         {
             "name": "fdm_process_voron_common_0_6",
             "sub_path": "process/fdm_process_voron_common_0_6.json"
@@ -58,10 +66,26 @@
             "name": "fdm_process_voron_common_0_8",
             "sub_path": "process/fdm_process_voron_common_0_8.json"
         },
+        {
+            "name": "fdm_process_voron_common_1_0",
+            "sub_path": "process/fdm_process_voron_common_1_0.json"
+        },
+        {
+            "name": "0.05mm Fine 0.15 nozzle @Voron",
+            "sub_path": "process/0.05mm Fine 0.15 nozzle @Voron.json"
+        },
         {
             "name": "0.06mm Fine 0.2 nozzle @Voron",
             "sub_path": "process/0.06mm Fine 0.2 nozzle @Voron.json"
         },
+        {
+            "name": "0.06mm Fine 0.25 nozzle @Voron",
+            "sub_path": "process/0.06mm Fine 0.25 nozzle @Voron.json"
+        },
+        {
+            "name": "0.07mm Optimal 0.15 nozzle @Voron",
+            "sub_path": "process/0.07mm Optimal 0.15 nozzle @Voron.json"
+        },
         {
             "name": "0.08mm Extra Fine @Voron",
             "sub_path": "process/0.08mm Extra Fine @Voron.json"
@@ -70,22 +94,46 @@
             "name": "0.08mm Optimal 0.2 nozzle @Voron",
             "sub_path": "process/0.08mm Optimal 0.2 nozzle @Voron.json"
         },
+        {
+            "name": "0.08mm Optimal 0.25 nozzle @Voron",
+            "sub_path": "process/0.08mm Optimal 0.25 nozzle @Voron.json"
+        },
+        {
+            "name": "0.09mm Standard 0.15 nozzle @Voron",
+            "sub_path": "process/0.09mm Standard 0.15 nozzle @Voron.json"
+        },
         {
             "name": "0.10mm Standard 0.2 nozzle @Voron",
             "sub_path": "process/0.10mm Standard 0.2 nozzle @Voron.json"
         },
+        {
+            "name": "0.10mm Standard 0.25 nozzle @Voron",
+            "sub_path": "process/0.10mm Standard 0.25 nozzle @Voron.json"
+        },
         {
             "name": "0.12mm Fine @Voron",
             "sub_path": "process/0.12mm Fine @Voron.json"
         },
+        {
+            "name": "0.12mm Draft 0.15 nozzle @Voron",
+            "sub_path": "process/0.12mm Draft 0.15 nozzle @Voron.json"
+        },
         {
             "name": "0.12mm Draft 0.2 nozzle @Voron",
             "sub_path": "process/0.12mm Draft 0.2 nozzle @Voron.json"
         },
+        {
+            "name": "0.12mm Draft 0.25 nozzle @Voron",
+            "sub_path": "process/0.12mm Draft 0.25 nozzle @Voron.json"
+        },
         {
             "name": "0.14mm Extra Draft 0.2 nozzle @Voron",
             "sub_path": "process/0.14mm Extra Draft 0.2 nozzle @Voron.json"
         },
+        {
+            "name": "0.14mm Extra Draft 0.25 nozzle @Voron",
+            "sub_path": "process/0.14mm Extra Draft 0.25 nozzle @Voron.json"
+        },
         {
             "name": "0.15mm Optimal @Voron",
             "sub_path": "process/0.15mm Optimal @Voron.json"
@@ -118,6 +166,10 @@
             "name": "0.30mm Standard 0.6 nozzle @Voron",
             "sub_path": "process/0.30mm Standard 0.6 nozzle @Voron.json"
         },
+        {
+            "name": "0.30mm Fine 1.0 nozzle @Voron",
+            "sub_path": "process/0.30mm Fine 1.0 nozzle @Voron.json"
+        },
         {
             "name": "0.32mm Optimal 0.6 nozzle @Voron",
             "sub_path": "process/0.32mm Optimal 0.6 nozzle @Voron.json"
@@ -138,9 +190,21 @@
             "name": "0.48mm Draft 0.8 nozzle @Voron",
             "sub_path": "process/0.48mm Draft 0.8 nozzle @Voron.json"
         },
+        {
+            "name": "0.50mm Standard 1.0 nozzle @Voron",
+            "sub_path": "process/0.50mm Standard 1.0 nozzle @Voron.json"
+        },
         {
             "name": "0.56mm Extra Draft 0.8 nozzle @Voron",
             "sub_path": "process/0.56mm Extra Draft 0.8 nozzle @Voron.json"
+        },
+        {
+            "name": "0.60mm Draft 1.0 nozzle @Voron",
+            "sub_path": "process/0.60mm Draft 1.0 nozzle @Voron.json"
+        },
+        {
+            "name": "0.80mm Extra Draft 1.0 nozzle @Voron",
+            "sub_path": "process/0.80mm Extra Draft 1.0 nozzle @Voron.json"
         }
     ],
     "filament_list": [
@@ -234,10 +298,18 @@
             "name": "Voron 2.4 250 0.4 nozzle",
             "sub_path": "machine/Voron 2.4 250 0.4 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 250 0.15 nozzle",
+            "sub_path": "machine/Voron 2.4 250 0.15 nozzle.json"
+        },
         {
             "name": "Voron 2.4 250 0.2 nozzle",
             "sub_path": "machine/Voron 2.4 250 0.2 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 250 0.25 nozzle",
+            "sub_path": "machine/Voron 2.4 250 0.25 nozzle.json"
+        },
         {
             "name": "Voron 2.4 250 0.6 nozzle",
             "sub_path": "machine/Voron 2.4 250 0.6 nozzle.json"
@@ -246,14 +318,26 @@
             "name": "Voron 2.4 250 0.8 nozzle",
             "sub_path": "machine/Voron 2.4 250 0.8 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 250 1.0 nozzle",
+            "sub_path": "machine/Voron 2.4 250 1.0 nozzle.json"
+        },
         {
             "name": "Voron 2.4 300 0.4 nozzle",
             "sub_path": "machine/Voron 2.4 300 0.4 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 300 0.15 nozzle",
+            "sub_path": "machine/Voron 2.4 300 0.15 nozzle.json"
+        },
         {
             "name": "Voron 2.4 300 0.2 nozzle",
             "sub_path": "machine/Voron 2.4 300 0.2 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 300 0.25 nozzle",
+            "sub_path": "machine/Voron 2.4 300 0.25 nozzle.json"
+        },
         {
             "name": "Voron 2.4 300 0.6 nozzle",
             "sub_path": "machine/Voron 2.4 300 0.6 nozzle.json"
@@ -262,14 +346,26 @@
             "name": "Voron 2.4 300 0.8 nozzle",
             "sub_path": "machine/Voron 2.4 300 0.8 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 300 1.0 nozzle",
+            "sub_path": "machine/Voron 2.4 300 1.0 nozzle.json"
+        },
         {
             "name": "Voron 2.4 350 0.4 nozzle",
             "sub_path": "machine/Voron 2.4 350 0.4 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 350 0.15 nozzle",
+            "sub_path": "machine/Voron 2.4 350 0.15 nozzle.json"
+        },
         {
             "name": "Voron 2.4 350 0.2 nozzle",
             "sub_path": "machine/Voron 2.4 350 0.2 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 350 0.25 nozzle",
+            "sub_path": "machine/Voron 2.4 350 0.25 nozzle.json"
+        },
         {
             "name": "Voron 2.4 350 0.6 nozzle",
             "sub_path": "machine/Voron 2.4 350 0.6 nozzle.json"
@@ -278,6 +374,10 @@
             "name": "Voron 2.4 350 0.8 nozzle",
             "sub_path": "machine/Voron 2.4 350 0.8 nozzle.json"
         },
+        {
+            "name": "Voron 2.4 350 1.0 nozzle",
+            "sub_path": "machine/Voron 2.4 350 1.0 nozzle.json"
+        },
         {
             "name": "Voron Trident 250 0.4 nozzle",
             "sub_path": "machine/Voron Trident 250 0.4 nozzle.json"
diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Voron Generic ABS.json
index b30a308f62..5d308f5bc5 100644
--- a/resources/profiles/Voron/filament/Voron Generic ABS.json	
+++ b/resources/profiles/Voron/filament/Voron Generic ABS.json	
@@ -14,17 +14,26 @@
     ],
     "compatible_printers": [
       "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
       "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
       "Voron 2.4 250 0.6 nozzle",
       "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
       "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
       "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
       "Voron 2.4 300 0.6 nozzle",
       "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
       "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
       "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
       "Voron 2.4 350 0.6 nozzle",
       "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
       "Voron Trident 250 0.4 nozzle",
       "Voron Trident 300 0.4 nozzle",
       "Voron Trident 350 0.4 nozzle",
diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Voron Generic ASA.json
index 8e8c29b778..fcc3af4a86 100644
--- a/resources/profiles/Voron/filament/Voron Generic ASA.json	
+++ b/resources/profiles/Voron/filament/Voron Generic ASA.json	
@@ -13,21 +13,30 @@
         "12"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
     }
diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json
index a1e50004e6..6e9f90de45 100644
--- a/resources/profiles/Voron/filament/Voron Generic PA-CF.json	
+++ b/resources/profiles/Voron/filament/Voron Generic PA-CF.json	
@@ -19,21 +19,30 @@
         "8"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
   }
diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Voron Generic PA.json
index ec0b77f907..9366885c62 100644
--- a/resources/profiles/Voron/filament/Voron Generic PA.json	
+++ b/resources/profiles/Voron/filament/Voron Generic PA.json	
@@ -16,21 +16,30 @@
         "12"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
   }
diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json
index e5b849644f..19c8cec0d5 100644
--- a/resources/profiles/Voron/filament/Voron Generic PC.json	
+++ b/resources/profiles/Voron/filament/Voron Generic PC.json	
@@ -13,21 +13,30 @@
         "0.94"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
   }
diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json
index 03b5dc2b38..37137c8f0a 100644
--- a/resources/profiles/Voron/filament/Voron Generic PETG.json	
+++ b/resources/profiles/Voron/filament/Voron Generic PETG.json	
@@ -43,21 +43,30 @@
         "; filament start gcode\n"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
   }
diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json
index a7f831d23f..66f5786526 100644
--- a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json	
+++ b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json	
@@ -19,21 +19,30 @@
         "7"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
   }
diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json
index 1f1026ae1c..b70327eca6 100644
--- a/resources/profiles/Voron/filament/Voron Generic PLA.json	
+++ b/resources/profiles/Voron/filament/Voron Generic PLA.json	
@@ -16,21 +16,30 @@
         "8"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
   }
diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Voron Generic PVA.json
index 8d38ae527b..f1d705e4e0 100644
--- a/resources/profiles/Voron/filament/Voron Generic PVA.json	
+++ b/resources/profiles/Voron/filament/Voron Generic PVA.json	
@@ -19,21 +19,30 @@
         "10"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
   }
diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json
index d0be4e95b9..19b76b3afb 100644
--- a/resources/profiles/Voron/filament/Voron Generic TPU.json	
+++ b/resources/profiles/Voron/filament/Voron Generic TPU.json	
@@ -10,21 +10,30 @@
         "3.2"
     ],
     "compatible_printers": [
-        "Voron 2.4 250 0.4 nozzle",
-        "Voron 2.4 250 0.2 nozzle",
-        "Voron 2.4 250 0.6 nozzle",
-        "Voron 2.4 250 0.8 nozzle",
-        "Voron 2.4 300 0.4 nozzle",
-        "Voron 2.4 300 0.2 nozzle",
-        "Voron 2.4 300 0.6 nozzle",
-        "Voron 2.4 300 0.8 nozzle",
-        "Voron 2.4 350 0.4 nozzle",
-        "Voron 2.4 350 0.2 nozzle",
-        "Voron 2.4 350 0.6 nozzle",
-        "Voron 2.4 350 0.8 nozzle",
-        "Voron Trident 250 0.4 nozzle",
-        "Voron Trident 300 0.4 nozzle",
-        "Voron Trident 350 0.4 nozzle",
-        "Voron 0.1 0.4 nozzle"
-      ]
+      "Voron 2.4 250 0.4 nozzle",
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 250 0.2 nozzle",
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 250 0.6 nozzle",
+      "Voron 2.4 250 0.8 nozzle",
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 0.4 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 300 0.2 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 300 0.6 nozzle",
+      "Voron 2.4 300 0.8 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 0.4 nozzle",
+      "Voron 2.4 350 0.15 nozzle",
+      "Voron 2.4 350 0.2 nozzle",
+      "Voron 2.4 350 0.25 nozzle",
+      "Voron 2.4 350 0.6 nozzle",
+      "Voron 2.4 350 0.8 nozzle",
+      "Voron 2.4 350 1.0 nozzle",
+      "Voron Trident 250 0.4 nozzle",
+      "Voron Trident 300 0.4 nozzle",
+      "Voron Trident 350 0.4 nozzle",
+      "Voron 0.1 0.4 nozzle"
+    ]
   }
diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json
new file mode 100644
index 0000000000..6d1a763421
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM002",
+    "name": "Voron 2.4 250 0.15 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 250",
+    "max_layer_height": [
+      "0.2"
+    ],
+    "min_layer_height": [
+      "0.04"
+    ],
+      "nozzle_diameter": [
+      "0.15"
+    ],
+    "printable_area": [
+      "0x0",
+      "250x0",
+      "250x250",
+      "0x250"
+    ],
+    "printable_height": "225"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json
index 5922119c28..2998a4fce6 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json	
@@ -7,10 +7,10 @@
     "inherits": "fdm_klipper_common",
     "printer_model": "Voron 2.4 250",
     "max_layer_height": [
-      "0.32"
+      "0.20"
     ],
     "min_layer_height": [
-      "0.08"
+      "0.06"
     ],
       "nozzle_diameter": [
       "0.2"
diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json
new file mode 100644
index 0000000000..135d0163b3
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM002",
+    "name": "Voron 2.4 250 0.25 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 250",
+    "max_layer_height": [
+      "0.25"
+    ],
+    "min_layer_height": [
+      "0.06"
+    ],
+      "nozzle_diameter": [
+      "0.25"
+    ],
+    "printable_area": [
+      "0x0",
+      "250x0",
+      "250x250",
+      "0x250"
+    ],
+    "printable_height": "225"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json
index 1dfaa58e32..414c63588e 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json	
@@ -7,7 +7,7 @@
     "inherits": "fdm_klipper_common",
     "printer_model": "Voron 2.4 250",
     "max_layer_height": [
-      "0.65"
+      "0.6"
     ],
     "min_layer_height": [
       "0.20"
diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json
new file mode 100644
index 0000000000..f6418f1e98
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM004",
+    "name": "Voron 2.4 250 1.0 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 250",
+    "max_layer_height": [
+      "0.9"
+    ],
+    "min_layer_height": [
+      "0.25"
+    ],
+      "nozzle_diameter": [
+      "1.0"
+    ],
+    "printable_area": [
+      "0x0",
+      "250x0",
+      "250x250",
+      "0x250"
+    ],
+    "printable_height": "225"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 250.json b/resources/profiles/Voron/machine/Voron 2.4 250.json
index ba598b835e..f6756a00cb 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 250.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 250.json	
@@ -2,7 +2,7 @@
     "type": "machine_model",
     "name": "Voron 2.4 250",
     "model_id": "Voron2_250",
-    "nozzle_diameter": "0.4;0.2;0.6;0.8",
+    "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0",
     "machine_tech": "FFF",
     "family": "VoronDesign",
     "bed_model": "",
diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json
new file mode 100644
index 0000000000..88b59200f8
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM002",
+    "name": "Voron 2.4 300 0.15 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 300",
+    "max_layer_height": [
+      "0.2"
+    ],
+    "min_layer_height": [
+      "0.04"
+    ],
+      "nozzle_diameter": [
+      "0.15"
+    ],
+    "printable_area": [
+      "0x0",
+      "300x0",
+      "300x300",
+      "0x300"
+    ],
+      "printable_height": "2755"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json
index ca8e1d944c..071adba1b5 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json	
@@ -7,10 +7,10 @@
     "inherits": "fdm_klipper_common",
     "printer_model": "Voron 2.4 300",
     "max_layer_height": [
-      "0.32"
+      "0.2"
     ],
     "min_layer_height": [
-      "0.08"
+      "0.06"
     ],
       "nozzle_diameter": [
       "0.2"
diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json
new file mode 100644
index 0000000000..0789cf6fad
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM002",
+    "name": "Voron 2.4 300 0.25 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 300",
+    "max_layer_height": [
+      "0.25"
+    ],
+    "min_layer_height": [
+      "0.06"
+    ],
+      "nozzle_diameter": [
+      "0.25"
+    ],
+    "printable_area": [
+      "0x0",
+      "300x0",
+      "300x300",
+      "0x300"
+    ],
+      "printable_height": "2755"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json
index 91ce5ad0ec..d632af7b16 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json	
@@ -7,7 +7,7 @@
     "inherits": "fdm_klipper_common",
     "printer_model": "Voron 2.4 300",
     "max_layer_height": [
-      "0.65"
+      "0.6"
     ],
     "min_layer_height": [
       "0.20"
diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json
new file mode 100644
index 0000000000..1ccf4bc63c
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM004",
+    "name": "Voron 2.4 300 1.0 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 300",
+    "max_layer_height": [
+      "0.9"
+    ],
+    "min_layer_height": [
+      "0.25"
+    ],
+      "nozzle_diameter": [
+      "1.0"
+    ],
+    "printable_area": [
+      "0x0",
+      "300x0",
+      "300x300",
+      "0x300"
+    ],
+    "printable_height": "275"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 300.json b/resources/profiles/Voron/machine/Voron 2.4 300.json
index 8d22eaffbc..79758b69a3 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 300.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 300.json	
@@ -2,7 +2,7 @@
     "type": "machine_model",
     "name": "Voron 2.4 300",
     "model_id": "Voron2_300",
-    "nozzle_diameter": "0.4;0.2;0.6;0.8",
+    "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0",
     "machine_tech": "FFF",
     "family": "VoronDesign",
     "bed_model": "",
diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json
new file mode 100644
index 0000000000..5f9dc94f34
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM002",
+    "name": "Voron 2.4 350 0.15 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 350",
+    "max_layer_height": [
+      "0.2"
+    ],
+    "min_layer_height": [
+      "0.04"
+    ],
+      "nozzle_diameter": [
+      "0.15"
+    ],
+    "printable_area": [
+      "0x0",
+      "350x0",
+      "350x350",
+      "0x350"
+    ],
+    "printable_height": "325"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json
index 13431c8ae5..cb57e54578 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json	
@@ -7,10 +7,10 @@
     "inherits": "fdm_klipper_common",
     "printer_model": "Voron 2.4 350",
     "max_layer_height": [
-      "0.32"
+      "0.2"
     ],
     "min_layer_height": [
-      "0.08"
+      "0.06"
     ],
       "nozzle_diameter": [
       "0.2"
diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json
new file mode 100644
index 0000000000..ef3da1e5ba
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM002",
+    "name": "Voron 2.4 350 0.25 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 350",
+    "max_layer_height": [
+      "0.25"
+    ],
+    "min_layer_height": [
+      "0.06"
+    ],
+      "nozzle_diameter": [
+      "0.25"
+    ],
+    "printable_area": [
+      "0x0",
+      "350x0",
+      "350x350",
+      "0x350"
+    ],
+    "printable_height": "325"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json
index f5d3758ad9..83cc926bc3 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json	
@@ -7,7 +7,7 @@
     "inherits": "fdm_klipper_common",
     "printer_model": "Voron 2.4 350",
     "max_layer_height": [
-      "0.65"
+      "0.6"
     ],
     "min_layer_height": [
       "0.20"
diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json
new file mode 100644
index 0000000000..6ebbe763b9
--- /dev/null
+++ b/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json	
@@ -0,0 +1,26 @@
+{
+    "type": "machine",
+    "setting_id": "GM004",
+    "name": "Voron 2.4 350 1.0 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_klipper_common",
+    "printer_model": "Voron 2.4 350",
+    "max_layer_height": [
+      "0.9"
+    ],
+    "min_layer_height": [
+      "0.25"
+    ],
+      "nozzle_diameter": [
+      "1.0"
+    ],
+    "printable_area": [
+      "0x0",
+      "350x0",
+      "350x350",
+      "0x350"
+    ],
+    "printable_height": "325"
+  }
+  
\ No newline at end of file
diff --git a/resources/profiles/Voron/machine/Voron 2.4 350.json b/resources/profiles/Voron/machine/Voron 2.4 350.json
index b6f285ad41..5f67ea76f8 100644
--- a/resources/profiles/Voron/machine/Voron 2.4 350.json	
+++ b/resources/profiles/Voron/machine/Voron 2.4 350.json	
@@ -2,7 +2,7 @@
     "type": "machine_model",
     "name": "Voron 2.4 350",
     "model_id": "Voron2_350",
-    "nozzle_diameter": "0.4;0.2;0.6;0.8",
+    "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0",
     "machine_tech": "FFF",
     "family": "VoronDesign",
     "bed_model": "",
diff --git a/resources/profiles/Voron/process/0.05mm Fine 0.15 nozzle @Voron.json b/resources/profiles/Voron/process/0.05mm Fine 0.15 nozzle @Voron.json
new file mode 100644
index 0000000000..786d972682
--- /dev/null
+++ b/resources/profiles/Voron/process/0.05mm Fine 0.15 nozzle @Voron.json	
@@ -0,0 +1,14 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.05mm Fine 0.15 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_1_5",
+    "layer_height": "0.05",
+    "bottom_shell_layers": "7",
+    "top_shell_layers": "9"
+}
+
+
+
diff --git a/resources/profiles/Voron/process/0.06mm Fine 0.25 nozzle @Voron.json b/resources/profiles/Voron/process/0.06mm Fine 0.25 nozzle @Voron.json
new file mode 100644
index 0000000000..02a7d9e0f7
--- /dev/null
+++ b/resources/profiles/Voron/process/0.06mm Fine 0.25 nozzle @Voron.json	
@@ -0,0 +1,14 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.06mm Fine 0.25 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_2_5",
+    "layer_height": "0.06",
+    "bottom_shell_layers": "7",
+    "top_shell_layers": "9"
+}
+
+
+
diff --git a/resources/profiles/Voron/process/0.07mm Optimal 0.15 nozzle @Voron.json b/resources/profiles/Voron/process/0.07mm Optimal 0.15 nozzle @Voron.json
new file mode 100644
index 0000000000..725cc36a35
--- /dev/null
+++ b/resources/profiles/Voron/process/0.07mm Optimal 0.15 nozzle @Voron.json	
@@ -0,0 +1,14 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.07mm Optimal 0.15 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_1_5",
+    "layer_height": "0.07",
+    "bottom_shell_layers": "7",
+    "top_shell_layers": "9"
+}
+
+
+
diff --git a/resources/profiles/Voron/process/0.08mm Optimal 0.25 nozzle @Voron.json b/resources/profiles/Voron/process/0.08mm Optimal 0.25 nozzle @Voron.json
new file mode 100644
index 0000000000..1833724d84
--- /dev/null
+++ b/resources/profiles/Voron/process/0.08mm Optimal 0.25 nozzle @Voron.json	
@@ -0,0 +1,14 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.08mm Optimal 0.25 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_2_5",
+    "layer_height": "0.08",
+    "bottom_shell_layers": "7",
+    "top_shell_layers": "9"
+}
+
+
+
diff --git a/resources/profiles/Voron/process/0.09mm Standard 0.15 nozzle @Voron.json b/resources/profiles/Voron/process/0.09mm Standard 0.15 nozzle @Voron.json
new file mode 100644
index 0000000000..b4b2ccd261
--- /dev/null
+++ b/resources/profiles/Voron/process/0.09mm Standard 0.15 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.09mm Standard 0.15 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_1_5",
+    "layer_height": "0.09",
+    "bottom_shell_layers": "5",
+    "top_shell_layers": "6"
+}
diff --git a/resources/profiles/Voron/process/0.10mm Standard 0.25 nozzle @Voron.json b/resources/profiles/Voron/process/0.10mm Standard 0.25 nozzle @Voron.json
new file mode 100644
index 0000000000..fc02fba2da
--- /dev/null
+++ b/resources/profiles/Voron/process/0.10mm Standard 0.25 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.10mm Standard 0.25 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_2_5",
+    "layer_height": "0.10",
+    "bottom_shell_layers": "5",
+    "top_shell_layers": "6"
+}
diff --git a/resources/profiles/Voron/process/0.12mm Draft 0.15 nozzle @Voron.json b/resources/profiles/Voron/process/0.12mm Draft 0.15 nozzle @Voron.json
new file mode 100644
index 0000000000..4903b0597c
--- /dev/null
+++ b/resources/profiles/Voron/process/0.12mm Draft 0.15 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.12mm Draft 0.15 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_1_5",
+    "layer_height": "0.12",
+    "bottom_shell_layers": "5",
+    "top_shell_layers": "6"
+}
diff --git a/resources/profiles/Voron/process/0.12mm Draft 0.25 nozzle @Voron.json b/resources/profiles/Voron/process/0.12mm Draft 0.25 nozzle @Voron.json
new file mode 100644
index 0000000000..03ec425002
--- /dev/null
+++ b/resources/profiles/Voron/process/0.12mm Draft 0.25 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.12mm Draft 0.25 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_2_5",
+    "layer_height": "0.12",
+    "bottom_shell_layers": "5",
+    "top_shell_layers": "6"
+}
diff --git a/resources/profiles/Voron/process/0.14mm Extra Draft 0.25 nozzle @Voron.json b/resources/profiles/Voron/process/0.14mm Extra Draft 0.25 nozzle @Voron.json
new file mode 100644
index 0000000000..42e9eb43ee
--- /dev/null
+++ b/resources/profiles/Voron/process/0.14mm Extra Draft 0.25 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.14mm Extra Draft 0.25 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_0_2_5",
+    "bottom_shell_layers": "4",
+    "top_shell_layers": "5",
+    "layer_height": "0.14"
+}
diff --git a/resources/profiles/Voron/process/0.24mm Fine 0.8 nozzle @Voron.json b/resources/profiles/Voron/process/0.24mm Fine 0.8 nozzle @Voron.json
index 26e931adec..4bde68c978 100644
--- a/resources/profiles/Voron/process/0.24mm Fine 0.8 nozzle @Voron.json	
+++ b/resources/profiles/Voron/process/0.24mm Fine 0.8 nozzle @Voron.json	
@@ -1,7 +1,7 @@
 {
     "type": "process",
     "setting_id": "GP004",
-    "name": "0.24mm Fine 0.6 nozzle @Voron",
+    "name": "0.24mm Fine 0.8 nozzle @Voron",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_process_voron_common_0_8",
diff --git a/resources/profiles/Voron/process/0.30mm Fine 1.0 nozzle @Voron.json b/resources/profiles/Voron/process/0.30mm Fine 1.0 nozzle @Voron.json
new file mode 100644
index 0000000000..a7c06d5a41
--- /dev/null
+++ b/resources/profiles/Voron/process/0.30mm Fine 1.0 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.30mm Fine 1.0 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_1_0",
+    "bottom_shell_layers": "4",
+    "top_shell_layers": "5",
+    "layer_height": "0.30"
+}
diff --git a/resources/profiles/Voron/process/0.50mm Standard 1.0 nozzle @Voron.json b/resources/profiles/Voron/process/0.50mm Standard 1.0 nozzle @Voron.json
new file mode 100644
index 0000000000..370c7d8457
--- /dev/null
+++ b/resources/profiles/Voron/process/0.50mm Standard 1.0 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.50mm Standard 1.0 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_1_0",
+    "bottom_shell_layers": "3",
+    "top_shell_layers": "4",
+    "layer_height": "0.50"
+}
diff --git a/resources/profiles/Voron/process/0.60mm Draft 1.0 nozzle @Voron.json b/resources/profiles/Voron/process/0.60mm Draft 1.0 nozzle @Voron.json
new file mode 100644
index 0000000000..520bc0a021
--- /dev/null
+++ b/resources/profiles/Voron/process/0.60mm Draft 1.0 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.60mm Draft 1.0 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_1_0",
+    "bottom_shell_layers": "2",
+    "top_shell_layers": "3",
+    "layer_height": "0.60"
+}
diff --git a/resources/profiles/Voron/process/0.80mm Extra Draft 1.0 nozzle @Voron.json b/resources/profiles/Voron/process/0.80mm Extra Draft 1.0 nozzle @Voron.json
new file mode 100644
index 0000000000..e684f784e2
--- /dev/null
+++ b/resources/profiles/Voron/process/0.80mm Extra Draft 1.0 nozzle @Voron.json	
@@ -0,0 +1,11 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.80mm Extra Draft 1.0 nozzle @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_process_voron_common_1_0",
+    "bottom_shell_layers": "2",
+    "top_shell_layers": "3",
+    "layer_height": "0.80"
+}
diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_1_5.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_1_5.json
new file mode 100644
index 0000000000..291daf29db
--- /dev/null
+++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_1_5.json
@@ -0,0 +1,21 @@
+{
+    "type": "process",
+    "name": "fdm_process_voron_common_0_1_5",
+    "from": "system",
+    "instantiation": "false",
+    "inherits": "fdm_process_voron_common",
+    "outer_wall_line_width": "0.17",
+    "line_width": "0.17",
+    "sparse_infill_line_width": "0.17",
+    "initial_layer_line_width": "0.2",
+    "initial_layer_print_height": "0.1",
+    "inner_wall_line_width": "0.17",
+    "internal_solid_infill_line_width": "0.17",
+    "support_line_width": "0.17",
+    "top_surface_line_width": "0.17",
+    "compatible_printers": [
+      "Voron 2.4 250 0.15 nozzle",
+      "Voron 2.4 300 0.15 nozzle",
+      "Voron 2.4 350 0.15 nozzle"
+    ]
+}
diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_2_5.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_2_5.json
new file mode 100644
index 0000000000..b7f5de2364
--- /dev/null
+++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_2_5.json
@@ -0,0 +1,21 @@
+{
+    "type": "process",
+    "name": "fdm_process_voron_common_0_2_5",
+    "from": "system",
+    "instantiation": "false",
+    "inherits": "fdm_process_voron_common",
+    "outer_wall_line_width": "0.27",
+    "line_width": "0.27",
+    "sparse_infill_line_width": "0.27",
+    "initial_layer_line_width": "0.28",
+    "initial_layer_print_height": "0.15",
+    "inner_wall_line_width": "0.27",
+    "internal_solid_infill_line_width": "0.27",
+    "support_line_width": "0.27",
+    "top_surface_line_width": "0.27",
+    "compatible_printers": [
+      "Voron 2.4 250 0.25 nozzle",
+      "Voron 2.4 300 0.25 nozzle",
+      "Voron 2.4 350 0.25 nozzle"
+    ]
+}
diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_1_0.json b/resources/profiles/Voron/process/fdm_process_voron_common_1_0.json
new file mode 100644
index 0000000000..d4a16f925f
--- /dev/null
+++ b/resources/profiles/Voron/process/fdm_process_voron_common_1_0.json
@@ -0,0 +1,21 @@
+{
+    "type": "process",
+    "name": "fdm_process_voron_common_1_0",
+    "from": "system",
+    "instantiation": "false",
+    "inherits": "fdm_process_voron_common",
+    "initial_layer_line_width": "1.02",
+    "initial_layer_print_height": "0.5",
+    "outer_wall_line_width": "1.02",
+    "line_width": "1.02",
+    "sparse_infill_line_width": "1.02",
+    "inner_wall_line_width": "1.02",
+    "internal_solid_infill_line_width": "1.02",
+    "support_line_width": "1.02",
+    "top_surface_line_width": "1.02",
+    "compatible_printers": [
+      "Voron 2.4 250 1.0 nozzle",
+      "Voron 2.4 300 1.0 nozzle",
+      "Voron 2.4 350 1.0 nozzle"
+    ]
+}
diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index 85882220e2..cec5d8bab8 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -149,6 +149,9 @@ void AppConfig::set_defaults()
 
         if (get("use_inches").empty())
             set("use_inches", "0");
+
+        if (get("default_page").empty())
+            set("default_page", "0");
     }
     else {
 #ifdef _WIN32
@@ -231,6 +234,12 @@ void AppConfig::set_defaults()
     if (get("stealth_mode").empty()) {
         set_bool("stealth_mode", false);
     }
+
+    // Orca
+    if(get("show_splash_screen").empty()) {
+        set_bool("show_splash_screen", true);
+    }
+
     if (get("show_model_mesh").empty()) {
         set_bool("show_model_mesh", false);
     }
diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp
index 8a293d7110..c1a2b6aa30 100644
--- a/src/libslic3r/PerimeterGenerator.cpp
+++ b/src/libslic3r/PerimeterGenerator.cpp
@@ -1376,7 +1376,7 @@ std::tuple<std::vector<ExtrusionPaths>, Polygons> generate_extra_perimeters_over
 
 void PerimeterGenerator::apply_extra_perimeters(ExPolygons &infill_area)
 {
-    if (this->lower_slices != nullptr && this->config->detect_overhang_wall && this->config->extra_perimeters_on_overhangs &&
+    if (!m_spiral_vase && this->lower_slices != nullptr && this->config->detect_overhang_wall && this->config->extra_perimeters_on_overhangs &&
         this->config->wall_loops > 0 && this->layer_id > this->object_config->raft_layers) {
         // Generate extra perimeters on overhang areas, and cut them to these parts only, to save print time and material
         auto [extra_perimeters, filled_area] = generate_extra_perimeters_over_overhangs(infill_area, this->lower_slices_polygons(),
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 22fbec7525..068b38a956 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -1107,6 +1107,8 @@ void GUI_App::post_init()
 //#endif
         if (is_editor())
             mainframe->select_tab(size_t(0));
+        if (app_config->get("default_page") == "1")
+            mainframe->select_tab(size_t(1));
         mainframe->Thaw();
         plater_->trigger_restore_project(1);
         BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ", end load_gl_resources";
@@ -2427,8 +2429,7 @@ bool GUI_App::on_init_inner()
     }
 
     BBLSplashScreen * scrn = nullptr;
-    const bool show_splash_screen = true;
-    if (show_splash_screen) {
+    if (app_config->get("show_splash_screen") == "true") {
         // make a bitmap with dark grey banner on the left side
         //BBS make BBL splash screen bitmap
         wxBitmap bmp = BBLSplashScreen::MakeBitmap();
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index f219a207b4..8e009323fe 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -979,9 +979,13 @@ wxWindow* PreferencesDialog::create_general_page()
     std::vector<wxString> Units         = {_L("Metric") + " (mm, g)", _L("Imperial") + " (in, oz)"};
     auto item_currency = create_item_combobox(_L("Units"), page, _L("Units"), "use_inches", Units);
 
+    std::vector<wxString> DefaultPage = {_L("Home"), _L("Prepare")};
+    auto item_default_page = create_item_combobox(_L("Default Page"), page, _L("Set the page opened on startup."), "default_page", DefaultPage);
+
     auto item_mouse_zoom_settings = create_item_checkbox(_L("Zoom to mouse position"), page, _L("Zoom in towards the mouse pointer's position in the 3D view, rather than the 2D window center."), 50, "zoom_to_mouse");
     auto item_use_free_camera_settings = create_item_checkbox(_L("Use free camera"), page, _L("If enabled, use free camera. If not enabled, use constrained camera."), 50, "use_free_camera");
 
+    auto item_show_splash_screen = create_item_checkbox(_L("Show splash screen"), page, _L("Show the splash screen during startup."), 50, "show_splash_screen");
     auto item_hints = create_item_checkbox(_L("Show \"Tip of the day\" notification after start"), page, _L("If enabled, useful hints are displayed at startup."), 50, "show_hints");
     auto item_gcode_window = create_item_checkbox(_L("Show g-code window"), page, _L("If enabled, g-code window will be displayed."), 50, "show_gcode_window");
 
@@ -1039,8 +1043,10 @@ wxWindow* PreferencesDialog::create_general_page()
     sizer_page->Add(item_language, 0, wxTOP, FromDIP(3));
     sizer_page->Add(item_region, 0, wxTOP, FromDIP(3));
     sizer_page->Add(item_currency, 0, wxTOP, FromDIP(3));
+    sizer_page->Add(item_default_page, 0, wxTOP, FromDIP(3));
     sizer_page->Add(item_mouse_zoom_settings, 0, wxTOP, FromDIP(3));
     sizer_page->Add(item_use_free_camera_settings, 0, wxTOP, FromDIP(3));
+    sizer_page->Add(item_show_splash_screen, 0, wxTOP, FromDIP(3));
     sizer_page->Add(item_hints, 0, wxTOP, FromDIP(3));
     sizer_page->Add(item_gcode_window, 0, wxTOP, FromDIP(3));
     sizer_page->Add(title_presets, 0, wxTOP | wxEXPAND, FromDIP(20));
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index d09cb7a326..3ad2c440c3 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -3562,8 +3562,6 @@ if (is_marlin_flavor)
             optgroup->append_single_option_line("retraction_length", "", extruder_idx);
             optgroup->append_single_option_line("retract_restart_extra", "", extruder_idx);
             optgroup->append_single_option_line("z_hop", "", extruder_idx);
-            optgroup->append_single_option_line("retract_lift_above", "", extruder_idx);
-            optgroup->append_single_option_line("retract_lift_below", "", extruder_idx);
             optgroup->append_single_option_line("z_hop_types", "", extruder_idx);
             optgroup->append_single_option_line("retraction_speed", "", extruder_idx);
             optgroup->append_single_option_line("deretraction_speed", "", extruder_idx);
diff --git a/src/slic3r/Utils/FixModelByWin10.cpp b/src/slic3r/Utils/FixModelByWin10.cpp
index 38684f2c8e..70823e23d6 100644
--- a/src/slic3r/Utils/FixModelByWin10.cpp
+++ b/src/slic3r/Utils/FixModelByWin10.cpp
@@ -1,3 +1,7 @@
+///|/ Copyright (c) Prusa Research 2018 - 2023 Oleksandra Iushchenko @YuSanka, Lukáš Matěna @lukasmatena, Pavel Mikuš @Godrak, Enrico Turri @enricoturri1966, Vojtěch Bubník @bubnikv
+///|/
+///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+///|/
 #ifdef HAS_WIN10SDK
 
 #ifndef NOMINMAX
@@ -323,9 +327,8 @@ public:
 // fix_result containes a message if fixing failed
 bool fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx, GUI::ProgressDialog& progress_dialog, const wxString& msg_header, std::string& fix_result)
 {
-	std::mutex 						mutex;
-	std::condition_variable			condition;
-	std::unique_lock<std::mutex>	lock(mutex);
+    std::mutex mtx;
+    std::condition_variable condition;
 	struct Progress {
 		std::string 				message;
 		int 						percent  = 0;
@@ -344,8 +347,8 @@ bool fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx, GUI::
 	// (It seems like wxWidgets initialize the COM contex as single threaded and we need a multi-threaded context).
 	bool   success = false;
 	size_t ivolume = 0;
-	auto on_progress = [&mutex, &condition, &ivolume, &volumes, &progress](const char *msg, unsigned prcnt) {
-        std::lock_guard<std::mutex> lk(mutex);
+	auto on_progress = [&mtx, &condition, &ivolume, &volumes, &progress](const char *msg, unsigned prcnt) {
+	    std::unique_lock<std::mutex> lock(mtx);
 		progress.message = msg;
 		progress.percent = (int)floor((float(prcnt) + float(ivolume) * 100.f) / float(volumes.size()));
 		progress.updated = true;
@@ -422,6 +425,7 @@ bool fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx, GUI::
 		}
 	});
     while (! finished) {
+		std::unique_lock<std::mutex> lock(mtx);
 		condition.wait_for(lock, std::chrono::milliseconds(250), [&progress]{ return progress.updated; });
 		// decrease progress.percent value to avoid closing of the progress dialog
 		if (!progress_dialog.Update(progress.percent-1, msg_header + _(progress.message)))