diff --git a/profiles/generators/DF4/DF4_Generate_Warlock.simc b/profiles/generators/DF4/DF4_Generate_Warlock.simc
index 7f60cde188d..d5e792e24e3 100644
--- a/profiles/generators/DF4/DF4_Generate_Warlock.simc
+++ b/profiles/generators/DF4/DF4_Generate_Warlock.simc
@@ -1,83 +1,84 @@
-# warlock="DF4_Warlock_Affliction"
-# level=70
-# spec=affliction
-# race=human
-# role=spell
-# position=ranged_back
-# talents=BkQAAAAAAAAAAAAAAAAAAAAAAASSSkkAppoEpdgkESJAAAAQDAAAAAAgERLEJJSikWSEAQC
+warlock="DF4_Warlock_Affliction"
+level=70
+spec=affliction
+race=human
+role=spell
+position=ranged_back
+talents=BkQAAAAAAAAAAAAAAAAAAAAAAASSSkkAppoEpdgkESJAAAAQDAAAAAAgERLEJJSikWSEAQC
 
-# food=thousandbone_tongueslicer
+food=thousandbone_tongueslicer
 
-# head=devout_ashdevils_grimhorns,id=207272,bonus_id=6652/9599/7979/9563/9513/1494/8767/1808,ilevel=489,gem_id=192988,enchant_id=7052
-# neck=chain_of_the_green_flight,id=137311,bonus_id=3524/8782,ilevel=489,gem_id=192961/192961/192961
-# shoulders=devout_ashdevils_hatespikes,id=207270,bonus_id=6652/7979/9562/9511/1491/8767,ilevel=489
-# back=vibrant_wildercloth_shawl,id=193511,bonus_id=9379/8960,ilevel=486,enchant_id=6592,crafted_stats=40/49
-# chest=devout_ashdevils_razorhide,id=207275,bonus_id=6652/7979/9562/9515/1491/8767,ilevel=489,enchant_id=6625
-# wrists=vibrant_wildercloth_wristwraps,id=193510,bonus_id=9379/8960,ilevel=486,gem_id=192961,enchant_id=6574,crafted_stats=40/32
-# hands=twisting_shadow_claws,id=207115,bonus_id=3524,ilevel=489
-# waist=poisonroot_belt,id=134423,bonus_id=3524/1808,ilevel=489,gem_id=192961,enchant_id=6904
-# legs=devout_ashdevils_tights,id=207271,bonus_id=6652/7979/9562/9512/1491/8767,ilevel=489,enchant_id=6541
-# feet=lifewoven_slippers,id=207123,bonus_id=3524,ilevel=489
-# finger1=band_of_callous_dominance,id=134528,bonus_id=3524/1808,ilevel=489,gem_id=192961,enchant_id=6550
-# finger2=thornwoven_band,id=162548,bonus_id=3524/1808,ilevel=489,gem_id=192961,enchant_id=6556
-# trinket1=nymues_unraveling_spindle,id=208615,ilevel=489
-# trinket2=belorrelos_the_suncaller,id=207172,ilevel=489
-# main_hand=iridal_the_earths_master,id=208321,bonus_id=3524,ilevel=489,enchant_id=6655
+head=grimhorns_of_the_sinister_savant,id=217212,bonus_id=523,ilevel=528,gem_id=192982,enchant_id=7052
+neck=tuskarr_bone_necklace,id=193666,bonus_id=4786/1659/9539/8782,ilevel=528,gem_id=192925/192925/192925
+shoulders=boastful_stalkers_epaulets,id=193667,bonus_id=4786/1659/9539,ilevel=528
+back=voice_of_the_silent_star,id=204465,bonus_id=4800/4786/1498,ilevel=535
+chest=cursed_robes_of_the_sinister_savant,id=217215,ilevel=528,enchant_id=6625
+wrists=vibrant_wildercloth_wristwraps,id=193510,bonus_id=9500/9405/9379/8960/523/8793,ilevel=525,gem_id=192925,crafted_stats=40/49
+hands=grips_of_the_sinister_savant,id=217211,ilevel=528
+waist=whispering_fanged_cord,id=208430,bonus_id=4800/4786/1511/9573/523,ilevel=528,gem_id=192925,enchant_id=6904
+legs=leggings_of_the_sinister_savant,id=217213,ilevel=528,enchant_id=6830
+feet=vibrant_wildercloth_slippers,id=193519,bonus_id=8932/8960/8793,ilevel=525
+finger1=seal_of_filial_duty,id=195526,bonus_id=4800/4786/1498/523,ilevel=535,gem_id=192925,enchant_id=6550
+finger2=seal_of_diurnas_chosen,id=195480,bonus_id=1808,ilevel=528,gem_id=192925,enchant_id=6550
+trinket1=nymues_unraveling_spindle,id=208615,bonus_id=4800/4786/1520/9576,ilevel=528
+trinket2=belorrelos_the_suncaller,id=207172,bonus_id=4800/4786/1520/9576,ilevel=528
+main_hand=dreambinder_loom_of_the_great_cycle,id=208616,ilevel=528,enchant_id=6655
 
