diff --git a/resources/profiles/TriLAB.idx b/resources/profiles/TriLAB.idx
index 75819e135..9ba40c9fc 100644
--- a/resources/profiles/TriLAB.idx
+++ b/resources/profiles/TriLAB.idx
@@ -1,3 +1,5 @@
+min_slic3r_version = 2.5.0-alpha0
+1.0.2 Added home to start gcode before heating bed, added DeltiQ 2 material PLA Prusament, fixed gcode for pause print, improved output filename template(added printhead code, added filament used length, truncated timestamp)
 min_slic3r_version = 2.4.1-rc1
 1.0.1 Fix missing AzteQ Industrial ABS material for 0.6, 0.8 nozzle, enabled elefant foot compensation
 1.0.0 Added AzteQ Industrial profiles for 0.8 nozzle, updated spool weight and filament cost, some minor setting improvements
diff --git a/resources/profiles/TriLAB.ini b/resources/profiles/TriLAB.ini
index b5c31d183..62ddd94a2 100644
--- a/resources/profiles/TriLAB.ini
+++ b/resources/profiles/TriLAB.ini
@@ -6,7 +6,7 @@
 name = TriLAB
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 1.0.1
+config_version = 1.0.2
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/TriLAB/
 # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -22,7 +22,7 @@ technology = FFF
 family = AzteQ
 bed_model = aq_bed.stl
 bed_texture = aq_bed_texture.svg
-default_materials = AzteQ Industrial (Door Opened) - PLA - ExtraFill (Fillamentum);AzteQ Industrial (Door Opened) - PLA - Generic;AzteQ Industrial (PLA Printhead) - PLA - ExtraFill (Fillamentum);AzteQ Industrial - ABS - ExtraFill (Fillamentum);AzteQ Industrial - ABS - Generic;AzteQ Industrial - ASA - ExtraFill (Fillamentum);AzteQ Industrial - ASA - Generic;AzteQ Industrial - ASA - Prusament (Prusa);AzteQ Industrial - PA - Nylon PA12 (Fiberlogy);AzteQ Industrial - PC Blend - Prusament (Prusa);AzteQ Industrial - PC - PolyMax (Polymaker);AzteQ Industrial - PC - PolyMax (Polymaker) @0.6 nozzle;AzteQ Industrial - PC/ABS - (Fillamentum);AzteQ Industrial - PC/ABS - (Fillamentum) @0.6 nozzle;AzteQ Industrial - PA - Nylon FX256 (Fillamentum);AzteQ Industrial - PA - Nylon FX256 (Fillamentum) @0.6 nozzle;AzteQ Industrial - ABS - Generic @0.8 nozzle;AzteQ Industrial - ABS - ExtraFill (Fillamentum) @0.8 nozzle;AzteQ Industrial - ASA - ExtraFill (Fillamentum) @0.8 nozzle;AzteQ Industrial - ASA - Prusament (Prusa) @0.8 nozzle;AzteQ Industrial - PC Blend - Prusament (Prusa) @0.8 nozzle
+default_materials = AzteQ Industrial (Door Opened) - PLA - ExtraFill (Fillamentum);AzteQ Industrial (Door Opened) - PLA - Generic;AzteQ Industrial (PLA Printhead) - PLA - ExtraFill (Fillamentum);AzteQ Industrial - ABS - ExtraFill (Fillamentum);AzteQ Industrial - ABS - Generic;AzteQ Industrial - ASA - ExtraFill (Fillamentum);AzteQ Industrial - ASA - Generic;AzteQ Industrial - ASA - Prusament (Prusa Polymers);AzteQ Industrial - PA - Nylon PA12 (Fiberlogy);AzteQ Industrial - PC Blend - Prusament (Prusa Polymers);AzteQ Industrial - PC - PolyMax (Polymaker);AzteQ Industrial - PC - PolyMax (Polymaker) @0.6 nozzle;AzteQ Industrial - PC/ABS - (Fillamentum);AzteQ Industrial - PC/ABS - (Fillamentum) @0.6 nozzle;AzteQ Industrial - PA - Nylon FX256 (Fillamentum);AzteQ Industrial - PA - Nylon FX256 (Fillamentum) @0.6 nozzle;AzteQ Industrial - ABS - Generic @0.8 nozzle;AzteQ Industrial - ABS - ExtraFill (Fillamentum) @0.8 nozzle;AzteQ Industrial - ASA - ExtraFill (Fillamentum) @0.8 nozzle;AzteQ Industrial - ASA - Prusament (Prusa Polymers) @0.8 nozzle;AzteQ Industrial - PC Blend - Prusament (Prusa Polymers) @0.8 nozzle
 
 [printer_model:DQ2]
 name = DeltiQ 2
@@ -31,7 +31,7 @@ technology = FFF
 family = DeltiQ 2
 bed_model = dq2_bed.stl
 bed_texture = dq2_bed_texture.svg
-default_materials = DeltiQ - PLA - Generic;DeltiQ - PLA - ExtraFill (Fillamentum);DeltiQ - PETG - Generic;DeltiQ - PETG (Devil Design);DeltiQ - ABS - Generic;DeltiQ - ABS - ExtraFill (Fillamentum);DeltiQ - ASA - ExtraFill (Fillamentum);DeltiQ - ASA - ASA 275 (Spectrum);DeltiQ - CPE - HG100 (Fillamentum);DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle;DeltiQ - PETG (Devil Design) @0.25 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - PETG (Devil Design) @0.6 nozzle;DeltiQ - ABS - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ASA 275 (Spectrum) @0.6 nozzle;DeltiQ - CPE - HG100 (Fillamentum) @0.6 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle;DeltiQ - PETG (Devil Design) @0.8 nozzle;DeltiQ - PA - Nylon PA12 (Fiberlogy);DeltiQ - PA - Nylon CF15 Carbon (Fillamentum);DeltiQ - MoldLay (Wax-Alike)
+default_materials = DeltiQ - PLA - Generic;DeltiQ - PLA - Prusament (Prusa Polymers); DeltiQ - PLA - ExtraFill (Fillamentum);DeltiQ - PETG - Generic;DeltiQ - PETG (Devil Design);DeltiQ - ABS - Generic;DeltiQ - ABS - ExtraFill (Fillamentum);DeltiQ - ASA - ExtraFill (Fillamentum);DeltiQ - ASA - ASA 275 (Spectrum);DeltiQ - CPE - HG100 (Fillamentum);DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle;DeltiQ - PETG (Devil Design) @0.25 nozzle;DeltiQ - PLA - Prusament (Prusa Polymers) @0.6 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - PETG (Devil Design) @0.6 nozzle;DeltiQ - ABS - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ASA 275 (Spectrum) @0.6 nozzle;DeltiQ - CPE - HG100 (Fillamentum) @0.6 nozzle;DeltiQ - PLA - Prusament (Prusa Polymers) @0.8 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle;DeltiQ - PETG (Devil Design) @0.8 nozzle;DeltiQ - PA - Nylon PA12 (Fiberlogy);DeltiQ - PA - Nylon CF15 Carbon (Fillamentum);DeltiQ - MoldLay (Wax-Alike)
 
 [printer_model:DQ2P]
 name = DeltiQ 2 Plus
@@ -40,7 +40,7 @@ technology = FFF
 family = DeltiQ 2
 bed_model = dq2_bed.stl
 bed_texture = dq2_bed_texture.svg
-default_materials = DeltiQ - PLA - Generic;DeltiQ - PLA - ExtraFill (Fillamentum);DeltiQ - PETG - Generic;DeltiQ - PETG (Devil Design);DeltiQ - ABS - Generic;DeltiQ - ABS - ExtraFill (Fillamentum);DeltiQ - ASA - ExtraFill (Fillamentum);DeltiQ - ASA - ASA 275 (Spectrum);DeltiQ - CPE - HG100 (Fillamentum);DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle;DeltiQ - PETG (Devil Design) @0.25 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - PETG (Devil Design) @0.6 nozzle;DeltiQ - ABS - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ASA 275 (Spectrum) @0.6 nozzle;DeltiQ - CPE - HG100 (Fillamentum) @0.6 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle;DeltiQ - PETG (Devil Design) @0.8 nozzle;DeltiQ - PA - Nylon PA12 (Fiberlogy);DeltiQ - PA - Nylon CF15 Carbon (Fillamentum);DeltiQ - MoldLay (Wax-Alike)
+default_materials = DeltiQ - PLA - Generic;DeltiQ - PLA - Prusament (Prusa Polymers); DeltiQ - PLA - ExtraFill (Fillamentum);DeltiQ - PETG - Generic;DeltiQ - PETG (Devil Design);DeltiQ - ABS - Generic;DeltiQ - ABS - ExtraFill (Fillamentum);DeltiQ - ASA - ExtraFill (Fillamentum);DeltiQ - ASA - ASA 275 (Spectrum);DeltiQ - CPE - HG100 (Fillamentum);DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle;DeltiQ - PETG (Devil Design) @0.25 nozzle;DeltiQ - PLA - Prusament (Prusa Polymers) @0.6 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - PETG (Devil Design) @0.6 nozzle;DeltiQ - ABS - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ASA 275 (Spectrum) @0.6 nozzle;DeltiQ - CPE - HG100 (Fillamentum) @0.6 nozzle;DeltiQ - PLA - Prusament (Prusa Polymers) @0.8 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle;DeltiQ - PETG (Devil Design) @0.8 nozzle;DeltiQ - PA - Nylon PA12 (Fiberlogy);DeltiQ - PA - Nylon CF15 Carbon (Fillamentum);DeltiQ - MoldLay (Wax-Alike)
 
 [printer_model:DQ2+FP2]
 name = DeltiQ 2 + FlexPrint 2
@@ -49,7 +49,7 @@ technology = FFF
 family = DeltiQ 2
 bed_model = dq2_bed.stl
 bed_texture = dq2_bed_texture.svg
-default_materials = DeltiQ FP2 - PLA - Generic;DeltiQ FP2 - PLA - ExtraFill (Fillamentum);DeltiQ FP2 - PETG - Generic;DeltiQ FP2 - PETG (Devil Design);DeltiQ FP2 - ABS - Generic;DeltiQ FP2 - ABS - ExtraFill (Fillamentum);DeltiQ FP2 - ASA - ExtraFill (Fillamentum);DeltiQ FP2 - CPE - HG100 (Fillamentum);DeltiQ FP2 - FLEX - Generic;DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 93A (SMARTFIL);DeltiQ FP2 - PEBA 90A - FlexFill (Fillamentum)
+default_materials = DeltiQ FP2 - PLA - Generic;DeltiQ FP2 - PLA - Prusament (Prusa Polymers);DeltiQ FP2 - PLA - ExtraFill (Fillamentum);DeltiQ FP2 - PETG - Generic;DeltiQ FP2 - PETG (Devil Design);DeltiQ FP2 - ABS - Generic;DeltiQ FP2 - ABS - ExtraFill (Fillamentum);DeltiQ FP2 - ASA - ExtraFill (Fillamentum);DeltiQ FP2 - CPE - HG100 (Fillamentum);DeltiQ FP2 - FLEX - Generic;DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 93A (SMARTFIL);DeltiQ FP2 - PEBA 90A - FlexFill (Fillamentum)
 
 [printer_model:DQ2P+FP2]
 name = DeltiQ 2 Plus + FlexPrint 2
@@ -58,7 +58,7 @@ technology = FFF
 family = DeltiQ 2
 bed_model = dq2_bed.stl
 bed_texture = dq2_bed_texture.svg
-default_materials = DeltiQ FP2 - PLA - Generic;DeltiQ FP2 - PLA - ExtraFill (Fillamentum);DeltiQ FP2 - PETG - Generic;DeltiQ FP2 - PETG (Devil Design);DeltiQ FP2 - ABS - Generic;DeltiQ FP2 - ABS - ExtraFill (Fillamentum);DeltiQ FP2 - ASA - ExtraFill (Fillamentum);DeltiQ FP2 - CPE - HG100 (Fillamentum);DeltiQ FP2 - FLEX - Generic;DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 93A (SMARTFIL);DeltiQ FP2 - PEBA 90A - FlexFill (Fillamentum)
+default_materials = DeltiQ FP2 - PLA - Generic;DeltiQ FP2 - PLA - Prusament (Prusa Polymers);DeltiQ FP2 - PLA - ExtraFill (Fillamentum);DeltiQ FP2 - PETG - Generic;DeltiQ FP2 - PETG (Devil Design);DeltiQ FP2 - ABS - Generic;DeltiQ FP2 - ABS - ExtraFill (Fillamentum);DeltiQ FP2 - ASA - ExtraFill (Fillamentum);DeltiQ FP2 - CPE - HG100 (Fillamentum);DeltiQ FP2 - FLEX - Generic;DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 93A (SMARTFIL);DeltiQ FP2 - PEBA 90A - FlexFill (Fillamentum)
 
 [printer_model:DQ2+FP]
 name = DeltiQ 2 + FlexPrint
@@ -67,7 +67,7 @@ technology = FFF
 family = DeltiQ 2
 bed_model = dq2_bed.stl
 bed_texture = dq2_bed_texture.svg
-default_materials = DeltiQ FP - PLA - Generic;DeltiQ FP - PLA - ExtraFill (Fillamentum);DeltiQ FP - PETG - Generic;DeltiQ FP - PETG (Devil Design);DeltiQ FP - ABS - Generic;DeltiQ FP - ABS - ExtraFill (Fillamentum);DeltiQ FP - ASA - ExtraFill (Fillamentum);DeltiQ FP - CPE - HG100 (Fillamentum);DeltiQ FP - FLEX - Generic
+default_materials = DeltiQ FP - PLA - Generic;DeltiQ FP - PLA - Prusament (Prusa Polymers);DeltiQ FP - PLA - ExtraFill (Fillamentum);DeltiQ FP - PETG - Generic;DeltiQ FP - PETG (Devil Design);DeltiQ FP - ABS - Generic;DeltiQ FP - ABS - ExtraFill (Fillamentum);DeltiQ FP - ASA - ExtraFill (Fillamentum);DeltiQ FP - CPE - HG100 (Fillamentum);DeltiQ FP - FLEX - Generic
 
 [printer_model:DQ2P+FP]
 name = DeltiQ 2 Plus + FlexPrint
@@ -76,7 +76,7 @@ technology = FFF
 family = DeltiQ 2
 bed_model = dq2_bed.stl
 bed_texture = dq2_bed_texture.svg
-default_materials = DeltiQ FP - PLA - Generic;DeltiQ FP - PLA - ExtraFill (Fillamentum);DeltiQ FP - PETG - Generic;DeltiQ FP - PETG (Devil Design);DeltiQ FP - ABS - Generic;DeltiQ FP - ABS - ExtraFill (Fillamentum);DeltiQ FP - ASA - ExtraFill (Fillamentum);DeltiQ FP - CPE - HG100 (Fillamentum);DeltiQ FP - FLEX - Generic
+default_materials = DeltiQ FP - PLA - Generic;DeltiQ FP - PLA - Prusament (Prusa Polymers);DeltiQ FP - PLA - ExtraFill (Fillamentum);DeltiQ FP - PETG - Generic;DeltiQ FP - PETG (Devil Design);DeltiQ FP - ABS - Generic;DeltiQ FP - ABS - ExtraFill (Fillamentum);DeltiQ FP - ASA - ExtraFill (Fillamentum);DeltiQ FP - CPE - HG100 (Fillamentum);DeltiQ FP - FLEX - Generic
 
 [printer_model:DQM]
 name = DeltiQ M
@@ -158,7 +158,7 @@ min_skirt_length = 4
 notes = 
 only_retract_when_crossing_perimeters = 0
 ooze_prevention = 0
-output_filename_format = {input_filename_base}_{printer_model}_{filament_type[0]}_{layer_height}mm_{print_time}_{timestamp}.gcode
+output_filename_format = {input_filename_base}_{printer_model}_{filament_notes[0]}_{filament_type[0]}_{print_time}_{round(used_filament)}m_{year}{zdigits(month, 2)}{zdigits(day, 2)}-{hour}{minute}.gcode
 overhangs = 1
 perimeter_acceleration = 1500
 perimeter_extruder = 1
@@ -459,7 +459,7 @@ min_skirt_length = 4
 notes = 
 only_retract_when_crossing_perimeters = 0
 ooze_prevention = 0
-output_filename_format = {input_filename_base}_{printer_model}_{filament_type[0]}_{layer_height}mm_{print_time}_{timestamp}.gcode
+output_filename_format = {input_filename_base}_{printer_model}_{filament_notes[0]}_{filament_type[0]}_{print_time}_{round(used_filament)}m_{year}{zdigits(month, 2)}{zdigits(day, 2)}-{hour}{minute}.gcode
 overhangs = 1
 perimeter_acceleration = 1500
 perimeter_extruder = 1
@@ -681,7 +681,6 @@ extrusion_multiplier = 1
 filament_colour = #FF0000
 filament_diameter = 1.75
 filament_minimal_purge_on_wipe_tower = 15
-filament_notes = ""
 filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
 filament_settings_id = ""
 filament_soluble = 0
@@ -691,6 +690,7 @@ end_filament_gcode = "; FILAMENT_END_GCODE"
 filament_cost = 0
 filament_spool_weight = 250
 filament_vendor = Generic
+filament_notes = "LP-CU"
 
 # DeltiQ PLA filaments #
 
@@ -719,6 +719,59 @@ min_print_speed = 10
 slowdown_below_layer_time = 4
 temperature = 215
 
+[filament:DeltiQ - PLA - Prusament (Prusa Polymers)]
+inherits = DeltiQ - PLA - Generic
+bed_temperature = 55
+bridge_fan_speed = 100
+cooling = 1
+extrusion_multiplier = 1
+fan_always_on = 1
+fan_below_layer_time = 100
+filament_cost = 550
+filament_density = 1.24
+filament_deretract_speed = nil
+filament_max_volumetric_speed = 8
+filament_retract_before_travel = 2
+filament_retract_before_wipe = 90%
+filament_retract_layer_change = 1
+filament_retract_length = 4
+filament_retract_lift = 0.2
+filament_retract_lift_above = nil
+filament_retract_lift_below = nil
+filament_retract_restart_extra = nil
+filament_retract_speed = 30
+filament_spool_weight = 201
+filament_vendor = Prusa Polymers
+filament_wipe = 1
+first_layer_bed_temperature = 55
+first_layer_temperature = 215
+full_fan_speed_layer = 0
+max_fan_speed = 100
+min_fan_speed = 100
+min_print_speed = 10
+slowdown_below_layer_time = 4
+temperature = 215
+
+[filament:DeltiQ - PLA - Prusament (Prusa Polymers) @0.6 nozzle]
+inherits = DeltiQ - PLA - Prusament (Prusa Polymers)
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.6
+filament_max_volumetric_speed = 15
+filament_notes = "BN"
+
+[filament:DeltiQ - PLA - Prusament (Prusa Polymers) @0.8 nozzle]
+inherits = DeltiQ - PLA - Prusament (Prusa Polymers)
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_FAMILY_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.8
+disable_fan_first_layers = 1
+filament_max_volumetric_speed = 40
+first_layer_temperature = 230
+slowdown_below_layer_time = 8
+temperature = 230
+filament_retract_layer_change = 0
+filament_retract_length = 4.1
+filament_retract_speed = 45
+filament_deretract_speed = 25
+filament_notes = "ZL"
+
 [filament:DeltiQ - PLA - ExtraFill (Fillamentum)]
 inherits = DeltiQ - PLA - Generic
 filament_cost = 24.27
