diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index e8eae781d1..d21b4056a0 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -67,6 +67,9 @@
         },
         "bottom_layers": {
             "value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))"
+        },
+        "xy_offset": {
+            "value": "-layer_height * 0.2"
         }
     }
 }
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
index 39d3455341..ce071c0e9f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
index 0d2b0df40b..962c23ba33 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
index 36bd136f11..78221f4c28 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_cpe_plus
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_cpe_plus
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
index 92b83b0daa..ae44cf40a5 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_cpe_plus
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_cpe_plus
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
index 0dd1d9e6cb..19dbd9c52e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_cpe
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_cpe
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
index adf9744b20..545c776b08 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_cpe
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_cpe
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
index 3b56baa68b..053b3b710a 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_nylon
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_nylon
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
index 8a453f1423..3807904e2e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_nylon
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_nylon
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
index be3b0e768f..563753fdf3 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_pc
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_pc
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
index 2088491e1e..702b9b5eec 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_pc
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_pc
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
index 9396ad1ab1..313a77d86f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_petg
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_petg
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
index a8f85b6da3..7dde3d14c2 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_petg
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_petg
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index 406b45f226..9cdee1381f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index 3edfa90da5..358d5c517c 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 513e8b63d9..b27355a79e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index 3d80753d3f..ffbd5785a0 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
index ab2e9bc6f6..39153f554f 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
index a58642f073..8c6510d7d6 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
index 916b80c811..7d2f5ee686 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_cpe_plus
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_cpe_plus
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
index a3d99c2ed0..141284e636 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_cpe_plus
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_cpe_plus
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
index d9929fc35c..fceeafdeb7 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_cpe
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_cpe
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
index 45df698f7e..d98a914046 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_cpe
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_cpe
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
index fcd58dd33e..479af8f737 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_nylon
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_nylon
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
index cadc30da58..96231ce051 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_nylon
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_nylon
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
index d23ff28b91..ab630874d5 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_pc
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_pc
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
index 950f420016..e6644926dd 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_pc
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_pc
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
index fba5e369ee..b659129a76 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_petg
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_petg
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
index 29d052675d..8022784344 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_petg
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_petg
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index cc76a5706a..030a3699f1 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index 28353777bf..7737eff565 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 5db4117aa1..dbdbc9b1c7 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index 22485e8777..287917f2b5 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 
 wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset