Allow Unsigned Executable Memory in the macOS Entitlements

The Bambu network plug-in's code protector rewrites one page of its own signed __TEXT after loading. The hardened runtime tolerates that until the page is evicted; the next read of it then kills OrcaSlicer with CODESIGNING Invalid Page. Bambu Studio signs with allow-unsigned-executable-memory for this reason; with it added, the same build survives critical memory pressure that killed it in 30 s without.
Match style of height range modifier section on sidebar (#15703 )
2026-10-06 15:21:09 +00:00 · 2026-10-06 16:46:15 +08:00 · 2026-10-06 11:00:04 +03:00
71 changed files with 93 additions and 583 deletions
@@ -36,13 +36,8 @@ override is not available in these profiles. The source's `EXCLUDE_E_START` and
 `EXCLUDE_E_END` internal markers become comments rather than printer commands.

 Pressure-advance restoration and automatic pressure-advance emission use the
-selected filament preset's settings. The INDX filament presets include
-`fdm_filament_template_indx`, whose start G-code sets the filament's pressure
-advance with `M572` and then starts the firmware's automatic calibration with
-`M573 R`, the commands PrusaSlicer emits after a tool change; the station purge
-disables pressure advance before it. The template also carries Prusa's
-multi-tool ramming and a 10 mm³ minimal purge. These profiles do not impose
-machine-owned filament overrides. Dock-fan control retains the source's material and layer
+selected filament preset's settings. These profiles do not impose machine-owned
+filament overrides. Dock-fan control retains the source's material and layer
 conditions; shutdown parks the tool and turns off the used heaters and dock fan.

 ## Configuration boundaries
@@ -1,6 +1,6 @@
 {
 	"name": "Prusa",
-	"version": "02.04.00.16",
+	"version": "02.04.00.15",
 	"force_update": "0",
 	"description": "Prusa configurations",
 	"machine_model_list": [
@@ -1573,32 +1573,48 @@
 	],
 	"filament_list": [
 		{
-			"name": "Generic PC @Prusa",
-			"sub_path": "filament/Generic PC @Prusa.json"
+			"name": "Generic ASA @Prusa CORE One",
+			"sub_path": "filament/Generic ASA @Prusa CORE One.json"
+		},
+		{
+			"name": "Generic PLA Silk @Prusa CORE One",
+			"sub_path": "filament/Generic PLA Silk @Prusa CORE One.json"
 		},
 		{
 			"name": "fdm_filament_common",
 			"sub_path": "filament/fdm_filament_common.json"
 		},
 		{
-			"name": "fdm_filament_template_indx",
-			"sub_path": "filament/fdm_filament_template_indx.json"
+			"name": "Generic ASA @Prusa CORE One 0.6",
+			"sub_path": "filament/Generic ASA @Prusa CORE One 0.6.json"
 		},
 		{
-			"name": "fdm_filament_template_nextruder_pet",
-			"sub_path": "filament/fdm_filament_template_nextruder_pet.json"
+			"name": "Generic ASA @Prusa CORE One 0.8",
+			"sub_path": "filament/Generic ASA @Prusa CORE One 0.8.json"
 		},
 		{
-			"name": "fdm_filament_template_nextruder_pet_hf",
-			"sub_path": "filament/fdm_filament_template_nextruder_pet_hf.json"
+			"name": "Generic ASA @Prusa CORE One HF 0.4",
+			"sub_path": "filament/Generic ASA @Prusa CORE One HF 0.4.json"
 		},
 		{
-			"name": "fdm_filament_template_nextruder_pla",
-			"sub_path": "filament/fdm_filament_template_nextruder_pla.json"
+			"name": "Generic ASA @Prusa CORE One HF 0.5",
+			"sub_path": "filament/Generic ASA @Prusa CORE One HF 0.5.json"
 		},
 		{
-			"name": "fdm_filament_template_nextruder_pla_hf",
-			"sub_path": "filament/fdm_filament_template_nextruder_pla_hf.json"
+			"name": "Generic ASA @Prusa CORE One HF 0.6",
+			"sub_path": "filament/Generic ASA @Prusa CORE One HF 0.6.json"
+		},
+		{
+			"name": "Generic ASA @Prusa CORE One HF 0.8",
+			"sub_path": "filament/Generic ASA @Prusa CORE One HF 0.8.json"
+		},
+		{
+			"name": "Generic PLA Silk @Prusa CORE One 0.6",
+			"sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.6.json"
+		},
+		{
+			"name": "Generic PLA Silk @Prusa CORE One 0.8",
+			"sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.8.json"
 		},
 		{
 			"name": "fdm_filament_abs",
@@ -1648,22 +1664,6 @@
 			"name": "fdm_filament_tpu",
 			"sub_path": "filament/fdm_filament_tpu.json"
 		},
-		{
-			"name": "Generic PLA Silk @Prusa CORE One INDX",
-			"sub_path": "filament/Generic PLA Silk @Prusa CORE One INDX.json"
-		},
-		{
-			"name": "Generic ASA @Prusa CORE One",
-			"sub_path": "filament/Generic ASA @Prusa CORE One.json"
-		},
-		{
-			"name": "Generic PC @Prusa MK4 MMU3",
-			"sub_path": "filament/Generic PC @Prusa MK4 MMU3.json"
-		},
-		{
-			"name": "Generic PLA Silk @Prusa CORE One",
-			"sub_path": "filament/Generic PLA Silk @Prusa CORE One.json"
-		},
 		{
 			"name": "Generic ABS @Prusa MK3.5",
 			"sub_path": "filament/Generic ABS @Prusa MK3.5.json"
@@ -2160,38 +2160,6 @@
 			"name": "Generic TPU HF @Prusa MK3.5",
 			"sub_path": "filament/Generic TPU HF @Prusa MK3.5.json"
 		},
-		{
-			"name": "Generic ASA @Prusa CORE One 0.6",
-			"sub_path": "filament/Generic ASA @Prusa CORE One 0.6.json"
-		},
-		{
-			"name": "Generic ASA @Prusa CORE One 0.8",
-			"sub_path": "filament/Generic ASA @Prusa CORE One 0.8.json"
-		},
-		{
-			"name": "Generic ASA @Prusa CORE One HF 0.4",
-			"sub_path": "filament/Generic ASA @Prusa CORE One HF 0.4.json"
-		},
-		{
-			"name": "Generic ASA @Prusa CORE One HF 0.5",
-			"sub_path": "filament/Generic ASA @Prusa CORE One HF 0.5.json"
-		},
-		{
-			"name": "Generic ASA @Prusa CORE One HF 0.6",
-			"sub_path": "filament/Generic ASA @Prusa CORE One HF 0.6.json"
-		},
-		{
-			"name": "Generic ASA @Prusa CORE One HF 0.8",
-			"sub_path": "filament/Generic ASA @Prusa CORE One HF 0.8.json"
-		},
-		{
-			"name": "Generic PLA Silk @Prusa CORE One 0.6",
-			"sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.6.json"
-		},
-		{
-			"name": "Generic PLA Silk @Prusa CORE One 0.8",
-			"sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.8.json"
-		},
 		{
 			"name": "Generic ABS @Prusa MK4S HF0.4",
 			"sub_path": "filament/Generic ABS @Prusa MK4S HF0.4.json"
@@ -2244,10 +2212,6 @@
 			"name": "Generic ABS HF @Prusa MINIIS 0.8",
 			"sub_path": "filament/Generic ABS HF @Prusa MINIIS 0.8.json"
 		},
-		{
-			"name": "Generic ASA @Prusa MK4 MMU3",
-			"sub_path": "filament/Generic ASA @Prusa MK4 MMU3.json"
-		},
 		{
 			"name": "Generic ASA @Prusa MK4S 0.6",
 			"sub_path": "filament/Generic ASA @Prusa MK4S 0.6.json"
@@ -2296,10 +2260,6 @@
 			"name": "Prusament ASA @CORE One HF 0.8",
 			"sub_path": "filament/Prusament ASA @CORE One HF 0.8.json"
 		},
-		{
-			"name": "Prusament ASA @MK4 MMU3",
-			"sub_path": "filament/Prusament ASA @MK4 MMU3.json"
-		},
 		{
 			"name": "Prusament ASA @MK4S 0.6",
 			"sub_path": "filament/Prusament ASA @MK4S 0.6.json"
@@ -2432,10 +2392,6 @@
 			"name": "Prusament PC Blend @CORE One HF 0.8",
 			"sub_path": "filament/Prusament PC Blend @CORE One HF 0.8.json"
 		},
-		{
-			"name": "Prusament PC Blend @MK4 MMU3",
-			"sub_path": "filament/Prusament PC Blend @MK4 MMU3.json"
-		},
 		{
 			"name": "Prusament PC Blend @MK4S 0.6",
 			"sub_path": "filament/Prusament PC Blend @MK4S 0.6.json"
@@ -2576,10 +2532,6 @@
 			"name": "Prusament PETG @CORE One HF 0.8",
 			"sub_path": "filament/Prusament PETG @CORE One HF 0.8.json"
 		},
-		{
-			"name": "Prusament PETG @MK4 MMU3",
-			"sub_path": "filament/Prusament PETG @MK4 MMU3.json"
-		},
 		{
 			"name": "Prusament PETG @MK4S 0.6",
 			"sub_path": "filament/Prusament PETG @MK4S 0.6.json"
@@ -2716,10 +2668,6 @@
 			"name": "Prusament PLA @CORE One HF 0.8",
 			"sub_path": "filament/Prusament PLA @CORE One HF 0.8.json"
 		},
-		{
-			"name": "Prusament PLA @MK4 MMU3",
-			"sub_path": "filament/Prusament PLA @MK4 MMU3.json"
-		},
 		{
 			"name": "Prusament PLA @MK4S 0.6",
 			"sub_path": "filament/Prusament PLA @MK4S 0.6.json"
@@ -2756,10 +2704,6 @@
 			"name": "Prusament rPLA @CORE One 0.8",
 			"sub_path": "filament/Prusament rPLA @CORE One 0.8.json"
 		},
-		{
-			"name": "Prusament rPLA @MK4 MMU3",
-			"sub_path": "filament/Prusament rPLA @MK4 MMU3.json"
-		},
 		{
 			"name": "Prusament rPLA @MK4S 0.6",
 			"sub_path": "filament/Prusament rPLA @MK4S 0.6.json"
@@ -2912,10 +2856,6 @@
 			"name": "Generic ABS @Prusa CORE One HF 0.8",
 			"sub_path": "filament/Generic ABS @Prusa CORE One HF 0.8.json"
 		},
-		{
-			"name": "Generic ABS @Prusa MK4 MMU3",
-			"sub_path": "filament/Generic ABS @Prusa MK4 MMU3.json"
-		},
 		{
 			"name": "Generic ASA @Prusa MK4S HF0.5",
 			"sub_path": "filament/Generic ASA @Prusa MK4S HF0.5.json"
@@ -2964,10 +2904,6 @@
 			"name": "Generic PETG @Prusa CORE One HF 0.8",
 			"sub_path": "filament/Generic PETG @Prusa CORE One HF 0.8.json"
 		},
-		{
-			"name": "Generic PETG @Prusa MK4 MMU3",
-			"sub_path": "filament/Generic PETG @Prusa MK4 MMU3.json"
-		},
 		{
 			"name": "Generic PLA @Prusa MK4S HF0.5",
 			"sub_path": "filament/Generic PLA @Prusa MK4S HF0.5.json"
@@ -3012,10 +2948,6 @@
 			"name": "Generic PLA @Prusa CORE One HF 0.8",
 			"sub_path": "filament/Generic PLA @Prusa CORE One HF 0.8.json"
 		},
-		{
-			"name": "Generic PLA @Prusa MK4 MMU3",
-			"sub_path": "filament/Generic PLA @Prusa MK4 MMU3.json"
-		},
 		{
 			"name": "Generic TPU @Prusa CORE One 0.6",
 			"sub_path": "filament/Generic TPU @Prusa CORE One 0.6.json"
@@ -3023,6 +2955,14 @@
 		{
 			"name": "Generic TPU @Prusa CORE One 0.8",
 			"sub_path": "filament/Generic TPU @Prusa CORE One 0.8.json"
+		},
+		{
+			"name": "Generic PC @Prusa",
+			"sub_path": "filament/Generic PC @Prusa.json"
+		},
+		{
+			"name": "Generic PLA Silk @Prusa CORE One INDX",
+			"sub_path": "filament/Generic PLA Silk @Prusa CORE One INDX.json"
 		}
 	],
 	"machine_list": [
@@ -7,9 +7,6 @@
 	"setting_id": "ASYz8yASE82tQDII",
 	"filament_id": "OFY9muEs",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.4 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "mzZCm8XDmAR23YR6",
 	"filament_id": "OFY9muEs",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.5 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "gJhX2KBpk4wfXIj0",
 	"filament_id": "OFY9muEs",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.6 nozzle"
 	],
@@ -5,9 +5,6 @@
 	"from": "system",
 	"setting_id": "JEatvybG9xIkrPk3",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_indx"
-	],
 	"filament_cost": [
 		"34.65"
 	],
@@ -6,9 +6,6 @@
 	"from": "system",
 	"setting_id": "0k31oXq1pLQsHvrj",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
 	"chamber_temperature": [
 		"40"
 	],
@@ -1,19 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic ABS @Prusa MK4 MMU3",
-	"inherits": "Generic ABS @Prusa MK4",
-	"from": "system",
-	"setting_id": "uFmixo2FX1yxNsDB",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"35"
-	]
-}
@@ -7,9 +7,6 @@
 	"setting_id": "eKDfiVRE59itoppm",
 	"filament_id": "OFLPAxz3",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.4 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "ZjHf5Vvtf4ESNnWb",
 	"filament_id": "OFLPAxz3",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.5 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "aRDgUgQJWdNDJx5c",
 	"filament_id": "OFLPAxz3",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.6 nozzle"
 	],