@@ -729,11 +782,13 @@ filament_vendor = Fillamentum
 [filament:DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle]
 inherits = DeltiQ - PLA - ExtraFill (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_FAMILY_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.25
+filament_notes = "BN"
 
 [filament:DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle]
 inherits = DeltiQ - PLA - ExtraFill (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle]
 inherits = DeltiQ - PLA - ExtraFill (Fillamentum)
@@ -747,6 +802,7 @@ filament_retract_layer_change = 0
 filament_retract_length = 4.1
 filament_retract_speed = 45
 filament_deretract_speed = 25
+filament_notes = "ZL"
 
 [filament:DeltiQ FP - PLA - Generic]
 inherits = DeltiQ - PLA - Generic
@@ -767,6 +823,39 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and p
 filament_retract_length = 1.2
 filament_retract_speed = 28
 
+[filament:DeltiQ FP2 - PLA - Prusament (Prusa Polymers)]
+inherits = DeltiQ FP2 - PLA - Generic
+bed_temperature = 55
+bridge_fan_speed = 100
+cooling = 1
+extrusion_multiplier = 1
+fan_always_on = 1
+fan_below_layer_time = 100
+filament_cost = 550
+filament_density = 1.24
+filament_deretract_speed = nil
+filament_max_volumetric_speed = 8
+filament_retract_before_travel = 2
+filament_retract_before_wipe = 90%
+filament_retract_layer_change = 1
+filament_retract_length = 1.2
+filament_retract_lift = 0.2
+filament_retract_lift_above = nil
+filament_retract_lift_below = nil
+filament_retract_restart_extra = nil
+filament_retract_speed = 28
+filament_spool_weight = 201
+filament_vendor = Prusa Polymers
+filament_wipe = 1
+first_layer_bed_temperature = 55
+first_layer_temperature = 215
+full_fan_speed_layer = 0
+max_fan_speed = 100
+min_fan_speed = 100
+min_print_speed = 10
+slowdown_below_layer_time = 4
+temperature = 215
+
 [filament:DeltiQ FP2 - PLA - ExtraFill (Fillamentum)]
 inherits = DeltiQ FP2 - PLA - Generic
 filament_cost = 24.27
@@ -817,11 +906,13 @@ temperature = 220
 max_fan_speed = 65
 min_fan_speed = 40
 bridge_fan_speed = 100
+filament_notes = "JW"
 
 [filament:DeltiQ - PETG (Devil Design) @0.6 nozzle]
 inherits = DeltiQ - PETG (Devil Design)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:DeltiQ - PETG (Devil Design) @0.8 nozzle]
 inherits = DeltiQ - PETG (Devil Design)
@@ -836,6 +927,7 @@ filament_retract_speed = 45
 filament_deretract_speed = 25
 filament_retract_before_wipe = 80%
 filament_wipe = 1
+filament_notes = "ZL"
 
 [filament:DeltiQ FP - PETG - Generic]
 inherits = DeltiQ - PETG - Generic
@@ -902,6 +994,7 @@ filament_vendor = Fillamentum
 inherits = DeltiQ - ABS - ExtraFill (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:DeltiQ FP - ABS - Generic]
 inherits = DeltiQ - ABS - Generic
@@ -946,6 +1039,7 @@ temperature = 265
 inherits = DeltiQ - ASA - ExtraFill (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:DeltiQ FP - ASA - ExtraFill (Fillamentum)]
 inherits = DeltiQ - ASA - ExtraFill (Fillamentum)
@@ -989,7 +1083,7 @@ temperature = 230
 inherits = DeltiQ - ASA - ASA 275 (Spectrum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
-
+filament_notes = "BN"
 
 # DeltiQ CPE filaments #
 
@@ -1026,6 +1120,7 @@ temperature = 260
 inherits = DeltiQ - CPE - HG100 (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_DQ.*/ and !(printer_notes=~/.*FLEXPRINT.*/) and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:DeltiQ FP - CPE - HG100 (Fillamentum)]
 inherits = DeltiQ - CPE - HG100 (Fillamentum)
@@ -1250,6 +1345,7 @@ filament_vendor = Wax-Alike
 [filament:*AzteQ common*]
 inherits = *DeltiQ common* 
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.4
+filament_notes = "CU"
 
 # AzteQ Industrial filaments #
 
@@ -1294,6 +1390,7 @@ temperature = 210
 inherits = AzteQ Industrial (Door Opened) - PLA - Generic
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial (Door Opened) - PLA - ExtraFill (Fillamentum)]
 inherits = AzteQ Industrial (Door Opened) - PLA - Generic
@@ -1306,6 +1403,7 @@ filament_spool_weight = 229
 inherits = AzteQ Industrial (Door Opened) - PLA - ExtraFill (Fillamentum) 
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial (PLA Printhead) - PLA - ExtraFill (Fillamentum)]
 inherits = *AzteQ common* 
@@ -1349,6 +1447,7 @@ temperature = 215
 inherits = AzteQ Industrial (PLA Printhead) - PLA - ExtraFill (Fillamentum) 
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial - ABS - Generic]
 inherits = *AzteQ common* 
@@ -1392,6 +1491,7 @@ temperature = 255
 inherits = AzteQ Industrial - ABS - Generic
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial - ABS - Generic @0.8 nozzle]
 inherits = AzteQ Industrial - ABS - Generic
@@ -1405,6 +1505,7 @@ min_fan_speed = 50
 filament_retract_length = 6.1
 filament_max_volumetric_speed = 0
 start_filament_gcode = "; FILAMENT_START_GCODE\nM191 S75 ; Set and wait - chamber temperature"
+filament_notes = "ZL"
 
 [filament:AzteQ Industrial - ABS - ExtraFill (Fillamentum)]
 inherits = AzteQ Industrial - ABS - Generic 
