diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json
index c1ea41562d2..e86368ff5f6 100644
--- a/resources/profiles/Creality.json
+++ b/resources/profiles/Creality.json
@@ -1,6 +1,6 @@
 {
 	"name": "Creality",
-	"version": "01.06.02.00",
+	"version": "01.07.00.00",
 	"force_update": "0",
 	"description": "Creality configurations",
 	"machine_model_list": [
@@ -280,54 +280,6 @@
 		{
 			"name": "Creality Generic ABS",
 			"sub_path": "filament/Creality Generic ABS.json"
-		},
-		{
-			"name": "Creality Generic PLA @0.8 nozzle",
-			"sub_path": "filament/Creality Generic PLA @0.8 nozzle.json"
-		},
-		{
-			"name": "Creality Generic PLA @0.6 nozzle",
-			"sub_path": "filament/Creality Generic PLA @0.6 nozzle.json"
-		},
-		{
-			"name": "Creality Generic PLA @0.4 nozzle",
-			"sub_path": "filament/Creality Generic PLA @0.4 nozzle.json"
-		},
-		{
-			"name": "Creality Generic PLA @0.2 nozzle",
-			"sub_path": "filament/Creality Generic PLA @0.2 nozzle.json"
-		},
-		{
-			"name": "Creality Generic PETG @0.8 nozzle",
-			"sub_path": "filament/Creality Generic PETG @0.8 nozzle.json"
-		},
-		{
-			"name": "Creality Generic PETG @0.6 nozzle",
-			"sub_path": "filament/Creality Generic PETG @0.6 nozzle.json"
-		},
-		{
-			"name": "Creality Generic PETG @0.4 nozzle",
-			"sub_path": "filament/Creality Generic PETG @0.4 nozzle.json"
-		},
-		{
-			"name": "Creality Generic PETG @0.2 nozzle",
-			"sub_path": "filament/Creality Generic PETG @0.2 nozzle.json"
-		},
-		{
-			"name": "Creality Generic ABS @0.8 nozzle",
-			"sub_path": "filament/Creality Generic ABS @0.8 nozzle.json"
-		},
-		{
-			"name": "Creality Generic ABS @0.6 nozzle",
-			"sub_path": "filament/Creality Generic ABS @0.6 nozzle.json"
-		},
-		{
-			"name": "Creality Generic ABS @0.4 nozzle",
-			"sub_path": "filament/Creality Generic ABS @0.4 nozzle.json"
-		},
-		{
-			"name": "Creality Generic ABS @0.2 nozzle",
-			"sub_path": "filament/Creality Generic ABS @0.2 nozzle.json"
 		}
 	],
 	"machine_list": [
diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @0.2 nozzle.json b/resources/profiles/Creality/filament/Creality Generic ABS @0.2 nozzle.json
deleted file mode 100644
index 14e2d383f57..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic ABS @0.2 nozzle.json	
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic ABS @0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic ABS",
-	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.2 nozzle)",
-		"Creality CR-6 Max (0.2 nozzle)",
-		"Creality CR-10 V2 (0.2 nozzle)",
-		"Creality CR-10 Max (0.2 nozzle)",
-		"Creality CR-10 Smart Pro (0.2 nozzle)",
-		"Creality Ender-3 V2 (0.2 nozzle)",
-		"Creality Ender-3 S1 (0.2 nozzle)",
-		"Creality Ender-3 S1 Pro (0.2 nozzle)",
-		"Creality Ender-5 (0.2 nozzle)",
-		"Creality Ender-5 Plus (0.2 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.2 nozzle)",
-		"Creality Ender-5S (0.2 nozzle)",
-		"Creality Ender-5 S1 (0.2 nozzle)",
-		"Creality Ender-6 (0.2 nozzle)",
-		"Creality Ender-7 (0.2 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @0.4 nozzle.json b/resources/profiles/Creality/filament/Creality Generic ABS @0.4 nozzle.json
deleted file mode 100644
index 4b577ac9fd5..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic ABS @0.4 nozzle.json	
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic ABS @0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic ABS",
-	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.4 nozzle)",
-		"Creality CR-6 Max (0.4 nozzle)",
-		"Creality CR-10 V2 (0.4 nozzle)",
-		"Creality CR-10 Max (0.4 nozzle)",
-		"Creality CR-10 Smart Pro (0.4 nozzle)",
-		"Creality Ender-3 V2 (0.4 nozzle)",
-		"Creality Ender-3 S1 (0.4 nozzle)",
-		"Creality Ender-3 S1 Pro (0.4 nozzle)",
-		"Creality Ender-5 (0.4 nozzle)",
-		"Creality Ender-5 Plus (0.4 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.4 nozzle)",
-		"Creality Ender-5S (0.4 nozzle)",
-		"Creality Ender-5 S1 (0.4 nozzle)",
-		"Creality Ender-6 (0.4 nozzle)",
-		"Creality Ender-7 (0.4 nozzle)",
-		"Creality K1 (0.4 nozzle)",
-		"Creality K1 Max (0.4 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @0.6 nozzle.json b/resources/profiles/Creality/filament/Creality Generic ABS @0.6 nozzle.json
deleted file mode 100644
index e7214558432..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic ABS @0.6 nozzle.json	
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic ABS @0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic ABS",
-	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.6 nozzle)",
-		"Creality CR-6 Max (0.6 nozzle)",
-		"Creality CR-10 V2 (0.6 nozzle)",
-		"Creality CR-10 Max (0.6 nozzle)",
-		"Creality CR-10 Smart Pro (0.6 nozzle)",
-		"Creality Ender-3 V2 (0.6 nozzle)",
-		"Creality Ender-3 S1 (0.6 nozzle)",
-		"Creality Ender-3 S1 Pro (0.6 nozzle)",
-		"Creality Ender-5 (0.6 nozzle)",
-		"Creality Ender-5 Plus (0.6 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.6 nozzle)",
-		"Creality Ender-5S (0.6 nozzle)",
-		"Creality Ender-5 S1 (0.6 nozzle)",
-		"Creality Ender-6 (0.6 nozzle)",
-		"Creality Ender-7 (0.6 nozzle)",
-		"Creality K1 (0.6 nozzle)",
-		"Creality K1 Max (0.6 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @0.8 nozzle.json b/resources/profiles/Creality/filament/Creality Generic ABS @0.8 nozzle.json
deleted file mode 100644
index dcc0b40c5d7..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic ABS @0.8 nozzle.json	
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic ABS @0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic ABS",
-	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.8 nozzle)",
-		"Creality CR-6 Max (0.8 nozzle)",
-		"Creality CR-10 V2 (0.8 nozzle)",
-		"Creality CR-10 Max (0.8 nozzle)",
-		"Creality CR-10 Smart Pro (0.8 nozzle)",
-		"Creality Ender-3 V2 (0.8 nozzle)",
-		"Creality Ender-3 S1 (0.8 nozzle)",
-		"Creality Ender-3 S1 Pro (0.8 nozzle)",
-		"Creality Ender-5 (0.8 nozzle)",
-		"Creality Ender-5 Plus (0.8 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.8 nozzle)",
-		"Creality Ender-5S (0.8 nozzle)",
-		"Creality Ender-5 S1 (0.8 nozzle)",
-		"Creality Ender-6 (0.8 nozzle)",
-		"Creality Ender-7 (0.8 nozzle)",
-		"Creality K1 (0.8 nozzle)",
-		"Creality K1 Max (0.8 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic ABS.json b/resources/profiles/Creality/filament/Creality Generic ABS.json
index 9f1496612cb..bbe76aaf35a 100644
--- a/resources/profiles/Creality/filament/Creality Generic ABS.json	
+++ b/resources/profiles/Creality/filament/Creality Generic ABS.json	
@@ -7,5 +7,25 @@
 	"instantiation": "true",
 	"inherits": "fdm_filament_abs",
 	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"]
