diff --git a/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
similarity index 100%
rename from resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg
new file mode 100644
index 0000000000..49672fcb72
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+intent_category = visual
+quality_type = draft
+material = generic_abs
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg
new file mode 100644
index 0000000000..35d0d86ab3
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = fast
+intent_category = visual
+material = generic_abs
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg
new file mode 100644
index 0000000000..2b656dbc35
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = high
+intent_category = visual
+material = generic_abs
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg
new file mode 100644
index 0000000000..aff1d9d9f0
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = normal
+intent_category = visual
+material = generic_abs
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
similarity index 100%
rename from resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg
new file mode 100644
index 0000000000..0c39d43c6a
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = draft
+intent_category = visual
+material = generic_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg
new file mode 100644
index 0000000000..92ea0837fe
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = fast
+intent_category = visual
+material = generic_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg
new file mode 100644
index 0000000000..97c7ab325c
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = high
+intent_category = visual
+material = generic_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg
new file mode 100644
index 0000000000..e012264294
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = normal
+intent_category = visual
+material = generic_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
similarity index 100%
rename from resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg
new file mode 100644
index 0000000000..f52eb22ec2
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = draft
+intent_category = visual
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg
new file mode 100644
index 0000000000..9debbb6d43
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = fast
+intent_category = visual
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg
new file mode 100644
index 0000000000..a57b040660
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = high
+intent_category = visual
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
rename to resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg
new file mode 100644
index 0000000000..0f31bcce25
--- /dev/null
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = normal
+intent_category = visual
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
similarity index 100%
rename from resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg
new file mode 100644
index 0000000000..4f7ee148f9
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+intent_category = visualquality_type = draft
+material = generic_abs
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg
new file mode 100644
index 0000000000..0f10b8416b
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = fast
+intent_category = visual
+material = generic_abs
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg
new file mode 100644
index 0000000000..b6ea956563
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = high
+intent_category = visual
+material = generic_abs
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg
new file mode 100644
index 0000000000..f26003ca30
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = normal
+intent_category = visual
+material = generic_abs
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
similarity index 100%
rename from resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg
new file mode 100644
index 0000000000..a71bb898d3
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = draft
+intent_category = visual
+material = generic_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg
new file mode 100644
index 0000000000..b20fdcb791
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = fast
+intent_category = visual
+material = generic_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg
new file mode 100644
index 0000000000..3fc0006b3f
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = high
+intent_category = visual
+material = generic_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg
new file mode 100644
index 0000000000..4138f62694
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = normal
+intent_category = visual
+material = generic_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
similarity index 100%
rename from resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg
new file mode 100644
index 0000000000..b522d262af
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+intent_category = visual
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg
new file mode 100644
index 0000000000..3f5d3c566e
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = fast
+intent_category = visual
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg
new file mode 100644
index 0000000000..3b5d9fb3db
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = high
+intent_category = visual
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/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
similarity index 100%
rename from resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
rename to resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg
new file mode 100644
index 0000000000..d71bb76b35
--- /dev/null
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Visual
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 10
+type = intent
+quality_type = normal
+intent_category = visual
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+speed_infill = 50
+wall_thickness = =wall_line_width * 3
+top_bottom_thickness = =wall_thickness