@@ -1416,11 +1517,13 @@ filament_spool_weight = 229
 [filament:AzteQ Industrial - ABS - ExtraFill (Fillamentum) @0.6 nozzle]
 inherits = AzteQ Industrial - ABS - ExtraFill (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
+filament_notes = "BN"
 
 [filament:AzteQ Industrial - ABS - ExtraFill (Fillamentum) @0.8 nozzle]
 inherits = AzteQ Industrial - ABS - ExtraFill (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.8
 extrusion_multiplier = 0.95
+filament_notes = "ZL"
 
 [filament:AzteQ Industrial - PC/ABS - (Fillamentum)]
 inherits = AzteQ Industrial - ABS - Generic 
@@ -1443,6 +1546,7 @@ filament_notes = "S180 ; Probing temperature"
 inherits = AzteQ Industrial - PC/ABS - (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial - PC - PolyMax (Polymaker)]
 inherits = AzteQ Industrial - ABS - Generic 
@@ -1464,6 +1568,7 @@ filament_notes = "S180 ; Probing temperature"
 inherits = AzteQ Industrial - PC - PolyMax (Polymaker)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial - ASA - Generic]
 inherits = *AzteQ common* 
@@ -1504,6 +1609,7 @@ temperature = 265
 inherits = AzteQ Industrial - ASA - Generic
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial - ASA - ExtraFill (Fillamentum)]
 inherits = AzteQ Industrial - ASA - Generic
@@ -1520,6 +1626,7 @@ filament_density = 1.07
 inherits = AzteQ Industrial - ASA - ExtraFill (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial - ASA - ExtraFill (Fillamentum) @0.8 nozzle]
 inherits = AzteQ Industrial - ASA - ExtraFill (Fillamentum)
@@ -1533,27 +1640,29 @@ max_fan_speed = 100
 min_fan_speed = 80
 filament_retract_length = 6.1
 filament_max_volumetric_speed = 0
+filament_notes = "ZL"
 
 
-[filament:AzteQ Industrial - ASA - Prusament (Prusa)]
+[filament:AzteQ Industrial - ASA - Prusament (Prusa Polymers)]
 inherits = AzteQ Industrial - ASA - Generic
 filament_cost = 29.16
 filament_density = 1.07
 filament_spool_weight = 201
-filament_vendor = Prusa
+filament_vendor = Prusa Polymers
 first_layer_temperature = 260
 max_fan_speed = 70
 min_fan_speed = 70
 start_filament_gcode = "; FILAMENT_START_GCODE\nM191 S50 ; Set and wait - chamber temperature"
 temperature = 260
 
-[filament:AzteQ Industrial - ASA - Prusament (Prusa) @0.6 nozzle]
-inherits = AzteQ Industrial - ASA - Prusament (Prusa)
+[filament:AzteQ Industrial - ASA - Prusament (Prusa Polymers) @0.6 nozzle]
+inherits = AzteQ Industrial - ASA - Prusament (Prusa Polymers)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
-[filament:AzteQ Industrial - ASA - Prusament (Prusa) @0.8 nozzle]
-inherits = AzteQ Industrial - ASA - Prusament (Prusa)
+[filament:AzteQ Industrial - ASA - Prusament (Prusa Polymers) @0.8 nozzle]
+inherits = AzteQ Industrial - ASA - Prusament (Prusa Polymers)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.8
 first_layer_bed_temperature = 100
 bed_temperature = 100
@@ -1564,6 +1673,7 @@ max_fan_speed = 80
 min_fan_speed = 50
 filament_retract_length = 4.1
 filament_max_volumetric_speed = 0
+filament_notes = "ZL"
 
 
 [filament:AzteQ Industrial - PA - Nylon PA12 (Fiberlogy)]
@@ -1611,6 +1721,7 @@ temperature = 255
 inherits = AzteQ Industrial - PA - Nylon PA12 (Fiberlogy)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
 [filament:AzteQ Industrial - PA - Nylon FX256 (Fillamentum)]
 inherits = *AzteQ common* 
@@ -1657,8 +1768,9 @@ temperature = 255
 inherits = AzteQ Industrial - PA - Nylon FX256 (Fillamentum)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
-[filament:AzteQ Industrial - PC Blend - Prusament (Prusa)]
+[filament:AzteQ Industrial - PC Blend - Prusament (Prusa Polymers)]
 inherits = *AzteQ common* 
 bed_temperature = 100
 bridge_fan_speed = 75
@@ -1683,7 +1795,7 @@ filament_retract_restart_extra = nil
 filament_retract_speed = 25
 filament_soluble = 0
 filament_type = PC
-filament_vendor = Prusa
+filament_vendor = Prusa Polymers
 filament_wipe = 1
 first_layer_bed_temperature = 100
 first_layer_temperature = 270
@@ -1696,13 +1808,14 @@ start_filament_gcode = "; FILAMENT_START_GCODE\nM191 S75 ; Set and wait - chambe
 temperature = 270
 filament_notes = "S180 ; Probing temperature"
 
