diff --git a/assets/database/db.bin b/assets/database/db.bin
index 88badd2d87..576e7055d4 100644
Binary files a/assets/database/db.bin and b/assets/database/db.bin differ
diff --git a/assets/database/db.json b/assets/database/db.json
index 360ba7015c..d232d1b573 100644
--- a/assets/database/db.json
+++ b/assets/database/db.json
@@ -8359,7 +8359,7 @@
 {"effectId":2620,"itemId":20733,"spellId":25069,"name":"Enchant Cloak - Greater Nature Resistance","icon":"inv_misc_note_01","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":2621,"itemId":33150,"spellId":25070,"name":"Enchant Cloak - Subtlety","icon":"inv_misc_note_01","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":2622,"itemId":33148,"spellId":25071,"name":"Enchant Cloak - Dodge","icon":"inv_misc_note_01","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
-{"effectId":2646,"itemId":22392,"spellId":27836,"name":"Enchant 2H Weapon - Agility","icon":"inv_misc_note_01","type":13,"stats":[0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":2646,"itemId":22392,"spellId":27836,"name":"Enchant 2H Weapon - Agility","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":2648,"itemId":35756,"spellId":27908,"name":"Enchant Cloak - Steelweave","icon":"inv_misc_note_01","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":2648,"itemId":22530,"spellId":27908,"name":"Enchant Bracer - Major Defense","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2649,"itemId":22533,"spellId":27916,"name":"Enchant Bracer - Fortitude","icon":"inv_misc_note_01","type":6,"stats":[0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -8374,10 +8374,10 @@
 {"effectId":2661,"itemId":24003,"spellId":27959,"name":"Enchant Chest - Exceptional Stats","icon":"inv_misc_note_01","type":5,"stats":[6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":2664,"itemId":22548,"spellId":27963,"name":"Enchant Cloak - Major Resistance","icon":"inv_misc_note_01","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2666,"itemId":22551,"spellId":27969,"name":"Enchant Weapon - Major Intellect","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":2667,"itemId":22554,"spellId":27970,"name":"Enchant 2H Weapon - Savagery","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
+{"effectId":2667,"itemId":22554,"spellId":27970,"name":"Enchant 2H Weapon - Savagery","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2668,"itemId":22553,"spellId":27973,"name":"Enchant Weapon - Potency","icon":"inv_misc_note_01","type":13,"stats":[20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2669,"itemId":22555,"spellId":27974,"name":"Enchant Weapon - Major Spellpower","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,40,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":2670,"itemId":22556,"spellId":27976,"name":"Enchant 2H Weapon - Major Agility","icon":"inv_misc_note_01","type":13,"stats":[0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
+{"effectId":2670,"itemId":22556,"spellId":27976,"name":"Enchant 2H Weapon - Major Agility","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2671,"itemId":22560,"spellId":27979,"name":"Enchant Weapon - Sunfire","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":2672,"itemId":22561,"spellId":27980,"name":"Enchant Weapon - Soulfrost","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":2673,"itemId":22559,"spellId":28093,"name":"Enchant Weapon - Mongoose","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"enchantEffect":{"buffId":28093,"buffName":"Lightning Speed","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"1":120,"23":31.538466}}},"proc":{}}},
@@ -9664,7 +9664,7 @@
 {"id":9318,"name":"Greater Inscription of Faith","icon":"spell_holy_greaterblessingofsalvation"},
 {"id":9331,"name":"Greater Inscription of the Blade","icon":"spell_holy_weaponmastery"},
 {"id":9334,"name":"Inscription of Vengeance","icon":"spell_holy_fistofjustice"},
-{"id":9336,"name":"Greater Inscription of Vengeance","icon":"spell_holy_greaterblessingofkings"},
+{"id":9336,"name":"Zandalar Signet of Might","icon":"inv_misc_armorkit_08"},
 {"id":9344,"name":"Inscription of Discipline","icon":"spell_holy_sealofwisdom"},
 {"id":9346,"name":"Greater Inscription of Discipline","icon":"spell_holy_sealofwisdom"},
 {"id":9408,"name":"Greater Inscription of the Oracle","icon":"spell_holy_powerinfusion"},
@@ -10518,7 +10518,7 @@
 {"id":17958,"name":"Emberstorm","icon":"spell_fire_selfdestruct"},
 {"id":17959,"name":"Ruin","icon":"spell_shadow_shadowwordpain"},
 {"id":17962,"name":"Conflagrate","icon":"spell_fire_fireball"},
-{"id":18029,"name":"Glyph of Renewal","icon":"spell_holy_healingaura"},
+{"id":18029,"name":"Enchant Gloves - Major Healing","icon":"inv_misc_note_01"},
 {"id":18048,"name":"Enchant Weapon - Major Healing","icon":"inv_misc_note_01"},
 {"id":18073,"name":"Pyroclasm","icon":"spell_fire_volcano"},
 {"id":18094,"name":"Nightfall","icon":"spell_shadow_twilight"},
@@ -11036,7 +11036,7 @@
 {"id":25064,"name":"Enchant Gloves - Shadow Power","icon":"inv_misc_note_01"},
 {"id":25065,"name":"Enchant Gloves - Fire Power","icon":"inv_misc_note_01"},
 {"id":25066,"name":"Enchant Gloves - Frost Power","icon":"inv_misc_note_01"},
-{"id":25067,"name":"Enchant Bracer - Superior Healing","icon":"inv_misc_note_01"},
+{"id":25067,"name":"Enchant Gloves - Healing Power","icon":"inv_misc_note_01"},
 {"id":25068,"name":"Enchant Cloak - Greater Fire Resistance","icon":"inv_misc_note_01"},
 {"id":25069,"name":"Enchant Cloak - Greater Nature Resistance","icon":"inv_misc_note_01"},
 {"id":25070,"name":"Enchant Cloak - Subtlety","icon":"inv_misc_note_01"},
@@ -11109,9 +11109,9 @@
 {"id":27902,"name":"Spell Warding","icon":"spell_holy_spellwarding"},
 {"id":27903,"name":"Spell Warding","icon":"spell_holy_spellwarding"},
 {"id":27904,"name":"Spell Warding","icon":"spell_holy_spellwarding"},
-{"id":27908,"name":"Enchant Bracer - Major Defense","icon":"inv_misc_note_01"},
+{"id":27908,"name":"Enchant Cloak - Steelweave","icon":"inv_misc_note_01"},
 {"id":27912,"name":"Enchant Bracer - Restore Mana Prime","icon":"inv_misc_note_01"},
-{"id":27916,"name":"Enchant Bracer - Fortitude","icon":"inv_misc_note_01"},
+{"id":27916,"name":"Enchant Boots - Fortitude","icon":"inv_misc_note_01"},
 {"id":27918,"name":"Enchant Bracer - Spellpower","icon":"inv_misc_note_01"},
 {"id":27923,"name":"Enchant Ring - Spellpower","icon":"inv_misc_note_01"},
 {"id":27925,"name":"Enchant Ring - Healing Power","icon":"inv_misc_note_01"},
diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
index c2aed001df..2d96094897 100644
Binary files a/assets/database/leftover_db.bin and b/assets/database/leftover_db.bin differ
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
index e55f013524..266a4c6568 100644
--- a/assets/database/leftover_db.json
+++ b/assets/database/leftover_db.json
@@ -72,7 +72,7 @@
 {"effectId":66,"itemId":6376,"spellId":7455,"name":"Enchant Boots - Minor Stamina","icon":"inv_misc_note_01","type":10,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":66,"spellId":7455,"name":"Enchant Shield - Minor Stamina","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":242,"spellId":7747,"name":"Enchant Chest - Lesser Health","icon":"trade_engraving","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0],"quality":1},
 {"effectId":243,"itemId":6344,"spellId":7456,"name":"Enchant Bracer - Minor Spirit","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":246,"itemId":6346,"spellId":7773,"name":"Enchant Chest - Lesser Mana","icon":"inv_misc_note_01","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -85,7 +85,7 @@
 {"effectId":254,"spellId":7850,"name":"Enchant Chest - Health","icon":"trade_engraving","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0],"quality":1},
 {"effectId":255,"itemId":6375,"spellId":7851,"name":"Enchant Bracer - Lesser Spirit","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":255,"itemId":11167,"spellId":7851,"name":"Enchant Boots - Lesser Spirit","icon":"inv_misc_note_01","type":10,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":255,"itemId":11038,"spellId":7851,"name":"Enchant 2H Weapon - Lesser Spirit","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
+{"effectId":255,"itemId":11038,"spellId":7851,"name":"Enchant 2H Weapon - Lesser Spirit","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":255,"spellId":7851,"name":"Enchant Shield - Lesser Spirit","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":256,"spellId":7852,"name":"Enchant Cloak - Lesser Fire Resistance","icon":"trade_engraving","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":369,"spellId":9108,"name":"Enchant Bracer - Major Intellect","icon":"trade_engraving","type":6,"stats":[0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
@@ -95,7 +95,7 @@
 {"effectId":664,"itemId":10548,"spellId":12460,"name":"Sniper Scope","icon":"inv_misc_spyglass_02","type":14,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":684,"spellId":13198,"name":"Enchant Gloves - Major Strength","icon":"trade_engraving","type":7,"stats":[15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":723,"spellId":13363,"name":"Enchant Bracer - Lesser Intellect","icon":"trade_engraving","type":6,"stats":[0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":723,"itemId":6349,"spellId":13363,"name":"Enchant 2H Weapon - Lesser Intellect","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":723,"itemId":6349,"spellId":13363,"name":"Enchant 2H Weapon - Lesser Intellect","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":724,"spellId":13369,"name":"Enchant Bracer - Lesser Stamina","icon":"trade_engraving","type":6,"stats":[0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":724,"spellId":13369,"name":"Enchant Boots - Lesser Stamina","icon":"trade_engraving","type":10,"stats":[0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":724,"spellId":13369,"name":"Enchant Shield - Lesser Stamina","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
@@ -155,10 +155,10 @@
 {"effectId":929,"itemId":16217,"spellId":13827,"name":"Enchant Shield - Greater Stamina","icon":"inv_misc_note_01","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":930,"itemId":11226,"spellId":13927,"name":"Enchant Gloves - Riding Skill","icon":"inv_misc_note_01","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":931,"spellId":13928,"name":"Enchant Gloves - Minor Haste","icon":"trade_engraving","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"itemId":22552,"spellId":27967,"name":"Enchant Weapon - Major Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1144,"spellId":14433,"name":"Enchant Chest - Major Spirit","icon":"trade_engraving","type":5,"stats":[0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1594,"spellId":9334,"name":"Enchant Gloves - Assault","icon":"trade_engraving","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1704,"itemId":12645,"spellId":16624,"name":"Thorium Shield Spike","icon":"inv_misc_armorkit_20","stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -177,15 +177,15 @@
 {"effectId":1892,"itemId":16221,"spellId":19990,"name":"Enchant Chest - Major Health","icon":"inv_misc_note_01","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1893,"itemId":16242,"spellId":19991,"name":"Enchant Chest - Major Mana","icon":"inv_misc_note_01","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1894,"itemId":16223,"spellId":20005,"name":"Enchant Weapon - Icy Chill","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":1896,"itemId":16247,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":1896,"itemId":16247,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
+{"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1897,"itemId":16250,"spellId":20031,"name":"Enchant Weapon - Superior Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1898,"spellId":20004,"name":"Enchant Weapon - Major Spirit","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1898,"itemId":16254,"spellId":20004,"name":"Enchant Weapon - Lifestealing","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":1899,"itemId":16248,"spellId":20006,"name":"Enchant Weapon - Unholy Weapon","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"enchantEffect":{"buffId":20006,"buffName":"Unholy Curse","effectDurationMs":12000,"scalingOptions":{"0":{"stats":{"6":-15}}},"proc":{}}},
 {"effectId":1900,"itemId":16252,"spellId":20007,"name":"Enchant Weapon - Crusader","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"enchantEffect":{"buffId":20007,"buffName":"Holy Strength","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"0":100}}},"proc":{}}},
-{"effectId":1903,"itemId":16255,"spellId":19986,"name":"Enchant 2H Weapon - Major Spirit","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":1904,"itemId":16249,"spellId":19987,"name":"Enchant 2H Weapon - Major Intellect","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
+{"effectId":1903,"itemId":16255,"spellId":19986,"name":"Enchant 2H Weapon - Major Spirit","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
+{"effectId":1904,"itemId":16249,"spellId":19987,"name":"Enchant 2H Weapon - Major Intellect","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2443,"itemId":17725,"spellId":21930,"name":"Enchant Weapon - Winter's Might","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2463,"spellId":13652,"name":"Enchant Cloak - Fire Resistance","icon":"trade_engraving","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":2483,"itemId":18169,"spellId":14585,"name":"Flame Mantle of the Dawn","icon":"spell_fire_flameshock","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
diff --git a/tools/database/dbc/enchant.go b/tools/database/dbc/enchant.go
index 7b1ddb616a..de2ba01337 100644
--- a/tools/database/dbc/enchant.go
+++ b/tools/database/dbc/enchant.go
@@ -51,6 +51,7 @@ func (enchant *Enchant) HasEnchantEffect() bool {
 }
 
 func (enchant *Enchant) ToProto() *proto.UIEnchant {
+	// TBC ANNI: TODO - Process ring enchants as Enchanting-prof only.
 	uiEnchant := &proto.UIEnchant{
 		Name:               enchant.Name,
 		ItemId:             int32(enchant.ItemId),
@@ -88,7 +89,7 @@ func (enchant *Enchant) ToProto() *proto.UIEnchant {
 		if enchant.SubClassMask == rangedMask {
 			uiEnchant.Type = proto.ItemType_ItemTypeRanged
 		}
-		if enchant.SubClassMask == twoHandMask {
+		if enchant.SubClassMask == allTwoHandMask || enchant.SubClassMask == twoHandNoSpearMask {
 			// Two-handed weapon.
 			uiEnchant.EnchantType = proto.EnchantType_EnchantTypeTwoHand
 		}
diff --git a/tools/database/dbc/flags.go b/tools/database/dbc/flags.go
index f0d67e67bb..534fd294fe 100644
--- a/tools/database/dbc/flags.go
+++ b/tools/database/dbc/flags.go
@@ -324,10 +324,11 @@ const (
 	ITEM_SUBCLASS_BIT_ARMOR_SIGIL   = 0x00000400
 )
 const (
-	rangedMask  = ITEM_SUBCLASS_BIT_WEAPON_BOW | ITEM_SUBCLASS_BIT_WEAPON_GUNS | ITEM_SUBCLASS_BIT_WEAPON_CROSSBOW
-	twoHandMask = ITEM_SUBCLASS_BIT_WEAPON_2H_AXE | ITEM_SUBCLASS_BIT_WEAPON_MACE_2H |
-		ITEM_SUBCLASS_BIT_WEAPON_SWORD_2H | ITEM_SUBCLASS_BIT_WEAPON_2H_EXOTIC |
-		ITEM_SUBCLASS_BIT_WEAPON_SPEAR | ITEM_SUBCLASS_BIT_WEAPON_POLEARM
+	rangedMask     = ITEM_SUBCLASS_BIT_WEAPON_BOW | ITEM_SUBCLASS_BIT_WEAPON_GUNS | ITEM_SUBCLASS_BIT_WEAPON_CROSSBOW
+	allTwoHandMask = ITEM_SUBCLASS_BIT_WEAPON_2H_AXE | ITEM_SUBCLASS_BIT_WEAPON_MACE_2H | ITEM_SUBCLASS_BIT_WEAPON_POLEARM |
+		ITEM_SUBCLASS_BIT_WEAPON_SWORD_2H | ITEM_SUBCLASS_BIT_WEAPON_STAFF | ITEM_SUBCLASS_BIT_WEAPON_SPEAR
+	twoHandNoSpearMask = ITEM_SUBCLASS_BIT_WEAPON_2H_AXE | ITEM_SUBCLASS_BIT_WEAPON_MACE_2H | ITEM_SUBCLASS_BIT_WEAPON_POLEARM |
+		ITEM_SUBCLASS_BIT_WEAPON_SWORD_2H | ITEM_SUBCLASS_BIT_WEAPON_STAFF
 )
 
 const (