Merge pull request #12415 from Ultimaker/PP-170-clean-up-retraction_count_max

Pp 170 clean up retraction limits

113 files changed, 80 insertions, 129 deletions

diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
index 56320f0b73..79e51d0130 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
@@ -39,8 +39,7 @@ jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
index 2fbee8d9c2..12b5d00005 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
index f21e02d5d7..96c0b34b82 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
index 161ca2e079..261c2552a8 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
@@ -39,8 +39,7 @@ jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
index dd8cfd35d2..c58be35862 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
index 36d599faf3..f00847c032 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
@@ -39,8 +39,7 @@ jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
index 87784fa7cf..11b1e2e84c 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
@@ -25,6 +25,7 @@ raft_base_line_spacing = 1
 raft_interface_line_spacing = 1
 raft_interface_line_width = 0.2
 raft_surface_line_width = 0.2
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
index c49f135c87..b45b7de66e 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
@@ -23,6 +23,7 @@ raft_base_line_spacing = 2
 raft_base_line_width = 0.8
 raft_interface_line_spacing = 1
 raft_margin = 12
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
index 3231fc1cef..568e8ed542 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
@@ -26,6 +26,7 @@ raft_interface_line_spacing = 1.2
 raft_interface_line_width = 0.57
 raft_margin = 15
 raft_surface_line_width = 0.5
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 45)
 speed_print = 45
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
index 381dc5d6f8..4f67fa891d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
index 7586904bb5..6c39f15e6d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
index 2d8d2a1225..578b7615b5 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
index 61ea9914b9..d39191f6d5 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
index f3dd14c276..b2c62ba2b4 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
@@ -39,8 +39,7 @@ jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
index 238a9aa1ce..35b5f52e1e 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
index 4371dcf524..169b990d3d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
@@ -25,6 +25,7 @@ raft_base_line_spacing = 1
 raft_interface_line_spacing = 1
 raft_interface_line_width = 0.2
 raft_surface_line_width = 0.2
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
index ecd8c76a50..b822d913b3 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
@@ -23,6 +23,7 @@ raft_base_line_spacing = 2
 raft_base_line_width = 0.8
 raft_interface_line_spacing = 1
 raft_margin = 12
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
index 14844dc216..941f119653 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
@@ -26,6 +26,7 @@ raft_interface_line_spacing = 1.2
 raft_interface_line_width = 0.57
 raft_margin = 15
 raft_surface_line_width = 0.5
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 45)
 speed_print = 45
diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
index c63858f825..a24b18563d 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -12,7 +12,6 @@ material = generic_cpe
 variant = AA 0.25
 
 [values]
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
index 1b06cb31b2..53bb10c2eb 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -29,7 +29,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
index 36a3e23c27..ce7087bf3a 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -12,7 +12,6 @@ material = generic_petg
 variant = AA 0.25
 
 [values]
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
index 77af8bae1e..f26fcd025f 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
@@ -31,9 +31,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 45
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.2
-retraction_extrusion_window = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
index 7780c5a4f5..30d20139e1 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -28,7 +28,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
index cf7e671740..e213684360 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -28,7 +28,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
index c5584d8ebd..70c1b4afaa 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
@@ -30,7 +30,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
index a1c956235c..bd452fc538 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -29,7 +29,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
index 06a399982b..0c1224aa2b 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
@@ -38,8 +38,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
index bc82123384..1bce358b5d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
@@ -36,8 +36,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
index 746e1bf4a2..b997f3acff 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
@@ -38,8 +38,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
index f0e0e97ab3..d6181b9207 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -35,8 +35,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
index 5a49c5d95f..c151870622 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
@@ -38,9 +38,8 @@ prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
 retraction_amount = 6.5
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
index 1da161a2fb..7e21bec438 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
@@ -37,9 +37,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
index 7beb3697cf..c47bfb3c18 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
@@ -35,9 +35,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
index 47939c1a8d..9c02ed5200 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -35,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
index 1baadf59a0..fe3f453f9c 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -36,9 +36,8 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
 retraction_amount = 7
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
index 4e9aa528df..c824bc59ab 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -33,9 +33,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
index 8fdcd54797..6510c0db81 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 10
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
index ff729395b9..d37c9aef29 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 20
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
index 911932c819..2313d3e7f2 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 15
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
index 53bf19e17b..e68fde0763 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -30,7 +30,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
index a1cfef6d5f..c0c9e7c48a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -31,7 +31,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
index 388959da4a..e85db940a5 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -30,7 +30,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
index ae1cd2f262..a9adf2e3de 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
@@ -16,5 +16,6 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 20
 support_brim_enable = True
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
index 9652a2f50a..90be6c2b37 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
@@ -16,6 +16,7 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 15
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
index 72cc7dc901..98d9566577 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
@@ -15,5 +15,6 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.18
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
index e828b94f2e..cc8c3bf10a 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
index e7c07c73fa..6a54c04e7b 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.8
 brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