-[filament:AzteQ Industrial - PC Blend - Prusament (Prusa) @0.6 nozzle]
-inherits = AzteQ Industrial - PC Blend - Prusament (Prusa)
+[filament:AzteQ Industrial - PC Blend - Prusament (Prusa Polymers) @0.6 nozzle]
+inherits = AzteQ Industrial - PC Blend - Prusament (Prusa Polymers)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6
 filament_max_volumetric_speed = 15
+filament_notes = "BN"
 
-[filament:AzteQ Industrial - PC Blend - Prusament (Prusa) @0.8 nozzle]
-inherits = AzteQ Industrial - PC Blend - Prusament (Prusa)
+[filament:AzteQ Industrial - PC Blend - Prusament (Prusa Polymers) @0.8 nozzle]
+inherits = AzteQ Industrial - PC Blend - Prusament (Prusa Polymers)
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.8
 first_layer_bed_temperature = 100
 bed_temperature = 100
@@ -1713,6 +1826,7 @@ max_fan_speed = 60
 min_fan_speed = 60
 filament_retract_length = 7.1
 filament_max_volumetric_speed = 0
+filament_notes = "ZL"
 
            
 # DeltiQ Printer #
@@ -1796,12 +1910,14 @@ retract_speed = 35
 
 [printer:*DeltiQ 2*]
 inherits = *DeltiQ*
+default_filament_profile = "DeltiQ - PLA - Prusament (Prusa Polymers)"
+default_print_profile = DeltiQ 0.20mm Normal
 before_layer_gcode = ; BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n
 end_gcode = ; END_GCODE\n\nM140 S0 ; Turn off bed\n\nG28 ; Home\n\nM104 S0 ; Turn off extruder\nM107 ; Turn off fan\n\nG90 ; Absolute positioning\nM220 S100  ; Feedmultiply back to 100percent\n\nM84 S5; Disable motors
 gcode_flavor = reprapfirmware
 layer_gcode = ; AFTER_LAYER_CHANGE\n;[layer_z]
-pause_print_gcode = M0
-start_gcode = ; START_GCODE\n\nM220 S100 ; Set feedmultiply back to 100percent\n\nT0 ; Select Titan extruder\n\nG90 ; Absolute positioning\nM83; Relative Extruder\n\nM190 S[first_layer_bed_temperature] ; Set and wait - bed temperature\nM104 S[first_layer_temperature]\n\nG28 ; Home all axes\nG32 ; Probe Z and calculate Z plane\n\nG29 ; Mesh bed probe\n\nG1009 ; Go ARC to purge end\n\nG92 E0 ; Zero extruder
+pause_print_gcode = M25
+start_gcode = ; START_GCODE\n\nM220 S100 ; Set feedmultiply back to 100percent\n\nT0 ; Select Titan extruder\n\nG90 ; Absolute positioning\nM83; Relative Extruder\n\nG28 ; Home all axes\n\nM190 S[first_layer_bed_temperature] ; Set and wait - bed temperature\nM104 S[first_layer_temperature]\n\nG28 ; Home all axes\nG32 ; Probe Z and calculate Z plane\n\nG29 ; Mesh bed probe\n\nG1009 ; Go ARC to purge end\n\nG92 E0 ; Zero extruder
 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_TRILAB\nPRINTER_FAMILY_DQ\nPRINTER_MODEL_DQ2
 
 [printer:DeltiQ 2]
@@ -1825,7 +1941,7 @@ printer_variant = 0.6
 max_layer_height = 0.4
 min_layer_height = 0.2
 nozzle_diameter = 0.6
-default_filament_profile = "DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle"
+default_filament_profile = "DeltiQ - PLA - Prusament (Prusa Polymers) @0.6 nozzle"
 default_print_profile = DeltiQ 0.30mm Normal @0.6 nozzle
 
 [printer:DeltiQ 2 - 0.8 nozzle]
@@ -1834,7 +1950,7 @@ printer_variant = 0.8
 max_layer_height = 0.6
 min_layer_height = 0.3
 nozzle_diameter = 0.8
-default_filament_profile = "DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle"
+default_filament_profile = "DeltiQ - PLA - Prusament (Prusa Polymers) @0.8 nozzle"
 default_print_profile = DeltiQ 0.40mm Normal @0.8 nozzle
 
 [printer:DeltiQ 2 Plus]
@@ -1858,7 +1974,7 @@ printer_variant = 0.6
 max_layer_height = 0.4
 min_layer_height = 0.2
 nozzle_diameter = 0.6
-default_filament_profile = "DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle"
+default_filament_profile = "DeltiQ - PLA - Prusament (Prusa Polymers) @0.6 nozzle"
 default_print_profile = DeltiQ 0.30mm Normal @0.6 nozzle
 
 [printer:DeltiQ 2 Plus - 0.8 nozzle]
@@ -1867,12 +1983,12 @@ printer_variant = 0.8
 max_layer_height = 0.6
 min_layer_height = 0.3
 nozzle_diameter = 0.8
-default_filament_profile = "DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle"
+default_filament_profile = "DeltiQ - PLA - Prusament (Prusa Polymers) @0.8 nozzle"
 default_print_profile = DeltiQ 0.40mm Normal @0.8 nozzle
 
 [printer:*DeltiQ 2 FlexPrint*]
 inherits = *DeltiQ 2*