@@ -6,9 +6,6 @@
 	"from": "system",
 	"setting_id": "Q7fgojkHRZI0floy",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
 	"chamber_temperature": [
 		"40"
 	],
@@ -1,19 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic ASA @Prusa MK4 MMU3",
-	"inherits": "Generic ASA @Prusa MK4",
-	"from": "system",
-	"setting_id": "iq9bFkpmAOJ4ae4g",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"35"
-	]
-}
@@ -1,16 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic PC @Prusa MK4 MMU3",
-	"inherits": "Generic PC @Prusa",
-	"from": "system",
-	"setting_id": "qMawlK9QPI7DcF8I",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	]
-}
@@ -7,9 +7,6 @@
 	"setting_id": "7oUyjvRHLH4bJyX0",
 	"filament_id": "OFYPdQJh",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.4 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "6HiIOGURZWwman1l",
 	"filament_id": "OFYPdQJh",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.5 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "KKiug7A9NOQPe1m7",
 	"filament_id": "OFYPdQJh",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.6 nozzle"
 	],
@@ -5,9 +5,6 @@
 	"from": "system",
 	"setting_id": "HbevqxqvYHuvRc3v",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_indx"
-	],
 	"filament_cost": [
 		"27.82"
 	],
@@ -6,9 +6,6 @@
 	"from": "system",
 	"setting_id": "W71PW5bpf7CV16D4",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
 	"chamber_temperature": [
 		"35"
 	],