+	"filament_max_volumetric_speed": ["12"],
+	"compatible_printers": [
+		"Creality CR-10 V2 0.4 nozzle",
+		"Creality CR-10 Max 0.4 nozzle",
+		"Creality Ender-3 V2 0.4 nozzle",
+		"Creality Ender-3 S1 0.4 nozzle",
+		"Creality Ender-3 S1 Pro 0.4 nozzle",
+		"Creality Ender-5 0.4 nozzle",
+		"Creality Ender-5 Plus 0.4 nozzle",
+		"Creality Ender-5 Pro (2019) 0.4 nozzle",
+		"Creality Ender-5S 0.4 nozzle",
+		"Creality Ender-5 S1 0.4 nozzle",
+		"Creality Ender-6 0.4 nozzle",
+		"Creality K1 (0.4 nozzle)",
+		"Creality K1 (0.6 nozzle)",
+		"Creality K1 (0.8 nozzle)",
+		"Creality K1 Max (0.4 nozzle)",
+		"Creality K1 Max (0.6 nozzle)",
+		"Creality K1 Max (0.8 nozzle)"
+		
+	]
 }
diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @0.2 nozzle.json b/resources/profiles/Creality/filament/Creality Generic PETG @0.2 nozzle.json
deleted file mode 100644
index 337076bcb70..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic PETG @0.2 nozzle.json	
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFG99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic PETG @0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic PETG",
-	"reduce_fan_stop_start_freq": ["1"],
-	"slow_down_for_layer_cooling": ["1"],
-	"fan_cooling_layer_time": ["30"],
-	"overhang_fan_speed": ["90"],
-	"overhang_fan_threshold": ["25%"],
-	"fan_max_speed": ["90"],
-	"fan_min_speed": ["40"],
-	"slow_down_min_speed": ["10"],
-	"slow_down_layer_time": ["8"],
-	"filament_flow_ratio": ["0.95"],
-	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.2 nozzle)",
-		"Creality CR-6 Max (0.2 nozzle)",
-		"Creality CR-10 V2 (0.2 nozzle)",
-		"Creality CR-10 Max (0.2 nozzle)",
-		"Creality CR-10 Smart Pro (0.2 nozzle)",
-		"Creality Ender-3 V2 (0.2 nozzle)",
-		"Creality Ender-3 S1 (0.2 nozzle)",
-		"Creality Ender-3 S1 Pro (0.2 nozzle)",
-		"Creality Ender-5 (0.2 nozzle)",
-		"Creality Ender-5 Plus (0.2 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.2 nozzle)",
-		"Creality Ender-5S (0.2 nozzle)",
-		"Creality Ender-5 S1 (0.2 nozzle)",
-		"Creality Ender-6 (0.2 nozzle)",
-		"Creality Ender-7 (0.2 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @0.4 nozzle.json b/resources/profiles/Creality/filament/Creality Generic PETG @0.4 nozzle.json
deleted file mode 100644
index 4a304d0fa6d..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic PETG @0.4 nozzle.json	
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFG99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic PETG @0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic PETG",
-	"reduce_fan_stop_start_freq": ["1"],
-	"slow_down_for_layer_cooling": ["1"],
-	"fan_cooling_layer_time": ["30"],
-	"overhang_fan_speed": ["90"],
-	"overhang_fan_threshold": ["25%"],
-	"fan_max_speed": ["90"],
-	"fan_min_speed": ["40"],
-	"slow_down_min_speed": ["10"],
-	"slow_down_layer_time": ["8"],
-	"filament_flow_ratio": ["0.95"],
-	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.4 nozzle)",
-		"Creality CR-6 Max (0.4 nozzle)",
-		"Creality CR-10 V2 (0.4 nozzle)",
-		"Creality CR-10 Max (0.4 nozzle)",
-		"Creality CR-10 Smart Pro (0.4 nozzle)",
-		"Creality Ender-3 V2 (0.4 nozzle)",
-		"Creality Ender-3 S1 (0.4 nozzle)",
-		"Creality Ender-3 S1 Pro (0.4 nozzle)",
-		"Creality Ender-5 (0.4 nozzle)",
-		"Creality Ender-5 Plus (0.4 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.4 nozzle)",
-		"Creality Ender-5S (0.4 nozzle)",
-		"Creality Ender-5 S1 (0.4 nozzle)",
-		"Creality Ender-6 (0.4 nozzle)",
-		"Creality Ender-7 (0.4 nozzle)",
-		"Creality K1 (0.4 nozzle)",
-		"Creality K1 Max (0.4 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @0.6 nozzle.json b/resources/profiles/Creality/filament/Creality Generic PETG @0.6 nozzle.json
deleted file mode 100644
index 74c85f54db7..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic PETG @0.6 nozzle.json	
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFG99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic PETG @0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic PETG",
-	"reduce_fan_stop_start_freq": ["1"],
-	"slow_down_for_layer_cooling": ["1"],
-	"fan_cooling_layer_time": ["30"],
-	"overhang_fan_speed": ["90"],
-	"overhang_fan_threshold": ["25%"],
-	"fan_max_speed": ["90"],
-	"fan_min_speed": ["40"],
-	"slow_down_min_speed": ["10"],
-	"slow_down_layer_time": ["8"],
-	"filament_flow_ratio": ["0.95"],
-	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.6 nozzle)",
-		"Creality CR-6 Max (0.6 nozzle)",
-		"Creality CR-10 V2 (0.6 nozzle)",
-		"Creality CR-10 Max (0.6 nozzle)",
-		"Creality CR-10 Smart Pro (0.6 nozzle)",
-		"Creality Ender-3 V2 (0.6 nozzle)",
-		"Creality Ender-3 S1 (0.6 nozzle)",
-		"Creality Ender-3 S1 Pro (0.6 nozzle)",
-		"Creality Ender-5 (0.6 nozzle)",
-		"Creality Ender-5 Plus (0.6 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.6 nozzle)",
-		"Creality Ender-5S (0.6 nozzle)",
-		"Creality Ender-5 S1 (0.6 nozzle)",
-		"Creality Ender-6 (0.6 nozzle)",
-		"Creality Ender-7 (0.6 nozzle)",
-		"Creality K1 (0.6 nozzle)",
-		"Creality K1 Max (0.6 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @0.8 nozzle.json b/resources/profiles/Creality/filament/Creality Generic PETG @0.8 nozzle.json
deleted file mode 100644
index e7d4a8c62a0..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic PETG @0.8 nozzle.json	
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFG99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic PETG @0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic PETG",
-	"reduce_fan_stop_start_freq": ["1"],
-	"slow_down_for_layer_cooling": ["1"],
-	"fan_cooling_layer_time": ["30"],
-	"overhang_fan_speed": ["90"],
-	"overhang_fan_threshold": ["25%"],
-	"fan_max_speed": ["90"],
-	"fan_min_speed": ["40"],
-	"slow_down_min_speed": ["10"],
-	"slow_down_layer_time": ["8"],
-	"filament_flow_ratio": ["0.95"],
-	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.8 nozzle)",
-		"Creality CR-6 Max (0.8 nozzle)",
-		"Creality CR-10 V2 (0.8 nozzle)",
-		"Creality CR-10 Max (0.8 nozzle)",
-		"Creality CR-10 Smart Pro (0.8 nozzle)",
-		"Creality Ender-3 V2 (0.8 nozzle)",
-		"Creality Ender-3 S1 (0.8 nozzle)",
-		"Creality Ender-3 S1 Pro (0.8 nozzle)",
-		"Creality Ender-5 (0.8 nozzle)",
-		"Creality Ender-5 Plus (0.8 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.8 nozzle)",
-		"Creality Ender-5S (0.8 nozzle)",
-		"Creality Ender-5 S1 (0.8 nozzle)",
-		"Creality Ender-6 (0.8 nozzle)",
-		"Creality Ender-7 (0.8 nozzle)",
-		"Creality K1 (0.8 nozzle)",
-		"Creality K1 Max (0.8 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic PETG.json b/resources/profiles/Creality/filament/Creality Generic PETG.json
index c5bafa36a8d..03e45875a72 100644
--- a/resources/profiles/Creality/filament/Creality Generic PETG.json	
+++ b/resources/profiles/Creality/filament/Creality Generic PETG.json	
@@ -17,5 +17,25 @@
 	"slow_down_layer_time": ["8"],
 	"filament_flow_ratio": ["0.95"],
 	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"]