index bcb92ccefa..7947e3cfe8 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -15,5 +15,6 @@ variant = BB 0.8
 brim_replaces_support = False
 layer_height = 0.4
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_interface_height = 0.9
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
index 3ce14a2ad0..3e2c92bbf6 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -15,6 +15,7 @@ variant = BB 0.8
 brim_replaces_support = False
 layer_height = 0.3
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
index d875b9c8f3..5ced8748b1 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -13,7 +13,6 @@ variant = AA 0.25
 
 [values]
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
index a3a0073bba..071db69a43 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -30,7 +30,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
index 516f24dec5..6c3a7e7a81 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -13,7 +13,6 @@ variant = AA 0.25
 
 [values]
 retraction_combing_max_distance = 8
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
index cd5a6ece36..8ae871f4fe 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
@@ -30,9 +30,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 6
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.2
-retraction_extrusion_window = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
index 04feb8bc3e..b933ae005b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -27,7 +27,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
index f3dce95478..526e12bfe0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -28,7 +28,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
index dbcd95a344..be5d77a69e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
@@ -29,7 +29,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
index a4f6670bb6..bc16d73c04 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -29,7 +29,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
index 85d31733e6..5190288662 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
@@ -38,8 +38,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
index 9581f95cf0..5467595bd3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
@@ -35,8 +35,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
index ff5d6f4f7c..c694b5db79 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
@@ -38,8 +38,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
index a61e50f280..5287ce24c4 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -36,8 +36,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
index 17ff0c29c0..88089479ad 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
@@ -35,9 +35,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
index 98af956680..dd35987ced 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
@@ -34,9 +34,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
index 377756def0..5eff4b3248 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
@@ -36,9 +36,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
index 49882c937e..90a68d134e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -34,9 +34,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
index 722a6bd2e8..d59d5c18f7 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -35,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
index ca8410766a..c0445e739c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -35,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
index 4572e3fabc..14a7451bcc 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 10
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
index 596f34d7b9..c466b76c1c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 20
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
index 4f1a91337a..804149a584 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -25,7 +25,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 15
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
index dc4858e463..ab71a4c37e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -28,7 +28,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
index d2e23c81a9..ac2181d373 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -29,7 +29,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
index 3d4076c08c..e4bb128599 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -28,7 +28,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
index afb19f1769..94802d49fc 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
@@ -16,5 +16,6 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 20
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
index 6b1cef8991..bafe3e88d6 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
@@ -16,6 +16,7 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 15
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
index 0a9a37ca05..c1b9556636 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
@@ -15,5 +15,6 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.18
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
index a899959d98..0a4e11c158 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
index 0cd6094bbc..8bd0e5d375 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
@@ -15,6 +15,7 @@ is_experimental = True
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
index 388ebeff72..587b7b29cd 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.8
 brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
index e9030819ea..c1cbac87a0 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -14,5 +14,6 @@ variant = BB 0.8
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_interface_height = 0.9
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
index c35737bb97..b5e22bef62 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = BB 0.8
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
index 52499d000c..f895450c0a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -13,7 +13,6 @@ variant = AA 0.25
 
 [values]
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
index 7f83286f73..ec8409137c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
@@ -29,7 +29,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
index 7a3b50c550..76c8372166 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -13,7 +13,6 @@ variant = AA 0.25
 
 [values]
 retraction_combing_max_distance = 8
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
index 338bb22d26..df673c641c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
@@ -30,9 +30,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 6
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.2
-retraction_extrusion_window = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
index 495cf61bb5..fc2156acf5 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -27,7 +27,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
index 004a2d1e3b..9a17e20047 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -27,7 +27,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
index d6749fb862..1511dd698e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
@@ -29,7 +29,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
index f6ec122e53..881e89d91b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -28,7 +28,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
index a1a6c983d3..1e2f58a3c3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
@@ -36,8 +36,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
index 605322ee27..ce5d8a5c89 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
@@ -35,8 +35,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
index 6445e2deb0..99d5d7ef1d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
@@ -37,8 +37,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
index 3d7242cf56..15b7a619e8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
@@ -35,8 +35,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
index 5f42de95a2..4ee2ec2f4e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
@@ -35,9 +35,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
index 31e7216706..bd01a9e7e6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
@@ -35,9 +35,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
index 1121fe6507..9cc83fa123 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
@@ -36,9 +36,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
index 5bc61f0fbe..dd4fe11a2c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
@@ -35,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
index 0b38a609ba..346bb31931 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
@@ -35,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
index 276f497bb3..e8617e309f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -34,9 +34,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
index 1d2d0c68fd..aa86db8c84 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 10
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
index 7026544931..4bf0036315 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 20
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
index 98c8df6a6a..69a33b38f8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -25,7 +25,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 15
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
index f6d8169fe8..9301d7d69f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
@@ -28,7 +28,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
index 561acf9fbc..f410bd8c85 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -29,7 +29,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
index fa432061bb..3df2f2ca0e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -28,7 +28,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
index ef24c27b5a..b4ebe1f4e9 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
@@ -16,5 +16,6 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 20
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
index d630c3bd3a..5f14866677 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
@@ -16,6 +16,7 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 15
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
index 8d5448aafb..9e35615f14 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
@@ -15,5 +15,6 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.18
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
index cf4c07a411..b1774d2c27 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
index e7a9936864..bd85b127a7 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
@@ -15,6 +15,7 @@ is_experimental = True
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
index 979295a38d..037e813e7f 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.8
 brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
index ffdc9c9d26..9a8a17da20 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -14,5 +14,6 @@ variant = BB 0.8
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_interface_height = 0.9
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
index 871af303ed..4229ad1758 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = BB 0.8
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2