@@ -1,19 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic PETG @Prusa MK4 MMU3",
-	"inherits": "Generic PETG @Prusa MK4",
-	"from": "system",
-	"setting_id": "lBiZBFpSXZNIp5XG",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"35"
-	]
-}
@@ -8,16 +8,12 @@
 	"filament_id": "OFDSrzZ8",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Prusa CORE One 0.6 nozzle",
-		"Prusa CORE One MMU3 0.6 nozzle"
+		"Prusa CORE One 0.6 nozzle"
 	],
 	"nozzle_temperature": [
 		"210"
 	],
 	"slow_down_layer_time": [
 		"15"
-	],
-	"filament_cooling_final_speed": [
-		"1.5"
 	]
 }
@@ -7,9 +7,6 @@
 	"setting_id": "vniEPaoyABoAfLFa",
 	"filament_id": "OFDSrzZ8",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.4 nozzle",
 		"Prusa CORE One L HF 0.4 nozzle"
@@ -7,9 +7,6 @@
 	"setting_id": "NPEs4gtBlKWupYZX",
 	"filament_id": "OFDSrzZ8",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.5 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "SnfULjrWGCiA7ljq",
 	"filament_id": "OFDSrzZ8",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.6 nozzle"
 	],
@@ -27,8 +24,5 @@
 	],
 	"slow_down_min_speed": [
 		"15"
-	],
-	"filament_cooling_final_speed": [
-		"1.5"
 	]
 }
@@ -5,9 +5,6 @@
 	"from": "system",
 	"setting_id": "4qjcaIf1vk3K1x4Z",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_indx"
-	],
 	"filament_cost": [
 		"25.4"
 	],
@@ -6,9 +6,6 @@
 	"from": "system",
 	"setting_id": "r2i4c7DsYXYIMVCX",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla"
-	],
 	"chamber_temperature": [
 		"20"
 	],
@@ -20,7 +17,8 @@
 		"Prusa CORE One L 0.4 nozzle",
 		"Prusa CORE One MMU3 0.4 nozzle",
 		"Prusa CORE One MMU3 0.25 nozzle",
-		"Prusa CORE One MMU3 0.3 nozzle"
+		"Prusa CORE One MMU3 0.3 nozzle",
+		"Prusa CORE One MMU3 0.6 nozzle"
 	],
 	"fan_cooling_layer_time": [
 		"40"
@@ -1,16 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic PLA @Prusa MK4 MMU3",
-	"inherits": "Generic PLA @Prusa MK4",
-	"from": "system",
-	"setting_id": "kZvIh84niJ487FsY",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	]
-}
@@ -29,8 +29,5 @@
 	],
 	"slow_down_layer_time": [
 		"15"
-	],
-	"filament_cooling_final_speed": [
-		"1.5"
 	]
 }
@@ -5,9 +5,6 @@
 	"from": "system",
 	"setting_id": "eKla6su22rYaL9iz",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_indx"
-	],
 	"filament_flow_ratio": [
 		"1",
 		"1",
@@ -6,9 +6,6 @@
 	"from": "system",
 	"setting_id": "F9lNHyhZwZi7aD74",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla"
-	],
 	"chamber_temperature": [
 		"20"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "tXktQXr79am1s5UL",
 	"filament_id": "OFmFwUWM",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.4 nozzle"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "YbyojtjXvEtI4Tt3",
 	"filament_id": "OFmFwUWM",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.5 nozzle"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "35H9TLr1p2Jy767g",
 	"filament_id": "OFmFwUWM",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.6 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "UUTjJ4Y8St3c87jD",
 	"filament_id": "OFmFwUWM",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
 	"chamber_temperature": [
 		"40"
 	],
@@ -1,19 +0,0 @@
-{
-	"type": "filament",
-	"name": "Prusament ASA @MK4 MMU3",
-	"inherits": "Prusament ASA @MK4",
-	"from": "system",
-	"setting_id": "IRJ2dtBgjCMfmpOH",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"35"
-	]
-}
@@ -7,9 +7,6 @@
 	"setting_id": "sNGgucQjiFXwuFkq",
 	"filament_id": "OF4MZtnE",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
 	"chamber_temperature": [
 		"40"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "pEsP537TBR5kozQB",
 	"filament_id": "OFvDbkFq",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.4 nozzle"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "3IfLi1ZVCKKbEBUW",
 	"filament_id": "OFvDbkFq",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.5 nozzle"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "Q8qWw2G7l2UvxGut",
 	"filament_id": "OFvDbkFq",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.6 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "x1SkWhSSkVVIPwCF",
 	"filament_id": "OFvDbkFq",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
 	"chamber_temperature": [
 		"40"
 	],
@@ -1,16 +0,0 @@
-{
-	"type": "filament",
-	"name": "Prusament PC Blend @MK4 MMU3",
-	"inherits": "Prusament PC Blend @MK4",
-	"from": "system",
-	"setting_id": "gmNuCspHHxgP6zH8",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	]
-}
@@ -7,9 +7,6 @@
 	"setting_id": "B8Cm9l8i9osp5J2q",
 	"filament_id": "OFdO6vpt",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
 	"chamber_temperature": [
 		"40"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "lwT1VxW5OkY36kUX",
 	"filament_id": "OFkR8E2c",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.4 nozzle"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "XAgW7fElXxhaKaBT",
 	"filament_id": "OFkR8E2c",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.5 nozzle"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "6aTGEZj2EmpTR1mu",
 	"filament_id": "OFkR8E2c",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.6 nozzle"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "LSvba9ds3XTwDMCG",
 	"filament_id": "OFkR8E2c",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
 	"chamber_temperature": [
 		"35"
 	],
@@ -1,19 +0,0 @@
-{
-	"type": "filament",
-	"name": "Prusament PETG @MK4 MMU3",
-	"inherits": "Prusament PETG @MK4",
-	"from": "system",
-	"setting_id": "7DQ6YEKyQKYDTKtE",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pet"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"35"
-	]
-}
@@ -6,9 +6,6 @@
 	"setting_id": "2viuOmBvXuQm2FwV",
 	"filament_id": "OFkR8E2c",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_indx"