+	"filament_start_gcode": ["; filament start gcode\n"],
+	"compatible_printers": [
+		"Creality CR-10 V2 0.4 nozzle",
+		"Creality CR-10 Max 0.4 nozzle",
+		"Creality Ender-3 V2 0.4 nozzle",
+		"Creality Ender-3 S1 0.4 nozzle",
+		"Creality Ender-3 S1 Pro 0.4 nozzle",
+		"Creality Ender-5 0.4 nozzle",
+		"Creality Ender-5 Plus 0.4 nozzle",
+		"Creality Ender-5 Pro (2019) 0.4 nozzle",
+		"Creality Ender-5S 0.4 nozzle",
+		"Creality Ender-5 S1 0.4 nozzle",
+		"Creality Ender-6 0.4 nozzle",
+		"Creality K1 (0.4 nozzle)",
+		"Creality K1 (0.6 nozzle)",
+		"Creality K1 (0.8 nozzle)",
+		"Creality K1 Max (0.4 nozzle)",
+		"Creality K1 Max (0.6 nozzle)",
+		"Creality K1 Max (0.8 nozzle)"
+		
+	]
 }
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @0.2 nozzle.json b/resources/profiles/Creality/filament/Creality Generic PLA @0.2 nozzle.json
deleted file mode 100644
index 4b79a2feac1..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic PLA @0.2 nozzle.json	
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic PLA @0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic PLA",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["12"],
-	"slow_down_layer_time": ["8"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.2 nozzle)",
-		"Creality CR-6 Max (0.2 nozzle)",
-		"Creality CR-10 V2 (0.2 nozzle)",
-		"Creality CR-10 Max (0.2 nozzle)",
-		"Creality CR-10 Smart Pro (0.2 nozzle)",
-		"Creality Ender-3 V2 (0.2 nozzle)",
-		"Creality Ender-3 S1 (0.2 nozzle)",
-		"Creality Ender-3 S1 Pro (0.2 nozzle)",
-		"Creality Ender-5 (0.2 nozzle)",
-		"Creality Ender-5 Plus (0.2 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.2 nozzle)",
-		"Creality Ender-5S (0.2 nozzle)",
-		"Creality Ender-5 S1 (0.2 nozzle)",
-		"Creality Ender-6 (0.2 nozzle)",
-		"Creality Ender-7 (0.2 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @0.4 nozzle.json b/resources/profiles/Creality/filament/Creality Generic PLA @0.4 nozzle.json
deleted file mode 100644
index 7278ec110c3..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic PLA @0.4 nozzle.json	
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic PLA @0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic PLA",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["12"],
-	"slow_down_layer_time": ["8"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.4 nozzle)",
-		"Creality CR-6 Max (0.4 nozzle)",
-		"Creality CR-10 V2 (0.4 nozzle)",
-		"Creality CR-10 Max (0.4 nozzle)",
-		"Creality CR-10 Smart Pro (0.4 nozzle)",
-		"Creality Ender-3 V2 (0.4 nozzle)",
-		"Creality Ender-3 S1 (0.4 nozzle)",
-		"Creality Ender-3 S1 Pro (0.4 nozzle)",
-		"Creality Ender-5 (0.4 nozzle)",
-		"Creality Ender-5 Plus (0.4 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.4 nozzle)",
-		"Creality Ender-5S (0.4 nozzle)",
-		"Creality Ender-5 S1 (0.4 nozzle)",
-		"Creality Ender-6 (0.4 nozzle)",
-		"Creality Ender-7 (0.4 nozzle)",
-		"Creality K1 (0.4 nozzle)",
-		"Creality K1 Max (0.4 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @0.6 nozzle.json b/resources/profiles/Creality/filament/Creality Generic PLA @0.6 nozzle.json
deleted file mode 100644
index c6c9f9d94f7..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic PLA @0.6 nozzle.json	
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic PLA @0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic PLA",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["12"],
-	"slow_down_layer_time": ["8"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.6 nozzle)",
-		"Creality CR-6 Max (0.6 nozzle)",
-		"Creality CR-10 V2 (0.6 nozzle)",
-		"Creality CR-10 Max (0.6 nozzle)",
-		"Creality CR-10 Smart Pro (0.6 nozzle)",
-		"Creality Ender-3 V2 (0.6 nozzle)",
-		"Creality Ender-3 S1 (0.6 nozzle)",
-		"Creality Ender-3 S1 Pro (0.6 nozzle)",
-		"Creality Ender-5 (0.6 nozzle)",
-		"Creality Ender-5 Plus (0.6 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.6 nozzle)",
-		"Creality Ender-5S (0.6 nozzle)",
-		"Creality Ender-5 S1 (0.6 nozzle)",
-		"Creality Ender-6 (0.6 nozzle)",
-		"Creality Ender-7 (0.6 nozzle)",
-		"Creality K1 (0.6 nozzle)",
-		"Creality K1 Max (0.6 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @0.8 nozzle.json b/resources/profiles/Creality/filament/Creality Generic PLA @0.8 nozzle.json
deleted file mode 100644
index e8be1c8e624..00000000000
--- a/resources/profiles/Creality/filament/Creality Generic PLA @0.8 nozzle.json	
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSA04",
-	"name": "Creality Generic PLA @0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Creality Generic PLA",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["12"],
-	"slow_down_layer_time": ["8"],
-	"compatible_printers": [
-		"Creality CR-6 SE (0.8 nozzle)",
-		"Creality CR-6 Max (0.8 nozzle)",
-		"Creality CR-10 V2 (0.8 nozzle)",
-		"Creality CR-10 Max (0.8 nozzle)",
-		"Creality CR-10 Smart Pro (0.8 nozzle)",
-		"Creality Ender-3 V2 (0.8 nozzle)",
-		"Creality Ender-3 S1 (0.8 nozzle)",
-		"Creality Ender-3 S1 Pro (0.8 nozzle)",
-		"Creality Ender-5 (0.8 nozzle)",
-		"Creality Ender-5 Plus (0.8 nozzle)",
-		"Creality Ender-5 Pro (2019) (0.8 nozzle)",
-		"Creality Ender-5S (0.8 nozzle)",
-		"Creality Ender-5 S1 (0.8 nozzle)",
-		"Creality Ender-6 (0.8 nozzle)",
-		"Creality Ender-7 (0.8 nozzle)",
-		"Creality K1 (0.8 nozzle)",
-		"Creality K1 Max (0.8 nozzle)"
-	]
-}
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA.json b/resources/profiles/Creality/filament/Creality Generic PLA.json
index 25f27b97d6a..2ae330a4872 100644
--- a/resources/profiles/Creality/filament/Creality Generic PLA.json	
+++ b/resources/profiles/Creality/filament/Creality Generic PLA.json	
@@ -8,5 +8,25 @@
 	"inherits": "fdm_filament_pla",
 	"filament_flow_ratio": ["0.98"],
 	"filament_max_volumetric_speed": ["12"],
