diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index ca21e83a97..76e8361f8b 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -467,7 +467,7 @@
                     "label": "Compensate Wall Overlaps",
                     "description": "Compensate the flow for parts of a wall being laid down where there already is a piece of a wall. These overlaps occur in thin pieces in a model. Gcode generation might be slowed down considerably.",
                     "type": "boolean",
-                    "default": false,
+                    "default": true,
                     "visible": false
                 },
                 "fill_perimeter_gaps": {
diff --git a/resources/profiles/materials/abs.cfg b/resources/profiles/materials/abs.cfg
index 2ec46947a0..89095c0024 100644
--- a/resources/profiles/materials/abs.cfg
+++ b/resources/profiles/materials/abs.cfg
@@ -5,7 +5,7 @@ name = ABS
 
 [settings]
 material_bed_temperature = 100
-platform_adhesion = Brim
+platform_adhesion = brim
 material_flow = 107
 material_print_temperature = 250
 cool_fan_speed = 50
diff --git a/resources/profiles/materials/cpe.cfg b/resources/profiles/materials/cpe.cfg
index 508bd39fcf..431a6d38d7 100644
--- a/resources/profiles/materials/cpe.cfg
+++ b/resources/profiles/materials/cpe.cfg
@@ -5,7 +5,7 @@ name = CPE
 
 [settings]
 material_bed_temperature = 60
-platform_adhesion = Brim
+platform_adhesion = brim
 material_flow = 100
 material_print_temperature = 250
 cool_fan_speed = 50
diff --git a/resources/profiles/materials/pla.cfg b/resources/profiles/materials/pla.cfg
index a8d8c6a400..99a06e5e1b 100644
--- a/resources/profiles/materials/pla.cfg
+++ b/resources/profiles/materials/pla.cfg
@@ -5,7 +5,7 @@ name = PLA
 
 [settings]
 material_bed_temperature = 60
-platform_adhesion = Skirt
+platform_adhesion = skirt
 material_flow = 100
 material_print_temperature = 210
 cool_fan_speed = 100
diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
index 4554e0aba5..263e730a97 100644
--- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
@@ -6,46 +6,24 @@ machine_variant = 0.25 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-cool_min_layer_time = 2
-support_enable = False
-retraction_combing = All
-cool_min_speed = 25
-brim_line_count = 32
-top_thickness = 0.72
-material_flow = 100.0
-cool_lift_head = True
-speed_print = 20
-retraction_hop = 0.0
-machine_nozzle_size = 0.22
 layer_height = 0.06
-speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-speed_topbottom = 20
-speed_infill = 30
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-infill_sparse_density = 22
-shell_thickness = 0.88
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 15
-speed_wall_x = 25
-skirt_minimal_length = 150.0
-speed_layer_0 = 20
-bottom_thickness = 0.72
-layer_height_0 = 0.15
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
 top_bottom_thickness = 0.72
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
+layer_height_0 = 0.15
+brim_line_count = 32
+speed_wall_x = 25
+wall_thickness = 0.88
+speed_infill = 30
+speed_topbottom = 20
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+speed_print = 20
+cool_min_speed = 25
+line_width = 0.22
+infill_sparse_density = 22
+bottom_thickness = 0.72
+machine_nozzle_size = 0.22
+top_thickness = 0.72
+speed_wall_0 = 20
+cool_min_layer_time = 2
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
index 0c6a2fb79e..3361af5fdd 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@@ -6,46 +6,24 @@ machine_variant = 0.4 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-cool_min_layer_time = 3
-support_enable = False
-retraction_combing = All
-speed_travel = 150
-cool_min_speed = 20
-brim_line_count = 20
-top_thickness = 0.75
-material_flow = 100.0
-cool_lift_head = True
-speed_print = 40
-retraction_hop = 0.0
-machine_nozzle_size = 0.35
 layer_height = 0.15
-speed_wall_0 = 30
-raft_interface_line_spacing = 3.0
-speed_topbottom = 30
-speed_infill = 55
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-infill_sparse_density = 18
-shell_thickness = 0.7
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 15
-speed_wall_x = 40
-skirt_minimal_length = 150.0
-bottom_thickness = 0.75
-layer_height_0 = 0.26
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
 top_bottom_thickness = 0.75
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
+layer_height_0 = 0.26
+speed_print = 40
+speed_wall_x = 40
+wall_thickness = 0.7
+speed_infill = 55
+speed_topbottom = 30
+cool_min_layer_time = 3
+bottom_thickness = 0.75
+cool_min_speed = 20
+line_width = 0.35
+infill_sparse_density = 18
+top_thickness = 0.75
+machine_nozzle_size = 0.35
+speed_travel = 150
+speed_wall_0 = 30
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
index 55eae0a8f4..edc46ab0fa 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@@ -6,46 +6,23 @@ machine_variant = 0.4 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-cool_min_layer_time = 3
-support_enable = False
-retraction_combing = All
-cool_min_speed = 20
-brim_line_count = 20
-top_thickness = 0.72
-material_flow = 100.0
-cool_lift_head = True
-speed_print = 30
-retraction_hop = 0.0
-machine_nozzle_size = 0.35
 layer_height = 0.06
-speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-speed_topbottom = 20
-speed_infill = 45
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-infill_sparse_density = 22
-shell_thickness = 1.05
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 15
-speed_wall_x = 30
-skirt_minimal_length = 150.0
-speed_layer_0 = 20
-bottom_thickness = 0.72
-layer_height_0 = 0.26
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
 top_bottom_thickness = 0.72
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
+layer_height_0 = 0.26
+speed_print = 30
+speed_wall_x = 30
+wall_thickness = 1.05
+speed_infill = 45
+speed_topbottom = 20
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+cool_min_speed = 20
+line_width = 0.35
+infill_sparse_density = 22
+bottom_thickness = 0.72
+machine_nozzle_size = 0.35
+top_thickness = 0.72
+speed_wall_0 = 20
+cool_min_layer_time = 3
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
index 627f22aa61..a8d63d07db 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@@ -6,41 +6,18 @@ machine_variant = 0.4 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-support_enable = False
-retraction_combing = All
-cool_min_speed = 20
-brim_line_count = 20
-material_flow = 100.0
-cool_lift_head = True
+layer_height_0 = 0.26
 speed_print = 30
-retraction_hop = 0.0
+speed_wall_x = 30
+wall_thickness = 1.05
+speed_infill = 45
+speed_topbottom = 20
+cool_min_layer_time = 3
+cool_min_speed = 20
+line_width = 0.35
 machine_nozzle_size = 0.35
 speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-speed_topbottom = 20
-speed_infill = 45
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-shell_thickness = 1.05
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 15
-speed_wall_x = 30
-skirt_minimal_length = 150.0
-speed_layer_0 = 20
-layer_height_0 = 0.26
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
-cool_min_layer_time = 3
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
index 54904f0e2d..8b905b14e6 100644
--- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
@@ -6,45 +6,23 @@ machine_variant = 0.6 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-cool_min_layer_time = 3
-support_enable = False
-retraction_combing = All
-cool_min_speed = 20
-brim_line_count = 14
-top_thickness = 1.2
-material_flow = 100.0
-cool_lift_head = True
-speed_print = 25
-retraction_hop = 0.0
-machine_nozzle_size = 0.53
 layer_height = 0.15
-speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-speed_topbottom = 20
-speed_infill = 55
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-shell_thickness = 1.59
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 15
-speed_wall_x = 30
-skirt_minimal_length = 150.0
-speed_layer_0 = 20
-bottom_thickness = 1.2
-layer_height_0 = 0.39
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
 top_bottom_thickness = 1.2
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
+layer_height_0 = 0.39
+speed_print = 25
+speed_wall_x = 30
+wall_thickness = 1.59
+speed_infill = 55
+speed_topbottom = 20
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+brim_line_count = 14
+cool_min_speed = 20
+line_width = 0.53
+bottom_thickness = 1.2
+machine_nozzle_size = 0.53
+top_thickness = 1.2
+speed_wall_0 = 20
+cool_min_layer_time = 3
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
index 42addb54bb..25a6ccdc6e 100644
--- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
@@ -6,45 +6,23 @@ machine_variant = 0.8 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-cool_min_layer_time = 3
-support_enable = False
-retraction_combing = All
-cool_min_speed = 15
-brim_line_count = 10
-top_thickness = 1.2
-material_flow = 100.0
-cool_lift_head = True
-speed_print = 20
-retraction_hop = 0.0
-machine_nozzle_size = 0.7
 layer_height = 0.2
-speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-speed_topbottom = 20
-speed_infill = 40
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-shell_thickness = 2.1
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 15
-speed_wall_x = 30
-skirt_minimal_length = 150.0
-speed_layer_0 = 20
-bottom_thickness = 1.2
-layer_height_0 = 0.5
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
 top_bottom_thickness = 1.2
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
+layer_height_0 = 0.5
+speed_print = 20
+speed_wall_x = 30
+wall_thickness = 2.1
+speed_infill = 40
+speed_topbottom = 20
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+brim_line_count = 10
+cool_min_speed = 15
+line_width = 0.7
+bottom_thickness = 1.2
+machine_nozzle_size = 0.7
+top_thickness = 1.2
+speed_wall_0 = 20
+cool_min_layer_time = 3
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
index 772d519e69..6664aa4436 100644
--- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
@@ -6,45 +6,24 @@ machine_variant = 0.25 mm
 material = CPE
 
 [settings]
-cool_fan_speed_min = 50
-retraction_hop = 0.0
-support_enable = False
-raft_airgap = 0.0
-raft_surface_thickness = 0.27
-raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
-bottom_thickness = 0.72
-raft_surface_line_spacing = 3.0
-retraction_combing = All
-adhesion_type = brim
-cool_min_layer_time = 2
-layer_height = 0.06
-raft_margin = 5.0
-speed_infill = 30
-speed_layer_0 = 20
-brim_line_count = 32
-cool_lift_head = True
-retraction_speed = 40.0
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 20
-shell_thickness = 0.88
-speed_wall_0 = 20
-material_flow = 100.0
-support_pattern = lines
-infill_sparse_density = 22
-raft_interface_line_width = 0.4
-layer_height_0 = 0.15
-material_bed_temperature = 70
-top_thickness = 0.72
-top_bottom_thickness = 0.72
-speed_wall_x = 25
 infill_overlap = 17
-infill_before_walls = False
-raft_surface_line_width = 0.4
-skirt_minimal_length = 150.0
+layer_height = 0.06
+wall_thickness = 0.88
+layer_height_0 = 0.15
+brim_line_count = 32
+speed_wall_x = 25
+top_bottom_thickness = 0.72
+speed_infill = 30
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+cool_min_layer_time = 2
+speed_print = 20
+line_width = 0.22
+infill_sparse_density = 22
+bottom_thickness = 0.72
 machine_nozzle_size = 0.22
+top_thickness = 0.72
+speed_wall_0 = 20
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
index f484beaf30..41efd0a42b 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@@ -6,45 +6,24 @@ machine_variant = 0.4 mm
 material = CPE
 
 [settings]
-cool_fan_speed_min = 50
-retraction_hop = 0.0
-skin_no_small_gaps_heuristic = False
-raft_airgap = 0.0
-speed_travel = 150
-raft_surface_thickness = 0.27
-raft_interface_line_spacing = 3.0
-support_enable = False
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
-retraction_combing = All
-adhesion_type = brim
+infill_overlap = 17
 cool_min_layer_time = 3
 layer_height = 0.15
-raft_margin = 5.0
-speed_infill = 45
-bottom_thickness = 0.75
-brim_line_count = 20
-cool_lift_head = True
-retraction_speed = 40.0
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 30
-shell_thickness = 0.7
-speed_wall_0 = 30
-material_flow = 100.0
-support_pattern = lines
-infill_sparse_density = 18
-raft_interface_line_width = 0.4
+wall_thickness = 0.7
 layer_height_0 = 0.26
-material_bed_temperature = 70
-top_thickness = 0.75
-top_bottom_thickness = 0.75
+speed_print = 30
 speed_wall_x = 40
-infill_overlap = 17
-infill_before_walls = False
-skirt_minimal_length = 150.0
+top_bottom_thickness = 0.75
+speed_infill = 45
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+speed_travel = 150
+line_width = 0.35
+infill_sparse_density = 18
+bottom_thickness = 0.75
 machine_nozzle_size = 0.35
+top_thickness = 0.75
+speed_wall_0 = 30
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
index 0ca6bdca19..8b8684522b 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@@ -6,45 +6,22 @@ machine_variant = 0.4 mm
 material = CPE
 
 [settings]
-cool_fan_speed_min = 50
-retraction_hop = 0.0
-support_enable = False
-raft_airgap = 0.0
-raft_surface_thickness = 0.27
-raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
-bottom_thickness = 0.72
-raft_surface_line_spacing = 3.0
-retraction_combing = All
-adhesion_type = brim
-cool_min_layer_time = 3
 layer_height = 0.06
-raft_margin = 5.0
-speed_infill = 45
-speed_layer_0 = 20
-brim_line_count = 20
-cool_lift_head = True
-retraction_speed = 40.0
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 20
-shell_thickness = 1.05
-speed_wall_0 = 20
-material_flow = 100.0
-support_pattern = lines
-infill_sparse_density = 22
-raft_interface_line_width = 0.4
-layer_height_0 = 0.26
-material_bed_temperature = 70
-top_thickness = 0.72
 top_bottom_thickness = 0.72
+layer_height_0 = 0.26
+speed_print = 20
 speed_wall_x = 30
-infill_overlap = 15
-infill_before_walls = False
-raft_surface_line_width = 0.4
-skirt_minimal_length = 150.0
+wall_thickness = 1.05
+speed_infill = 45
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+adhesion_type = brim
+line_width = 0.35
+infill_sparse_density = 22
+bottom_thickness = 0.72
 machine_nozzle_size = 0.35
+top_thickness = 0.72
+speed_wall_0 = 20
+cool_min_layer_time = 3
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
index 340ded170e..ae721733e5 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@@ -6,40 +6,17 @@ machine_variant = 0.4 mm
 material = CPE
 
 [settings]
-retraction_hop = 0.0
-support_enable = False
-raft_airgap = 0.0
-raft_surface_thickness = 0.27
-support_pattern = lines
-raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
-raft_surface_line_width = 0.4
-cool_fan_speed_min = 50
-retraction_combing = All
-adhesion_type = brim
-cool_min_layer_time = 3
-infill_before_walls = False
-speed_layer_0 = 20
-brim_line_count = 20
-cool_lift_head = True
-raft_interface_line_width = 0.4
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 20
-shell_thickness = 1.05
-speed_wall_0 = 20
-material_flow = 100.0
-raft_surface_line_spacing = 3.0
-raft_margin = 5.0
-retraction_speed = 40.0
 layer_height_0 = 0.26
-material_bed_temperature = 70
+speed_print = 20
 speed_wall_x = 30
-infill_overlap = 15
+wall_thickness = 1.05
 speed_infill = 45
-skirt_minimal_length = 150.0
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+cool_min_layer_time = 3
+line_width = 0.35
 machine_nozzle_size = 0.35
+speed_wall_0 = 20
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
index d1b26b64e8..6fb87172b5 100644
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@@ -6,44 +6,23 @@ machine_variant = 0.6 mm
 material = CPE
 
 [settings]
-cool_fan_speed_min = 50
-retraction_hop = 0.0
-support_enable = False
-raft_airgap = 0.0
-raft_surface_thickness = 0.27
-raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
-bottom_thickness = 1.2
-support_pattern = lines
-retraction_combing = All
-adhesion_type = brim
-cool_min_layer_time = 3
-layer_height = 0.15
-speed_infill = 40
-speed_layer_0 = 20
-brim_line_count = 14
-cool_lift_head = True
-retraction_speed = 40.0
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 20
-shell_thickness = 1.59
-speed_wall_0 = 20
-material_flow = 100.0
-raft_surface_line_spacing = 3.0
-raft_margin = 5.0
-raft_interface_line_width = 0.4
-layer_height_0 = 0.39
-material_bed_temperature = 70
-top_thickness = 1.2
-top_bottom_thickness = 1.2
-speed_wall_x = 30
 infill_overlap = 17
-infill_before_walls = False
-raft_surface_line_width = 0.4
-skirt_minimal_length = 150.0
+layer_height = 0.15
+top_bottom_thickness = 1.2
+layer_height_0 = 0.39
+brim_line_count = 14
+speed_wall_x = 30
+wall_thickness = 1.59
+speed_infill = 40
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+cool_min_layer_time = 3
+speed_print = 20
+line_width = 0.53
+bottom_thickness = 1.2
 machine_nozzle_size = 0.53
+top_thickness = 1.2
+speed_wall_0 = 20
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
index 9497120a63..594083d5f6 100644
--- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
@@ -6,44 +6,23 @@ machine_variant = 0.8 mm
 material = CPE
 
 [settings]
-cool_fan_speed_min = 50
-retraction_hop = 0.0
-support_enable = False
-raft_airgap = 0.0
-raft_surface_thickness = 0.27
-raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
-bottom_thickness = 1.2
-support_pattern = lines
-retraction_combing = All
-adhesion_type = brim
-cool_min_layer_time = 3
-layer_height = 0.2
-speed_infill = 40
-speed_layer_0 = 20
-brim_line_count = 10
-cool_lift_head = True
-retraction_speed = 40.0
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 20
-shell_thickness = 2.1
-speed_wall_0 = 20
-material_flow = 100.0
-raft_surface_line_spacing = 3.0
-raft_margin = 5.0
-raft_interface_line_width = 0.4
-layer_height_0 = 0.5
-material_bed_temperature = 70
-top_thickness = 1.2
-top_bottom_thickness = 1.2
-speed_wall_x = 30
 infill_overlap = 17
-infill_before_walls = False
-raft_surface_line_width = 0.4
-skirt_minimal_length = 150.0
+layer_height = 0.2
+top_bottom_thickness = 1.2
+layer_height_0 = 0.5
+brim_line_count = 10
+speed_wall_x = 30
+wall_thickness = 2.1
+speed_infill = 40
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+cool_min_layer_time = 3
+speed_print = 20
+line_width = 0.7
+bottom_thickness = 1.2
 machine_nozzle_size = 0.7
+top_thickness = 1.2
+speed_wall_0 = 20
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
 
diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
index 069f964e4d..b52132b5c5 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@@ -11,8 +11,6 @@ layer_height = 0.06
 layer_height_0 = 0.15
 shell_thickness = 0.88
 top_bottom_thickness = 0.72
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_wipe_dist = 0.1
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index 870f8da6ed..9d947dbb30 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -11,8 +11,6 @@ layer_height = 0.15
 layer_height_0 = 0.26
 shell_thickness = 0.7
 top_bottom_thickness = 0.6
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 18
 infill_wipe_dist = 0.2
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index a2a89d897f..51a7dc97f8 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -11,8 +11,6 @@ layer_height = 0.06
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.84
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_wipe_dist = 0.2
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index 54dedd578d..6f1116fdee 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -11,8 +11,6 @@ layer_height = 0.1
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.8
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_wipe_dist = 0.2
diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
index eccc14ecff..e82be902d2 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@@ -11,8 +11,6 @@ layer_height = 0.04
 layer_height_0 = 0.26
 shell_thickness = 1.4
 top_bottom_thickness = 1.12
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 25
 infill_wipe_dist = 0.2
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index 6a5f4033b1..1a2351d38f 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -11,8 +11,6 @@ layer_height = 0.15
 layer_height_0 = 0.4
 shell_thickness = 1.59
 top_bottom_thickness = 1.2
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_wipe_dist = 0.3
diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
index fe454b5c32..fe61ced732 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@@ -11,8 +11,6 @@ layer_height = 0.2
 layer_height_0 = 0.5
 shell_thickness = 2.1
 top_bottom_thickness = 1.6
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_wipe_dist = 0.4
diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
index 86db0cbd22..d3f9ddbdf5 100644
--- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
@@ -10,8 +10,6 @@ layer_height = 0.06
 layer_height_0 = 0.15
 shell_thickness = 0.88
 top_bottom_thickness = 0.72
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_overlap = 0.022
diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
index 6511f2ada8..b656213b33 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
@@ -10,8 +10,6 @@ layer_height = 0.15
 layer_height_0 = 0.26
 shell_thickness = 0.7
 top_bottom_thickness = 0.6
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 18
 infill_overlap = 0.035
diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
index 33be857fb7..7a298201d1 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
@@ -10,8 +10,6 @@ layer_height = 0.06
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.84
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_overlap = 0.035
diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
index 90fcf9e49c..54653ffb78 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
@@ -10,8 +10,6 @@ layer_height = 0.1
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.8
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_overlap = 0.035
diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
index 0181bc0bdf..a64ad72e3a 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
@@ -10,8 +10,6 @@ layer_height = 0.04
 layer_height_0 = 0.26
 shell_thickness = 1.4
 top_bottom_thickness = 1.12
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 25
 infill_overlap = 0.035
diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
index e52ae2c9b8..8d237ffce7 100644
--- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
@@ -10,8 +10,6 @@ layer_height = 0.15
 layer_height_0 = 0.4
 shell_thickness = 1.59
 top_bottom_thickness = 1.2
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_overlap = 0.053
diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
index bfc3ae8e34..26f5770df6 100644
--- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
@@ -10,8 +10,6 @@ layer_height = 0.2
 layer_height_0 = 0.5
 shell_thickness = 2.1
 top_bottom_thickness = 1.6
-travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_overlap = 0.07