diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json
index b2f7a8a110..2fd4c76e2a 100644
--- a/resources/settings/fdmprinter.json
+++ b/resources/settings/fdmprinter.json
@@ -48,7 +48,7 @@
             "default": 1
         },
         "machine_use_extruder_offset_to_offset_coords": { "default": false },
-        
+
         "extruder_nr": { "default": 0 },
         "machine_nozzle_offset_x": { "default": 0, "SEE_machine_extruder_trains": true },
         "machine_nozzle_offset_y": { "default": 0, "SEE_machine_extruder_trains": true  },
@@ -780,7 +780,7 @@
                         "value": true
                     }
                 },
-                "machine_switch_extruder_retraction_amount": {
+                "switch_extruder_retraction_amount": {
                     "label": "Nozzle Switch Retraction Distance",
                     "description": "The amount of retraction: Set at 0 for no retraction at all. This should generally be the same as the length of the heat zone.",
                     "unit": "mm",
@@ -793,7 +793,7 @@
                         "value": true
                     }
                 },
-                "machine_switch_extruder_retraction_speed": {
+                "switch_extruder_retraction_speeds": {
                     "label": "Nozzle Switch Retraction Speed",
                     "description": "The speed at which the filament is retracted. A higher retraction speed works better, but a very high retraction speed can lead to filament grinding.",
                     "unit": "mm/s",
@@ -806,7 +806,7 @@
                         "value": true
                     },
                     "children": {
-                        "machine_switch_extruder_retraction_speed": {
+                        "switch_extruder_retraction_speed": {
                             "label": "Nozzle Switch Retract Speed",
                             "description": "The speed at which the filament is retracted during a nozzle switch retract. ",
                             "unit": "mm/s",
@@ -818,7 +818,7 @@
                                 "value": true
                             }
                         },
-                        "machine_switch_extruder_prime_speed": {
+                        "switch_extruder_prime_speed": {
                             "label": "Nozzle Switch Prime Speed",
                             "description": "The speed at which the filament is pushed back after a nozzle switch retraction.",
                             "unit": "mm/s",
@@ -1677,6 +1677,15 @@
                     "max_value": 16,
                     "inherit_function": "extruder_nr",
                     "children": {
+                        "support_extruder_nr_layer_0": {
+                            "label": "First Layer Support Extruder",
+                            "description": "The extruder train to use for printing the first layer of support. This is used in multi-extrusion.",
+                            "type": "int",
+                            "default": 0,
+                            "min_value": 0,
+                            "max_value": 16,
+                            "inherit": true
+                        },
                         "support_roof_extruder_nr": {
                             "label": "Hammock Extruder",
                             "description": "The extruder train to use for printing the hammock. This is used in multi-extrusion.",
diff --git a/resources/settings/ultimaker2.json b/resources/settings/ultimaker2.json
index 2f1b4bd408..e6f3e0de13 100644
--- a/resources/settings/ultimaker2.json
+++ b/resources/settings/ultimaker2.json
@@ -64,14 +64,8 @@
             "machine_extruder_end_code": {
                 "default": "" 
             },
-            "machine_switch_extruder_retraction_amount": { 
-                "default": 16 
-            },
-            "machine_switch_extruder_retraction_speed": { 
-                "default": 20 
-            },
-            "machine_switch_extruder_prime_speed": { 
-                "default": 20 
+            "machine_heat_zone_length": { 
+                "default": 16
             }
         }
     ],
@@ -92,8 +86,6 @@
         "machine_head_shape_max_y": { "default": 30 },
         "machine_nozzle_gantry_distance": { "default": 55 },
         "machine_use_extruder_offset_to_offset_coords": { "default": true },
-        "machine_nozzle_offset_x_1": { "default": 18.0 },
-        "machine_nozzle_offset_y_1": { "default": 0.0 },
         "machine_gcode_flavor": { "default": "UltiGCode" },
         "machine_disallowed_areas": { "default": [
             [[-115.0,  112.5], [ -82.0,  112.5], [ -84.0,  104.5], [-115.0,  104.5]],
diff --git a/resources/settings/ultimaker_original.json b/resources/settings/ultimaker_original.json
index 1ad53808fb..11d2babe94 100644
--- a/resources/settings/ultimaker_original.json
+++ b/resources/settings/ultimaker_original.json
@@ -69,14 +69,8 @@
             "machine_extruder_end_code": {
                 "default": "" 
             },
-            "machine_switch_extruder_retraction_amount": { 
-                "default": 16 
-            },
-            "machine_switch_extruder_retraction_speed": { 
-                "default": 20 
-            },
-            "machine_switch_extruder_prime_speed": { 
-                "default": 20 
+            "machine_heat_zone_length": { 
+                "default": 16
             }
         }
     ],
@@ -92,8 +86,6 @@
         "machine_head_shape_max_y": { "default": 35 },
         "machine_nozzle_gantry_distance": { "default": 55 },
         "machine_use_extruder_offset_to_offset_coords": { "default": true },
-        "machine_nozzle_offset_x_1": { "default": 18.0 },
-        "machine_nozzle_offset_y_1": { "default": 0.0 },
         "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" },
 
         "machine_start_gcode": {