-	],
 	"filament_flow_ratio": [
 		"1"
 	],
@@ -6,9 +6,6 @@
 	"setting_id": "mf4Muog4IcsgkYoA",
 	"filament_id": "OFnO4wnf",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla_hf"
-	],
 	"compatible_printers": [
 		"Prusa CORE One HF 0.4 nozzle",
 		"Prusa CORE One L HF 0.4 nozzle"
@@ -7,9 +7,6 @@
 	"setting_id": "PuujUMjNKLZvZNAH",
 	"filament_id": "OFnO4wnf",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla"
-	],
 	"chamber_temperature": [
 		"20"
 	],
@@ -107,11 +104,5 @@
 	],
 	"slow_down_min_speed": [
 		"20"
-	],
-	"filament_unloading_speed": [
-		"100"
-	],
-	"filament_unloading_speed_start": [
-		"100"
 	]
 }
@@ -1,22 +0,0 @@
-{
-	"type": "filament",
-	"name": "Prusament PLA @MK4 MMU3",
-	"inherits": "Prusament PLA @MK4",
-	"from": "system",
-	"setting_id": "MsDcN4npnmLRXOjm",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	],
-	"filament_unloading_speed": [
-		"100"
-	],
-	"filament_unloading_speed_start": [
-		"100"
-	]
-}
@@ -6,9 +6,6 @@
 	"setting_id": "B2UB9QUbbjpn12Ka",
 	"filament_id": "OFnO4wnf",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_indx"
-	],
 	"filament_flow_ratio": [
 		"1"
 	],
@@ -7,9 +7,6 @@
 	"setting_id": "085dGkrnPhatF07x",
 	"filament_id": "OFh7mvPO",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla"
-	],
 	"chamber_temperature": [
 		"20"
 	],
@@ -108,11 +105,5 @@
 	],
 	"slow_down_min_speed": [
 		"20"
-	],
-	"filament_unloading_speed": [
-		"60"
-	],
-	"filament_unloading_speed_start": [
-		"60"
 	]
 }
@@ -8,16 +8,12 @@
 	"instantiation": "true",
 	"compatible_printers": [
 		"Prusa CORE One 0.6 nozzle",
-		"Prusa CORE One HF 0.6 nozzle",
-		"Prusa CORE One MMU3 0.6 nozzle"
+		"Prusa CORE One HF 0.6 nozzle"
 	],
 	"filament_max_volumetric_speed": [
 		"14"
 	],
 	"slow_down_layer_time": [
 		"15"
-	],
-	"filament_cooling_final_speed": [
-		"1.5"
 	]
 }
@@ -7,9 +7,6 @@
 	"setting_id": "Bw6H4vFnq7YExyLd",
 	"filament_id": "OFWRITFw",
 	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla"
-	],
 	"chamber_temperature": [
 		"20"
 	],
@@ -25,7 +22,8 @@
 		"Prusa CORE One HF 0.5 nozzle",
 		"Prusa CORE One MMU3 0.4 nozzle",
 		"Prusa CORE One MMU3 0.25 nozzle",