-	"slow_down_layer_time": ["8"]
+	"slow_down_layer_time": ["8"],
+	"compatible_printers": [
+		"Creality CR-10 V2 0.4 nozzle",
+		"Creality CR-10 Max 0.4 nozzle",
+		"Creality Ender-3 V2 0.4 nozzle",
+		"Creality Ender-3 S1 0.4 nozzle",
+		"Creality Ender-3 S1 Pro 0.4 nozzle",
+		"Creality Ender-5 0.4 nozzle",
+		"Creality Ender-5 Plus 0.4 nozzle",
+		"Creality Ender-5 Pro (2019) 0.4 nozzle",
+		"Creality Ender-5S 0.4 nozzle",
+		"Creality Ender-5 S1 0.4 nozzle",
+		"Creality Ender-6 0.4 nozzle",
+		"Creality K1 (0.4 nozzle)",
+		"Creality K1 (0.6 nozzle)",
+		"Creality K1 (0.8 nozzle)",
+		"Creality K1 Max (0.4 nozzle)",
+		"Creality K1 Max (0.6 nozzle)",
+		"Creality K1 Max (0.8 nozzle)"
+		
+	]
 }
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json
index 53cd78d132d..ed9cb58b822 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json	
@@ -41,7 +41,7 @@
 	"single_extruder_multi_material": "0",
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA @0.4 nozzle"],
+	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0"
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json
index 6dcd5b2a085..982f876fcc3 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json	
@@ -42,7 +42,7 @@
 	"single_extruder_multi_material": "0",
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA @0.6 nozzle"],
+	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0"
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json
index 1760d60aee5..21d963cb478 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json	
@@ -41,7 +41,7 @@
 	"single_extruder_multi_material": "0",
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA @0.8 nozzle"],
+	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0"
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json
index 0c07c8ac9d0..f6b60e86681 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json	
@@ -41,7 +41,7 @@
 	"single_extruder_multi_material": "0",
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA @0.4 nozzle"],
+	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0"
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json
index fd0fea34554..958c6c11165 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json	
@@ -41,7 +41,7 @@
 	"single_extruder_multi_material": "0",
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA @0.6 nozzle"],
+	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0"
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json
index 1e5f0327f0b..1a5bf6c7843 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json	
@@ -41,7 +41,7 @@
 	"single_extruder_multi_material": "0",
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA @0.8 nozzle"],
+	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0"
diff --git a/resources/profiles/Creality/machine/fdm_creality_common.json b/resources/profiles/Creality/machine/fdm_creality_common.json
index 0e6f818147d..5b392f7c9e4 100644
--- a/resources/profiles/Creality/machine/fdm_creality_common.json
+++ b/resources/profiles/Creality/machine/fdm_creality_common.json
@@ -124,7 +124,7 @@
     "1"
   ],
   "default_filament_profile": [
-    "Generic PLA @Creality"
+    "Creality Generic PLA"
   ],
   "default_print_profile": "0.20mm Standard @Creality",
   "bed_exclude_area": [
diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json
index 550fbef128f..f1542ef1725 100644
--- a/resources/profiles/Elegoo.json
+++ b/resources/profiles/Elegoo.json
@@ -1,6 +1,6 @@
 {
 	"name": "Elegoo",
-	"version": "01.06.00.00",
+	"version": "01.07.00.00",
 	"force_update": "0",
 	"description": "Elegoo configurations",
 	"machine_model_list": [
@@ -495,54 +495,6 @@
 		{
 			"name": "Elegoo Generic PLA",
 			"sub_path": "filament/Elegoo Generic PLA.json"
-		},
-		{
-			"name": "Elegoo Generic PLA @0.8 nozzle",
-			"sub_path": "filament/Elegoo Generic PLA @0.8 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic PLA @0.6 nozzle",
-			"sub_path": "filament/Elegoo Generic PLA @0.6 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic PLA @0.4 nozzle",
-			"sub_path": "filament/Elegoo Generic PLA @0.4 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic PLA @0.2 nozzle",
-			"sub_path": "filament/Elegoo Generic PLA @0.2 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic PETG @0.8 nozzle",
-			"sub_path": "filament/Elegoo Generic PETG @0.8 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic PETG @0.6 nozzle",
-			"sub_path": "filament/Elegoo Generic PETG @0.6 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic PETG @0.4 nozzle",
-			"sub_path": "filament/Elegoo Generic PETG @0.4 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic PETG @0.2 nozzle",
-			"sub_path": "filament/Elegoo Generic PETG @0.2 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic ABS @0.8 nozzle",
-			"sub_path": "filament/Elegoo Generic ABS @0.8 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic ABS @0.6 nozzle",
-			"sub_path": "filament/Elegoo Generic ABS @0.6 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic ABS @0.4 nozzle",
-			"sub_path": "filament/Elegoo Generic ABS @0.4 nozzle.json"
-		},
-		{
-			"name": "Elegoo Generic ABS @0.2 nozzle",
-			"sub_path": "filament/Elegoo Generic ABS @0.2 nozzle.json"
 		}
 	],
 	"machine_list": [
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.2 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.2 nozzle.json
deleted file mode 100644
index 515b92bd1b5..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.2 nozzle.json	
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB99",
-	"setting_id": "GFSA04",
-	"name": "Elegoo Generic ABS @0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic ABS",
-	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"],
-	"nozzle_temperature_initial_layer": ["245"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.2 nozzle)",
-		"Elegoo Neptune X (0.2 nozzle)",
-		"Elegoo Neptune 2 (0.2 nozzle)",
-		"Elegoo Neptune 2S (0.2 nozzle)",
-		"Elegoo Neptune 2D (0.2 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.2 nozzle)",
-		"Elegoo Neptune 3 Pro (0.2 nozzle)",
-		"Elegoo Neptune 3 Plus (0.2 nozzle)",
-		"Elegoo Neptune 3 Max (0.2 nozzle)",
-		"Elegoo Neptune 4 (0.2 nozzle)",
-		"Elegoo Neptune 4 Pro (0.2 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.4 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.4 nozzle.json
deleted file mode 100644
index 6a43d551326..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.4 nozzle.json	
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB99",
-	"setting_id": "GFSA04",
-	"name": "Elegoo Generic ABS @0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic ABS",
-	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"],
-	"nozzle_temperature_initial_layer": ["245"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.4 nozzle)",
-		"Elegoo Neptune X (0.4 nozzle)",
-		"Elegoo Neptune 2 (0.4 nozzle)",
-		"Elegoo Neptune 2S (0.4 nozzle)",
-		"Elegoo Neptune 2D (0.4 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.4 nozzle)",
-		"Elegoo Neptune 3 Pro (0.4 nozzle)",
-		"Elegoo Neptune 3 Plus (0.4 nozzle)",
-		"Elegoo Neptune 3 Max (0.4 nozzle)",
-		"Elegoo Neptune 4 (0.4 nozzle)",
-		"Elegoo Neptune 4 Pro (0.4 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.6 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.6 nozzle.json
deleted file mode 100644
index a1e50a46108..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.6 nozzle.json	
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB99",
-	"setting_id": "GFSA04",
-	"name": "Elegoo Generic ABS @0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic ABS",
-	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"],
-	"nozzle_temperature_initial_layer": ["245"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.6 nozzle)",
-		"Elegoo Neptune X (0.6 nozzle)",
-		"Elegoo Neptune 2 (0.6 nozzle)",
-		"Elegoo Neptune 2S (0.6 nozzle)",
-		"Elegoo Neptune 2D (0.6 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.6 nozzle)",
-		"Elegoo Neptune 3 Pro (0.6 nozzle)",
-		"Elegoo Neptune 3 Plus (0.6 nozzle)",
-		"Elegoo Neptune 3 Max (0.6 nozzle)",
-		"Elegoo Neptune 4 (0.6 nozzle)",
-		"Elegoo Neptune 4 Pro (0.6 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.8 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.8 nozzle.json
deleted file mode 100644
index 6998d5ec976..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic ABS @0.8 nozzle.json	
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB99",
-	"setting_id": "GFSA04",
-	"name": "Elegoo Generic ABS @0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic ABS",
-	"filament_flow_ratio": ["0.926"],
-	"filament_max_volumetric_speed": ["12"],
-	"nozzle_temperature_initial_layer": ["245"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.8 nozzle)",
-		"Elegoo Neptune X (0.8 nozzle)",
-		"Elegoo Neptune 2 (0.8 nozzle)",
-		"Elegoo Neptune 2S (0.8 nozzle)",
-		"Elegoo Neptune 2D (0.8 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.8 nozzle)",
-		"Elegoo Neptune 3 Pro (0.8 nozzle)",
-		"Elegoo Neptune 3 Plus (0.8 nozzle)",
-		"Elegoo Neptune 3 Max (0.8 nozzle)",
-		"Elegoo Neptune 4 (0.8 nozzle)",
-		"Elegoo Neptune 4 Pro (0.8 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ABS.json b/resources/profiles/Elegoo/filament/Elegoo Generic ABS.json
index b551292c062..ae634c32bea 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic ABS.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo Generic ABS.json	
@@ -8,5 +8,24 @@
 	"inherits": "fdm_filament_abs",
 	"filament_flow_ratio": ["0.926"],
 	"filament_max_volumetric_speed": ["12"],
-	"nozzle_temperature_initial_layer": ["245"]
+	"nozzle_temperature_initial_layer": ["245"],
+	"compatible_printers": [
+		"Elegoo Neptune 0.4 nozzle",
+		"Elegoo Neptune X 0.4 nozzle",
+		"Elegoo Neptune 2 0.4 nozzle",
+		"Elegoo Neptune 2S 0.4 nozzle",
+		"Elegoo Neptune 2D 0.4 nozzle",
+		"Elegoo Neptune 3 0.4 nozzle",
+		"Elegoo Neptune 3 Pro 0.4 nozzle",
+		"Elegoo Neptune 3 Plus 0.4 nozzle",
+		"Elegoo Neptune 3 Max 0.4 nozzle",
+		"Elegoo Neptune 4 (0.2 nozzle)",
+		"Elegoo Neptune 4 (0.4 nozzle)",
+		"Elegoo Neptune 4 (0.6 nozzle)",
+		"Elegoo Neptune 4 (0.8 nozzle)",
+		"Elegoo Neptune 4 Pro (0.2 nozzle)",
+		"Elegoo Neptune 4 Pro (0.4 nozzle)",
+		"Elegoo Neptune 4 Pro (0.6 nozzle)",
+		"Elegoo Neptune 4 Pro (0.8 nozzle)"
+	]
 }
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.2 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.2 nozzle.json
deleted file mode 100644
index 0ae162ae0f5..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.2 nozzle.json	
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFG99",
-	"setting_id": "GFSG99",
-	"name": "Elegoo Generic PETG @0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic PETG",
-	"reduce_fan_stop_start_freq": ["1"],
-	"slow_down_for_layer_cooling": ["1"],
-	"fan_cooling_layer_time": ["30"],
-	"overhang_fan_speed": ["90"],
-	"overhang_fan_threshold": ["25%"],
-	"nozzle_temperature_initial_layer": ["240"],
-	"fan_max_speed": ["50"],
-	"fan_min_speed": ["20"],
-	"slow_down_min_speed": ["10"],
-	"slow_down_layer_time": ["8"],
-	"filament_flow_ratio": ["0.95"],
-	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.2 nozzle)",
-		"Elegoo Neptune X (0.2 nozzle)",
-		"Elegoo Neptune 2 (0.2 nozzle)",
-		"Elegoo Neptune 2S (0.2 nozzle)",
-		"Elegoo Neptune 2D (0.2 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.2 nozzle)",
-		"Elegoo Neptune 3 Pro (0.2 nozzle)",
-		"Elegoo Neptune 3 Plus (0.2 nozzle)",
-		"Elegoo Neptune 3 Max (0.2 nozzle)",
-		"Elegoo Neptune 4 (0.2 nozzle)",
-		"Elegoo Neptune 4 Pro (0.2 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.4 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.4 nozzle.json
deleted file mode 100644
index 9b8732731a3..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.4 nozzle.json	
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFG99",
-	"setting_id": "GFSG99",
-	"name": "Elegoo Generic PETG @0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic PETG",
-	"reduce_fan_stop_start_freq": ["1"],
-	"slow_down_for_layer_cooling": ["1"],
-	"fan_cooling_layer_time": ["30"],
-	"overhang_fan_speed": ["90"],
-	"overhang_fan_threshold": ["25%"],
-	"nozzle_temperature_initial_layer": ["240"],
-	"fan_max_speed": ["50"],
-	"fan_min_speed": ["20"],
-	"slow_down_min_speed": ["10"],
-	"slow_down_layer_time": ["8"],
-	"filament_flow_ratio": ["0.95"],
-	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.4 nozzle)",
-		"Elegoo Neptune X (0.4 nozzle)",
-		"Elegoo Neptune 2 (0.4 nozzle)",
-		"Elegoo Neptune 2S (0.4 nozzle)",
-		"Elegoo Neptune 2D (0.4 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.4 nozzle)",
-		"Elegoo Neptune 3 Pro (0.4 nozzle)",
-		"Elegoo Neptune 3 Plus (0.4 nozzle)",
-		"Elegoo Neptune 3 Max (0.4 nozzle)",
-		"Elegoo Neptune 4 (0.4 nozzle)",
-		"Elegoo Neptune 4 Pro (0.4 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.6 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.6 nozzle.json
deleted file mode 100644
index 3e073b6cb0b..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.6 nozzle.json	
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFG99",
-	"setting_id": "GFSG99",
-	"name": "Elegoo Generic PETG @0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic PETG",
-	"reduce_fan_stop_start_freq": ["1"],
-	"slow_down_for_layer_cooling": ["1"],
-	"fan_cooling_layer_time": ["30"],
-	"overhang_fan_speed": ["90"],
-	"overhang_fan_threshold": ["25%"],
-	"nozzle_temperature_initial_layer": ["240"],
-	"fan_max_speed": ["50"],
-	"fan_min_speed": ["20"],
-	"slow_down_min_speed": ["10"],
-	"slow_down_layer_time": ["8"],
-	"filament_flow_ratio": ["0.95"],
-	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.6 nozzle)",
-		"Elegoo Neptune X (0.6 nozzle)",
-		"Elegoo Neptune 2 (0.6 nozzle)",
-		"Elegoo Neptune 2S (0.6 nozzle)",
-		"Elegoo Neptune 2D (0.6 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.6 nozzle)",
-		"Elegoo Neptune 3 Pro (0.6 nozzle)",
-		"Elegoo Neptune 3 Plus (0.6 nozzle)",
-		"Elegoo Neptune 3 Max (0.6 nozzle)",
-		"Elegoo Neptune 4 (0.6 nozzle)",
-		"Elegoo Neptune 4 Pro (0.6 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.8 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.8 nozzle.json
deleted file mode 100644
index a3fa7a8f678..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG @0.8 nozzle.json	
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFG99",
-	"setting_id": "GFSG99",
-	"name": "Elegoo Generic PETG @0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic PETG",
-	"reduce_fan_stop_start_freq": ["1"],
-	"slow_down_for_layer_cooling": ["1"],
-	"fan_cooling_layer_time": ["30"],
-	"overhang_fan_speed": ["90"],
-	"overhang_fan_threshold": ["25%"],
-	"nozzle_temperature_initial_layer": ["240"],
-	"fan_max_speed": ["50"],
-	"fan_min_speed": ["20"],
-	"slow_down_min_speed": ["10"],
-	"slow_down_layer_time": ["8"],
-	"filament_flow_ratio": ["0.95"],
-	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.8 nozzle)",
-		"Elegoo Neptune X (0.8 nozzle)",
-		"Elegoo Neptune 2 (0.8 nozzle)",
-		"Elegoo Neptune 2S (0.8 nozzle)",
-		"Elegoo Neptune 2D (0.8 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.8 nozzle)",
-		"Elegoo Neptune 3 Pro (0.8 nozzle)",
-		"Elegoo Neptune 3 Plus (0.8 nozzle)",
-		"Elegoo Neptune 3 Max (0.8 nozzle)",
-		"Elegoo Neptune 4 (0.8 nozzle)",
-		"Elegoo Neptune 4 Pro (0.8 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG.json b/resources/profiles/Elegoo/filament/Elegoo Generic PETG.json
index 2397a615615..babbe2a5848 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo Generic PETG.json	
@@ -18,5 +18,24 @@
 	"slow_down_layer_time": ["8"],
 	"filament_flow_ratio": ["0.95"],
 	"filament_max_volumetric_speed": ["10"],