-# save=DF4_Warlock_Affliction.simc
+save=DF4_Warlock_Affliction.simc
 
-# warlock="DF4_Warlock_Demonology"
-# level=70
-# spec=demonology
-# race=Dwarf
-# role=spell
-# position=ranged_back
-# talents=BoQAAAAAAAAAAAAAAAAAAAAAAAHgkEJJQaKQaJJh0CAAAAAIBSikSEhkIpolkkQAAAAAAQiA
+warlock="DF4_Warlock_Demonology"
+level=70
+spec=demonology
+race=Dwarf
+role=spell
+position=ranged_back
+talents=BoQAAAAAAAAAAAAAAAAAAAAAAAHgkEJJQaKQaJJh0CAAAAAIBSikSEhkIpolkkQAAAAAAQiA
 
-# food=thousandbone_tongueslicer
+food=thousandbone_tongueslicer
 
-# head=devout_ashdevils_grimhorns,id=207272,bonus_id=6652/9599/7979/9563/9513/1494/8767/1808,ilevel=489,gem_id=192988,enchant_id=7052
-# neck=amulet_of_eonars_chosen,id=208445,bonus_id=6652/8783/8784/9599/9600/10244/10245/4800/4786/1520/9576/8782,ilevel=489,gem_id=192932/192932/192932
-# shoulders=devout_ashdevils_hatespikes,id=207270,bonus_id=6652/7979/9562/9511/1491/8767,ilevel=489
-# back=vibrant_wildercloth_shawl,id=193511,bonus_id=9379/8960/8795,ilevel=486,crafted_stats=32/36
-# chest=devout_ashdevils_razorhide,id=207275,bonus_id=6652/7979/9562/9515/1491/8767,ilevel=489,enchant_id=6625
-# wrists=anguished_restraints,id=207120,bonus_id=523,ilevel=489,gem_id=192932
-# hands=devout_ashdevils_claws,id=207273,bonus_id=6652/8783/8784/9515/9514/9513/9512/9511/9599/9600/10244/10245/4800/4786/1520/9576
-# waist=urctoss_hibernal_dial,id=207119,bonus_id=6652/8783/8784/9599/9600/10244/10245/4800/4786/1520/9576/1808,gem_id=192932,enchant_id=6574,crafted_stats=40/32
-# legs=leggings_of_the_new_dawn,id=207928,ilevel=489,enchant_id=6830
-# feet=vibrant_wildercloth_slippers,id=193519,bonus_id=9379/8960/8792,ilevel=486,crafted_stats=32/36
-# finger1=band_of_burning_thorns,id=207159,bonus_id=6652/8783/8784/9599/9600/10244/10245/4800/4786/1520/9576/1808,gem_id=192932,enchant_id=6568
-# finger2=signet_of_the_last_elder,id=207162,bonus_id=6652/8783/8784/9599/9600/10244/10245/4800/4786/1520/9576/1808,ilevel=489,gem_id=192932,enchant_id=6550
-# trinket1=nymues_unraveling_spindle,id=208615,ilevel=489
-# trinket2=belorrelos_the_suncaller,id=207172,ilevel=489
-# main_hand=iridal_the_earths_master,id=208321,ilevel=489,enchant_id=6646
+head=grimhorns_of_the_sinister_savant,id=217212,bonus_id=523,ilevel=528,gem_id=192991,enchant_id=7052
+neck=ouroboreal_necklet,id=210214,bonus_id=4800/4786/1520/9576/8782,ilevel=528,gem_id=192925/192925/192925
+shoulders=amice_of_the_sinister_savant,id=217214,ilevel=528
+back=voice_of_the_silent_star,id=204465,bonus_id=4800/4786/1498,ilevel=535
+chest=cursed_robes_of_the_sinister_savant,id=217215,ilevel=528,enchant_id=6625
+wrists=vibrant_wildercloth_wristwraps,id=193510,bonus_id=523/8932/8960,ilevel=525,gem_id=192925,crafted_stats=32/40
+hands=experimental_safety_gloves,id=193713,bonus_id=4786/1659/9539,ilevel=528
+waist=flaresinged_strap,id=193780,bonus_id=4786/1659/9539/523,ilevel=528,gem_id=192925,enchant_id=6904
+legs=leggings_of_the_sinister_savant,id=217213,ilevel=528,enchant_id=6830
+feet=vibrant_wildercloth_slippers,id=193519,bonus_id=8932/8960,ilevel=525,crafted_stats=32/40
+finger1=seal_of_diurnas_chosen,id=195480,bonus_id=523,ilevel=528,gem_id=192925,enchant_id=6550
+finger2=unstable_arcane_loop,id=193633,bonus_id=4786/1659/9539/523,ilevel=528,gem_id=192925,enchant_id=6550
+trinket1=belorrelos_the_suncaller,id=207172,bonus_id=4800/4786/1520/9576,ilevel=528
+trinket2=nymues_unraveling_spindle,id=208615,bonus_id=4800/4786/1520/9576,ilevel=528
+main_hand=dreambinder_loom_of_the_great_cycle,id=208616,ilevel=528,enchant_id=6655
 