-start_gcode = ; START_GCODE\n\nM220 S100 ; Set feedmultiply back to 100percent\n\nT1 ; Select FlexPrint extruder\n\nG90 ; Absolute positioning\nM83; Relative Extruder\n\nM190 S[first_layer_bed_temperature] ; Set and wait - bed temperature\nM104 S[first_layer_temperature]\n\nG28 ; Home all axes\nG32 ; Probe Z and calculate Z plane\n\nG29 ; Mesh bed probe\n\nG1009 ; Go ARC to purge end\n\nG92 E0 ; Zero extruder
+start_gcode = ; START_GCODE\n\nM220 S100 ; Set feedmultiply back to 100percent\n\nT1 ; Select FlexPrint extruder\n\nG90 ; Absolute positioning\nM83; Relative Extruder\n\nG28 ; Home all axes\n\nM190 S[first_layer_bed_temperature] ; Set and wait - bed temperature\nM104 S[first_layer_temperature]\n\nG28 ; Home all axes\nG32 ; Probe Z and calculate Z plane\n\nG29 ; Mesh bed probe\n\nG1009 ; Go ARC to purge end\n\nG92 E0 ; Zero extruder
 default_print_profile = DeltiQ 0.20mm FLEX
 default_filament_profile = "DeltiQ FP2 - FLEX - Generic"
 retract_length = 0.7
@@ -1929,7 +2045,7 @@ retract_lift_below = 0
 retract_restart_extra = 0
 retract_restart_extra_toolchange = 0
 retract_speed = 30
-start_gcode = ; START_GCODE\nT0\nM220 S100 ; Set feedmultiply back to 100 percent\nG90 ; Absolute positioning for motion\nM83 ; Relative extruder\nM107 ; Layer fan off\n\nM140 S[first_layer_bed_temperature] ; Set and continue - bed temperature\nM104 S150 ; Set and continue - hotend probing temperature\n[start_filament_gcode]\nM190 S[first_layer_bed_temperature] ; Set and wait - bed temperature\nM109 [filament_notes] ; Set and wait for material specific hotend probing temperature\n\nG28 ; Home all axes\nG32 ; Probe Z and calculate Z plane\nG29 ; Mesh bed probe\n\nM104 S[first_layer_temperature] ; Set and continue - printing temperature\n\nG1009 ; Purge hotend\nG92 E0 ; Zero extruder
+start_gcode = ; START_GCODE\nT0\nM220 S100 ; Set feedmultiply back to 100 percent\nG90 ; Absolute positioning for motion\nM83 ; Relative extruder\nM107 ; Layer fan off\n\nG28 ; Home all axes\n\nM140 S[first_layer_bed_temperature] ; Set and continue - bed temperature\nM104 S150 ; Set and continue - hotend probing temperature\n[start_filament_gcode]\nM190 S[first_layer_bed_temperature] ; Set and wait - bed temperature\nM109 [filament_notes] ; Set and wait for material specific hotend probing temperature\n\nG28 ; Home all axes\nG32 ; Probe Z and calculate Z plane\nG29 ; Mesh bed probe\n\nM104 S[first_layer_temperature] ; Set and continue - printing temperature\n\nG1009 ; Purge hotend\nG92 E0 ; Zero extruder
 wipe = 1
 
 [printer:AzteQ Industrial]
@@ -1937,7 +2053,7 @@ inherits = *AzteQ*
 printer_model = AQI
 printer_variant = 0.4
 max_print_height = 400
-default_filament_profile = "AzteQ Industrial - ABS - ExtraFill (Fillamentum)"
+default_filament_profile = "AzteQ Industrial - ASA - Prusament (Prusa Polymers)"
 default_print_profile = AzteQ Industrial 0.30mm Normal
 
 [printer:AzteQ Industrial - 0.6 nozzle]
@@ -1946,7 +2062,7 @@ printer_variant = 0.6
 max_layer_height = 0.4
 min_layer_height = 0.2
 nozzle_diameter = 0.6
-default_filament_profile = "AzteQ Industrial - ABS - ExtraFill (Fillamentum) @0.6 nozzle"
+default_filament_profile = "AzteQ Industrial - ASA - Prusament (Prusa Polymers) @0.6 nozzle"
 default_print_profile = AzteQ Industrial 0.30mm Normal @0.6 nozzle
 
 [printer:AzteQ Industrial - 0.8 nozzle]
@@ -1955,10 +2071,10 @@ printer_variant = 0.8
 max_layer_height = 0.6
 min_layer_height = 0.2
 nozzle_diameter = 0.8
-default_filament_profile = "AzteQ Industrial - ABS - ExtraFill (Fillamentum) @0.8 nozzle"
+default_filament_profile = "AzteQ Industrial - ASA - Prusament (Prusa Polymers) @0.8 nozzle"
 default_print_profile = AzteQ Industrial 0.40mm Normal @0.8 nozzle
 
 [presets]
 print = DeltiQ 0.20mm Normal
 printer = DeltiQ 2
-filament = DeltiQ - PLA - Generic
\ No newline at end of file
+filament = DeltiQ - PLA - Prusament (Prusa Polymers)
\ No newline at end of file