-	"filament_start_gcode": ["; filament start gcode\n"]
+	"filament_start_gcode": ["; filament start gcode\n"],
+	"compatible_printers": [
+		"Elegoo Neptune 0.4 nozzle",
+		"Elegoo Neptune X 0.4 nozzle",
+		"Elegoo Neptune 2 0.4 nozzle",
+		"Elegoo Neptune 2S 0.4 nozzle",
+		"Elegoo Neptune 2D 0.4 nozzle",
+		"Elegoo Neptune 3 0.4 nozzle",
+		"Elegoo Neptune 3 Pro 0.4 nozzle",
+		"Elegoo Neptune 3 Plus 0.4 nozzle",
+		"Elegoo Neptune 3 Max 0.4 nozzle",
+		"Elegoo Neptune 4 (0.2 nozzle)",
+		"Elegoo Neptune 4 (0.4 nozzle)",
+		"Elegoo Neptune 4 (0.6 nozzle)",
+		"Elegoo Neptune 4 (0.8 nozzle)",
+		"Elegoo Neptune 4 Pro (0.2 nozzle)",
+		"Elegoo Neptune 4 Pro (0.4 nozzle)",
+		"Elegoo Neptune 4 Pro (0.6 nozzle)",
+		"Elegoo Neptune 4 Pro (0.8 nozzle)"
+	]
 }
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.2 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.2 nozzle.json
deleted file mode 100644
index 5cbec1ac782..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.2 nozzle.json	
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSL99",
-	"name": "Elegoo Generic PLA @0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic PLA",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["15"],
-	"nozzle_temperature_initial_layer": ["210"],
-	"slow_down_layer_time": ["8"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.2 nozzle)",
-		"Elegoo Neptune X (0.2 nozzle)",
-		"Elegoo Neptune 2 (0.2 nozzle)",
-		"Elegoo Neptune 2S (0.2 nozzle)",
-		"Elegoo Neptune 2D (0.2 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.2 nozzle)",
-		"Elegoo Neptune 3 Pro (0.2 nozzle)",
-		"Elegoo Neptune 3 Plus (0.2 nozzle)",
-		"Elegoo Neptune 3 Max (0.2 nozzle)",
-		"Elegoo Neptune 4 (0.2 nozzle)",
-		"Elegoo Neptune 4 Pro (0.2 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.4 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.4 nozzle.json
deleted file mode 100644
index 8311428a8cf..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.4 nozzle.json	
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSL99",
-	"name": "Elegoo Generic PLA @0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic PLA",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["15"],
-	"nozzle_temperature_initial_layer": ["210"],
-	"slow_down_layer_time": ["8"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.4 nozzle)",
-		"Elegoo Neptune X (0.4 nozzle)",
-		"Elegoo Neptune 2 (0.4 nozzle)",
-		"Elegoo Neptune 2S (0.4 nozzle)",
-		"Elegoo Neptune 2D (0.4 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.4 nozzle)",
-		"Elegoo Neptune 3 Pro (0.4 nozzle)",
-		"Elegoo Neptune 3 Plus (0.4 nozzle)",
-		"Elegoo Neptune 3 Max (0.4 nozzle)",
-		"Elegoo Neptune 4 (0.4 nozzle)",
-		"Elegoo Neptune 4 Pro (0.4 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.6 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.6 nozzle.json
deleted file mode 100644
index a3507081e1c..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.6 nozzle.json	
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSL99",
-	"name": "Elegoo Generic PLA @0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic PLA",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["15"],
-	"nozzle_temperature_initial_layer": ["210"],
-	"slow_down_layer_time": ["8"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.6 nozzle)",
-		"Elegoo Neptune X (0.6 nozzle)",
-		"Elegoo Neptune 2 (0.6 nozzle)",
-		"Elegoo Neptune 2S (0.6 nozzle)",
-		"Elegoo Neptune 2D (0.6 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.6 nozzle)",
-		"Elegoo Neptune 3 Pro (0.6 nozzle)",
-		"Elegoo Neptune 3 Plus (0.6 nozzle)",
-		"Elegoo Neptune 3 Max (0.6 nozzle)",
-		"Elegoo Neptune 4 (0.6 nozzle)",
-		"Elegoo Neptune 4 Pro (0.6 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.8 nozzle.json b/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.8 nozzle.json
deleted file mode 100644
index 6739abc9040..00000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA @0.8 nozzle.json	
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSL99",
-	"name": "Elegoo Generic PLA @0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "Elegoo Generic PLA",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["15"],
-	"nozzle_temperature_initial_layer": ["210"],
-	"slow_down_layer_time": ["8"],
-	"compatible_printers": [
-		"Elegoo Neptune (0.8 nozzle)",
-		"Elegoo Neptune X (0.8 nozzle)",
-		"Elegoo Neptune 2 (0.8 nozzle)",
-		"Elegoo Neptune 2S (0.8 nozzle)",
-		"Elegoo Neptune 2D (0.8 nozzle) (Dual)",
-		"Elegoo Neptune 3 (0.8 nozzle)",
-		"Elegoo Neptune 3 Pro (0.8 nozzle)",
-		"Elegoo Neptune 3 Plus (0.8 nozzle)",
-		"Elegoo Neptune 3 Max (0.8 nozzle)",
-		"Elegoo Neptune 4 (0.8 nozzle)",
-		"Elegoo Neptune 4 Pro (0.8 nozzle)"
-	]
-}
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA.json b/resources/profiles/Elegoo/filament/Elegoo Generic PLA.json
index 8f026cdabc0..1cc2b4f6afb 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo Generic PLA.json	
@@ -9,5 +9,24 @@
 	"filament_flow_ratio": ["0.98"],
 	"filament_max_volumetric_speed": ["15"],
 	"nozzle_temperature_initial_layer": ["210"],