-# save=DF4_Warlock_Demonology.simc
 
-# warlock="DF4_Warlock_Destruction"
-# level=70
-# spec=destruction
-# race=dwarf
-# role=spell
-# position=ranged_back
-# talents=BsQAAAAAAAAAAAAAAAAAAAAAAgESSkkAppApdgkEShWwB0SSkAalikAAAAAAAAAAAAIJokEJA
+save=DF4_Warlock_Demonology.simc
 
-# food=thousandbone_tongueslicer
+warlock="DF4_Warlock_Destruction"
+level=70
+spec=destruction
+race=dwarf
+role=spell
+position=ranged_back
+talents=BsQAAAAAAAAAAAAAAAAAAAAAAggkEJJQaKEpdgkESLaBHQJJRCo1KSCAAAAAAAAAAAgkgSSkA
 
-# head=devout_ashdevils_grimhorns,id=207272,bonus_id=523,ilevel=489,gem_id=192985,enchant_id=7052
-# neck=amulet_of_eonars_chosen,id=208445,bonus_id=8782,ilevel=489,gem_id=192964/192964/192964
-# shoulders=devout_ashdevils_hatespikes,id=207270,ilevel=489
-# back=vibrant_wildercloth_shawl,id=193511,bonus_id=9379/8960,ilevel=486,enchant_id=6592,crafted_stats=40/49
-# chest=devout_ashdevils_razorhide,id=207275,ilevel=489,enchant_id=6625
-# wrists=vibrant_wildercloth_wristwraps,id=193510,bonus_id=9379/8960,ilevel=486,gem_id=192964,enchant_id=6574,crafted_stats=32/40
-# hands=devout_ashdevils_claws,id=207273,ilevel=489
-# waist=netherwhisper_cinch,id=134391,bonus_id=3524/1808,ilevel=489,gem_id=192964,enchant_id=6904
-# legs=oakhearts_trunkwarmers,id=137304,bonus_id=3524,ilevel=489,enchant_id=6541
-# feet=slippers_of_heedless_sacrifice,id=134419,bonus_id=3524,ilevel=489
-# finger1=signet_of_the_last_elder,id=207162,bonus_id=523,ilevel=489,gem_id=192964,enchant_id=6550
-# finger2=band_of_burning_thorns,id=207159,bonus_id=523,ilevel=489,gem_id=192964,enchant_id=6550
-# trinket1=belorrelos_the_suncaller,id=207172,bonus_id=6652/8783/8784/9599/9600/10244/10245/4800/4786/1520/9576
-# trinket2=nymues_unraveling_spindle,id=208615,bonus_id=6652/8783/8784/9599/9600/10244/10245/4800/4786/1520/9576
-# main_hand=iridal_the_earths_master,id=208321,bonus_id=3524,ilevel=489,enchant_id=6655
+food=thousandbone_tongueslicer
 
-# save=DF4_Warlock_Destruction.simc
+head=lost_scholars_timely_hat,id=207116,bonus_id=4800/4786/1517/9575/523,ilevel=528,gem_id=192982,enchant_id=7052
+neck=terross_captive_core,id=195502,bonus_id=4800/4786/1498/8782,ilevel=528,gem_id=192925/192925/192925
+shoulders=amice_of_the_sinister_savant,id=217214,ilevel=528
+back=voice_of_the_silent_star,id=204465,bonus_id=4800/4786/1498,ilevel=535
+chest=cursed_robes_of_the_sinister_savant,id=217215,ilevel=528,enchant_id=6625
+wrists=vibrant_wildercloth_wristwraps,id=193510,bonus_id=8932/8960/523,ilevel=525,gem_id=192925,enchant_id=6574,crafted_stats=36/49
+hands=grips_of_the_sinister_savant,id=217211,ilevel=528
+waist=sash_of_abandoned_hope,id=202589,bonus_id=4800/4786/1498/523,ilevel=528,gem_id=192925,enchant_id=6904
+legs=leggings_of_the_sinister_savant,id=217213,ilevel=528,enchant_id=6830
+feet=vibrant_wildercloth_slippers,id=193519,bonus_id=8932/8960/8793,ilevel=525,crafted_stats=32/40
+finger1=seal_of_filial_duty,id=195526,bonus_id=4800/4786/1498/523,ilevel=535,gem_id=192925,enchant_id=6550
+finger2=seal_of_diurnas_chosen,id=195480,bonus_id=523,ilevel=528,gem_id=192925,enchant_id=6550
+trinket1=belorrelos_the_suncaller,id=207172,bonus_id=4800/4786/1520/9576,ilevel=528
+trinket2=nymues_unraveling_spindle,id=208615,bonus_id=4800/4786/1520/9576,ilevel=528
+main_hand=dreambinder_loom_of_the_great_cycle,id=208616,ilevel=528,enchant_id=6655
+
+save=DF4_Warlock_Destruction.simc