-		"Prusa CORE One MMU3 0.3 nozzle"
+		"Prusa CORE One MMU3 0.3 nozzle",
+		"Prusa CORE One MMU3 0.6 nozzle"
 	],
 	"fan_cooling_layer_time": [
 		"40"
@@ -1,16 +0,0 @@
-{
-	"type": "filament",
-	"name": "Prusament rPLA @MK4 MMU3",
-	"inherits": "Prusament rPLA @MK4",
-	"from": "system",
-	"setting_id": "wKhvyGpgjmW6glLj",
-	"instantiation": "true",
-	"include": [
-		"fdm_filament_template_nextruder_pla"
-	],
-	"compatible_printers": [
-		"Prusa MK4 MMU3 0.4 nozzle",
-		"Prusa MK4 MMU3 0.6 nozzle",
-		"Prusa MK4 MMU3 HF0.4 nozzle"
-	]
-}
@@ -1,21 +0,0 @@
-{
-	"type": "filament",
-	"name": "fdm_filament_template_indx",
-	"from": "system",
-	"instantiation": "false",
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"30"
-	],
-	"filament_multitool_ramming_volume": [
-		"18"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"10"
-	],
-	"filament_start_gcode": [
-		"M572 S{pressure_advance[filament_extruder_id]} ; Pressure advance\nM573 R"
-	]
-}
@@ -1,36 +0,0 @@
-{
-	"type": "filament",
-	"name": "fdm_filament_template_nextruder_pet",
-	"from": "system",
-	"instantiation": "false",
-	"filament_ramming_parameters": [
-		"250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387"
-	],
-	"filament_loading_speed": [
-		"10"
-	],
-	"filament_loading_speed_start": [
-		"50"
-	],
-	"filament_unloading_speed": [
-		"60"
-	],
-	"filament_unloading_speed_start": [
-		"60"
-	],
-	"filament_cooling_moves": [
-		"3"
-	],
-	"filament_cooling_initial_speed": [
-		"5"
-	],
-	"filament_cooling_final_speed": [
-		"2.5"
-	],
-	"filament_stamping_distance": [
-		"45"
-	],
-	"filament_stamping_loading_speed": [
-		"26.5"
-	]
-}
@@ -1,9 +0,0 @@
-{
-	"type": "filament",
-	"name": "fdm_filament_template_nextruder_pet_hf",
-	"from": "system",
-	"instantiation": "false",
-	"filament_ramming_parameters": [
-		"250 100 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387"
-	]
-}
@@ -1,36 +0,0 @@
-{
-	"type": "filament",
-	"name": "fdm_filament_template_nextruder_pla",
-	"from": "system",
-	"instantiation": "false",
-	"filament_ramming_parameters": [
-		"250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419"
-	],
-	"filament_loading_speed": [
-		"10"
-	],
-	"filament_loading_speed_start": [
-		"50"
-	],
-	"filament_unloading_speed": [
-		"40"
-	],
-	"filament_unloading_speed_start": [
-		"30"
-	],
-	"filament_cooling_moves": [
-		"2"
-	],
-	"filament_cooling_initial_speed": [
-		"10"
-	],
-	"filament_cooling_final_speed": [
-		"3.5"
-	],
-	"filament_stamping_distance": [
-		"45"
-	],
-	"filament_stamping_loading_speed": [
-		"29"
-	]
-}
@@ -1,9 +0,0 @@
-{
-	"type": "filament",
-	"name": "fdm_filament_template_nextruder_pla_hf",
-	"from": "system",
-	"instantiation": "false",
-	"filament_ramming_parameters": [
-		"250 100 39.871 39.871| 0.05 39.9547 0.45 39.9547 0.95 39.9547 1.45 39.9547 1.95 39.9547 2.45 39.9547 2.95 39.9547 3.45 39.9547 3.95 39.9547 4.45 39.9547 4.95 39.9547"
-	]
-}
@@ -3,7 +3,7 @@
 	"name": "Prusa CORE One MMU3",
 	"bed_model": "coreone_bed.stl",
 	"bed_texture": "coreone.svg",
-	"default_materials": "Generic ABS @Prusa CORE One;Generic ASA @Prusa CORE One;Generic PETG @Prusa CORE One;Generic PLA @Prusa CORE One;Generic PLA Silk @Prusa CORE One;Generic TPU @Prusa CORE One;Generic PLA @Prusa CORE One 0.6",
+	"default_materials": "Generic ABS @Prusa CORE One;Generic ASA @Prusa CORE One;Generic PETG @Prusa CORE One;Generic PLA @Prusa CORE One;Generic PLA Silk @Prusa CORE One;Generic TPU @Prusa CORE One",
 	"family": "Prusa",
 	"hotend_model": "",
 	"machine_tech": "FFF",
@@ -16,7 +16,7 @@
 	],
 	"printer_model": "Prusa MK4 MMU3",
 	"default_filament_profile": [
-		"Generic PLA @Prusa MK4 MMU3"
+		"Generic PLA @System"
 	],
 	"default_print_profile": "0.20mm SPEED @MK4 MMU3 0.4",
 	"printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_MK4IS\nPRINTER_MODEL_MK4MMU3\nPG"
@@ -17,7 +17,7 @@
 	"printer_model": "Prusa MK4 MMU3",
 	"printer_variant": "0.6",
 	"default_filament_profile": [
-		"Generic PLA @Prusa MK4 MMU3"
+		"Generic PLA @System"
 	],
 	"default_print_profile": "0.25mm SPEED @MK4 MMU3 0.6",
 	"printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_MK4IS\nPRINTER_MODEL_MK4MMU3\nPG"
@@ -8,5 +8,5 @@
 	"bed_model": "mk4_bed.stl",
 	"bed_texture": "mk4is.svg",
 	"hotend_model": "",
-	"default_materials": "Generic PLA @Prusa MK4 MMU3;Generic PETG @Prusa MK4 MMU3;Generic ABS @Prusa MK4 MMU3"
+	"default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System"
 }
@@ -16,7 +16,7 @@
 	],
 	"printer_model": "Prusa MK4 MMU3 HF",
 	"default_filament_profile": [
-		"Generic PLA @Prusa MK4 MMU3"
+		"Generic PLA @System"
 	],
 	"default_print_profile": "0.20mm SPEED @MK4 MMU3 HF0.4",
 	"printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_MK4IS\nPRINTER_MODEL_MK4MMU3\nPG\nHF_NOZZLE"
@@ -8,5 +8,5 @@
 	"bed_model": "mk4_bed.stl",
 	"bed_texture": "mk4is.svg",
 	"hotend_model": "",
-	"default_materials": "Generic PLA @Prusa MK4 MMU3;Generic PETG @Prusa MK4 MMU3;Generic ABS @Prusa MK4 MMU3"
+	"default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System"
 }
@@ -4,5 +4,10 @@
 <dict>
    <key>com.apple.security.cs.disable-library-validation</key>
    <true/>