-	"slow_down_layer_time": ["8"]
+	"slow_down_layer_time": ["8"],
+	"compatible_printers": [
+		"Elegoo Neptune 0.4 nozzle",
+		"Elegoo Neptune X 0.4 nozzle",
+		"Elegoo Neptune 2 0.4 nozzle",
+		"Elegoo Neptune 2S 0.4 nozzle",
+		"Elegoo Neptune 2D 0.4 nozzle",
+		"Elegoo Neptune 3 0.4 nozzle",
+		"Elegoo Neptune 3 Pro 0.4 nozzle",
+		"Elegoo Neptune 3 Plus 0.4 nozzle",
+		"Elegoo Neptune 3 Max 0.4 nozzle",
+		"Elegoo Neptune 4 (0.2 nozzle)",
+		"Elegoo Neptune 4 (0.4 nozzle)",
+		"Elegoo Neptune 4 (0.6 nozzle)",
+		"Elegoo Neptune 4 (0.8 nozzle)",
+		"Elegoo Neptune 4 Pro (0.2 nozzle)",
+		"Elegoo Neptune 4 Pro (0.4 nozzle)",
+		"Elegoo Neptune 4 Pro (0.6 nozzle)",
+		"Elegoo Neptune 4 Pro (0.8 nozzle)"
+	]
 }
diff --git a/resources/profiles/Prusa/MK4IS_cover.png b/resources/profiles/Prusa/MK4IS_cover.png
index 8ef29303823..bf6967e3bcd 100644
Binary files a/resources/profiles/Prusa/MK4IS_cover.png and b/resources/profiles/Prusa/MK4IS_cover.png differ
diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json
index 4aabc76a312..25d60ee197f 100644
--- a/resources/profiles/Qidi.json
+++ b/resources/profiles/Qidi.json
@@ -1,6 +1,6 @@
 {
     "name": "Qidi",
-    "version": "01.06.05.01",
+    "version": "01.07.00.00",
     "force_update": "0",
     "description": "Qidi configurations",
     "machine_model_list": [
diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json
index 55abfdcf6c4..47dd32d0a62 100644
--- a/resources/profiles/Ratrig.json
+++ b/resources/profiles/Ratrig.json
@@ -1,6 +1,6 @@
 {
     "name": "RatRig",
-    "version": "01.06.05.01",
+    "version": "01.07.00.00",
     "force_update": "0",
     "description": "RatRig configurations",
     "machine_model_list": [
@@ -151,23 +151,23 @@
             "sub_path": "machine/fdm_klipper_common.json"
         },
 		{
-            "name": "RatRig V-Core 3 200",
+            "name": "RatRig V-Core 3 200 0.4 nozzle",
             "sub_path": "machine/RatRig V-Core 3 200 0.4 nozzle.json"
         },
         {
-            "name": "RatRig V-Core 3 300",
+            "name": "RatRig V-Core 3 300 0.4 nozzle",
             "sub_path": "machine/RatRig V-Core 3 300 0.4 nozzle.json"
         },
         {
-            "name": "RatRig V-Core 3 400",
+            "name": "RatRig V-Core 3 400 0.4 nozzle",
             "sub_path": "machine/RatRig V-Core 3 400 0.4 nozzle.json"
         },
         {
-            "name": "RatRig V-Core 3 500",
+            "name": "RatRig V-Core 3 500 0.4 nozzle",
             "sub_path": "machine/RatRig V-Core 3 500 0.4 nozzle.json"
         },
         {
-            "name": "RatRig V-Minion",
+            "name": "RatRig V-Minion 0.4 nozzle",
             "sub_path": "machine/RatRig V-Minion 0.4 nozzle.json"
         },
         {
@@ -178,5 +178,5 @@
             "name": "RatRig V-Cast 0.6 nozzle",
             "sub_path": "machine/RatRig V-Cast 0.6 nozzle.json"
         }
-		    ]
+    ]
 }