+    <!-- The Bambu network plug-in's code protector rewrites one of its own signed code pages
+         after loading. Under the hardened runtime macOS kills the process when that page is
+         paged back in; this lets it run, as Bambu Studio's signature does. -->
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
 </dict>
 </plist>
@@ -5,5 +5,10 @@
  <!-- for dynamic loading of libraries without signature validation. Used for 3dconnection drivers.-->
  <key>com.apple.security.cs.disable-library-validation</key>  
  <true/>
+  <!-- The Bambu network plug-in's code protector rewrites one of its own signed code pages
+       after loading. Under the hardened runtime macOS kills the process when that page is
+       paged back in; this lets it run, as Bambu Studio's signature does. -->
+  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+  <true/>
 </dict>
 </plist>
@@ -41,19 +41,20 @@ namespace GUI
 ObjectLayers::ObjectLayers(wxWindow* parent) :
    OG_Settings(parent, true)
 {
-    m_grid_sizer = new wxFlexGridSizer(5, 0, wxGetApp().em_unit()); // Title, Min Z, "to", Max Z, unit & buttons sizer
+    m_grid_sizer = new wxFlexGridSizer(5, parent ? parent->FromDIP(2) : 2, wxGetApp().em_unit()); // Title, Min Z, "to", Max Z, buttons sizer
    m_grid_sizer->SetFlexibleDirection(wxHORIZONTAL);
    m_grid_sizer->AddGrowableCol(1);
    m_grid_sizer->AddGrowableCol(3);

    m_og->activate();
    m_og->sizer->Clear(true);
-    m_og->sizer->Add(m_grid_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
+    m_og->sizer->Add(m_grid_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, parent ? parent->FromDIP(2) : 2);
    if (auto stb = dynamic_cast<LabeledStaticBox*>(m_og->stb))
        stb->SetCornerRadius(0);

    m_bmp_delete    = ScalableBitmap(parent, "delete");
    m_bmp_add       = ScalableBitmap(parent, "add");
+    m_bmp_layer     = ScalableBitmap(parent, "height_range_layer");
 }

 void ObjectLayers::select_editor(LayerRangeEditor* editor, const bool is_last_edited_range)
@@ -95,10 +96,14 @@ wxSizer* ObjectLayers::create_layer(const t_layer_height_range& range, PlusMinus
    };

    // Add text
-    auto head_text = new wxStaticText(m_og->ctrl_parent(), wxID_ANY, _L("Height Range"), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+    auto title_sizer = new wxBoxSizer(wxHORIZONTAL);
+    auto head_text = new wxStaticText(m_og->ctrl_parent(), wxID_ANY, _L("Range"));
    head_text->SetBackgroundStyle(wxBG_STYLE_PAINT);
    head_text->SetFont(wxGetApp().normal_font());
-    m_grid_sizer->Add(head_text, 0, wxALIGN_CENTER_VERTICAL);
+    auto icon = new wxStaticBitmap(m_og->ctrl_parent(), wxID_ANY, m_bmp_layer.bmp());
+    title_sizer->Add(icon, 0, wxALIGN_CENTER_VERTICAL);
+    title_sizer->Add(head_text, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, m_og->ctrl_parent()->FromDIP(5));
+    m_grid_sizer->Add(title_sizer, 0, wxALIGN_CENTER_VERTICAL);

    // Add control for the "Min Z"

@@ -126,7 +131,7 @@ wxSizer* ObjectLayers::create_layer(const t_layer_height_range& range, PlusMinus

    m_grid_sizer->Add(editor, 1, wxEXPAND);

-    auto middle_text = new wxStaticText(m_og->ctrl_parent(), wxID_ANY, _L("to"), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+    auto middle_text = new wxStaticText(m_og->ctrl_parent(), wxID_ANY, "-");
    middle_text->SetBackgroundStyle(wxBG_STYLE_PAINT);
    middle_text->SetFont(wxGetApp().normal_font());
    m_grid_sizer->Add(middle_text, 0, wxALIGN_CENTER_VERTICAL);
@@ -156,11 +161,6 @@ wxSizer* ObjectLayers::create_layer(const t_layer_height_range& range, PlusMinus
    m_grid_sizer->Add(editor, 1, wxEXPAND);

    auto sizer2 = new wxBoxSizer(wxHORIZONTAL);
-    auto unit_text = new wxStaticText(m_og->ctrl_parent(), wxID_ANY, _L("mm"), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
-    unit_text->SetBackgroundStyle(wxBG_STYLE_PAINT);
-    unit_text->SetFont(wxGetApp().normal_font());
-    sizer2->Add(unit_text, 0, wxALIGN_CENTER_VERTICAL);
-
    m_grid_sizer->Add(sizer2, 0, wxALIGN_CENTER_VERTICAL);

    // BBS
@@ -205,8 +205,9 @@ void ObjectLayers::create_layers_list()

        auto sizer = create_layer(range, del_btn, add_btn);
        auto b_sizer = new wxBoxSizer(wxHORIZONTAL);
-        b_sizer->Add(del_btn, 0, wxRIGHT | wxLEFT, em_unit(m_parent));
-        b_sizer->Add(add_btn);
+        b_sizer->Add(del_btn, 0, wxLEFT, m_og->ctrl_parent()->FromDIP(5));
+        b_sizer->AddSpacer(m_og->ctrl_parent()->FromDIP(15));
+        b_sizer->Add(add_btn, 0, wxRIGHT, m_og->ctrl_parent()->FromDIP(5));
        sizer->Add(b_sizer, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, m_parent->FromDIP(1)); // aligns +/- buttons vertically since we got 1px gap on bottom of icons

        del_btn->Bind(wxEVT_BUTTON, [del_btn](wxEvent &) {
@@ -277,6 +278,7 @@ void ObjectLayers::msw_rescale()
 {
    m_bmp_delete.msw_rescale();
    m_bmp_add.msw_rescale();
+    m_bmp_layer.msw_rescale();

    m_grid_sizer->SetHGap(wxGetApp().em_unit());

@@ -367,20 +369,17 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* parent,
    m_valid_value(value),
    m_type(type),
    m_set_focus_data(set_focus_data_fn),
-    wxTextCtrl(parent->m_og->ctrl_parent(), wxID_ANY, value, wxDefaultPosition, 
-               wxSize(em_unit(parent->m_parent), wxDefaultCoord), wxTE_PROCESS_ENTER
-#ifdef _WIN32
-        | wxBORDER_SIMPLE
-#endif
-    )
+    TextInput(parent->m_og->ctrl_parent(), value, _L("mm"), "", wxDefaultPosition, wxSize(em_unit(parent->m_parent), wxDefaultCoord), wxTE_PROCESS_ENTER)
 {
    this->SetFont(wxGetApp().normal_font());
    wxGetApp().UpdateDarkUI(this);

+    wxTextCtrl* ctrl = GetTextCtrl();
+
    // Reset m_enter_pressed flag to _false_, when value is editing
-    this->Bind(wxEVT_TEXT, [this](wxEvent&) { m_enter_pressed = false; }, this->GetId());
+    ctrl->Bind(wxEVT_TEXT, [this](wxEvent&) { m_enter_pressed = false; }, ctrl->GetId());
    
-    this->Bind(wxEVT_TEXT_ENTER, [this, edit_fn](wxEvent&)
+    ctrl->Bind(wxEVT_TEXT_ENTER, [this, edit_fn](wxCommandEvent& e)
    {
        m_enter_pressed     = true;
        // If LayersList wasn't updated/recreated, we can call wxEVT_KILL_FOCUS.Skip()
@@ -395,9 +394,9 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* parent,
            SetValue(m_valid_value);
            m_call_kill_focus = true;
        }
-    }, this->GetId());
+    }, ctrl->GetId());

-    this->Bind(wxEVT_KILL_FOCUS, [this, edit_fn](wxFocusEvent& e)
+    ctrl->Bind(wxEVT_KILL_FOCUS, [this, edit_fn](wxFocusEvent& e)
    {
        if (!m_enter_pressed) {
 #ifndef __WXGTK__
@@ -426,14 +425,14 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* parent,
            m_call_kill_focus = false;
            e.Skip();
        }
-    }, this->GetId());
+    }, ctrl->GetId());

-    this->Bind(wxEVT_SET_FOCUS, [this, parent](wxFocusEvent& e)
+    ctrl->Bind(wxEVT_SET_FOCUS, [this, parent](wxFocusEvent& e)
    {
        set_focus_data();
        parent->update_scene_from_editor_selection();
        e.Skip();
-    }, this->GetId());
+    }, ctrl->GetId());

 #ifdef __WXGTK__ // Workaround! To take information about selectable range
    this->Bind(wxEVT_LEFT_DOWN, [this](wxEvent& e)
@@ -447,7 +446,7 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* parent,
    {
        // select all text using Ctrl+A
        if (wxGetKeyState(wxKeyCode('A')) && wxGetKeyState(WXK_CONTROL))
-            this->SetSelection(-1, -1); //select all
+            GetTextCtrl()->SetSelection(-1, -1); //select all
        event.Skip();
    }));
 }
@@ -477,7 +476,7 @@ coordf_t LayerRangeEditor::get_value()

 void LayerRangeEditor::msw_rescale()
 {
-    SetMinSize(wxSize(wxGetApp().em_unit(), wxDefaultCoord));
+    Rescale();
 }

 } //namespace GUI
@@ -9,6 +9,8 @@
 #include <wx/sizer.h>
 #include <wx/event.h>

+#include <slic3r/GUI/Widgets/TextInput.hpp>
+
 #ifdef __WXOSX__
 #include "libslic3r/PrintConfig.hpp"
 #endif
@@ -34,7 +36,7 @@ enum EditorType
    etLayerHeight   = 4,
 };

-class LayerRangeEditor : public wxTextCtrl
+class LayerRangeEditor : public TextInput
 {
    bool                m_enter_pressed     { false };
    bool                m_call_kill_focus   { false };
@@ -55,6 +57,8 @@ public:

    EditorType          type() const {return m_type;}
    void                set_focus_data() const { m_set_focus_data(m_type);}
+    void                SetValue(const wxString& value) {GetTextCtrl()->SetValue(value);}
+    wxString            GetValue() {return GetTextCtrl()->GetValue();}
    void                msw_rescale();

 private:
@@ -65,6 +69,7 @@ class ObjectLayers : public OG_Settings
 {
    ScalableBitmap  m_bmp_delete;
    ScalableBitmap  m_bmp_add;
+    ScalableBitmap  m_bmp_layer;
    ModelObject*    m_object {nullptr};

    wxFlexGridSizer*       m_grid_sizer;