diff --git a/Data/Uniques/amulet.lua b/Data/Uniques/amulet.lua
index 415fa920..4ba1f7c4 100644
--- a/Data/Uniques/amulet.lua
+++ b/Data/Uniques/amulet.lua
@@ -259,7 +259,7 @@ Requires Level 60
 Cannot be Stunned
 20% of Maximum Life Converted to Energy Shield
 ]],[[
-Eye of Innocence 
+Eye of Innocence
 Citrine Amulet
 Source: Drops from unique{Guardian of the Phoenix}
 Requires Level 68
@@ -344,11 +344,11 @@ Gloomfang
 Blue Pearl Amulet
 Source: Drops from unique{The Purifier}
 Requires 77
-(48–56)% increased Mana Regeneration Rate 
-0.5% of Chaos Damage Leeched as Life 
-Lose (10–15) Life for each Enemy hit by your Spells 
-Lose (20–25) Life for each Enemy hit by your Attacks 
-Skills Chain +1 times 
+(48–56)% increased Mana Regeneration Rate
+0.5% of Chaos Damage Leeched as Life
+Lose (10–15) Life for each Enemy hit by your Spells
+Lose (20–25) Life for each Enemy hit by your Attacks
+Skills Chain +1 times
 Projectiles gain (15–20)% of Non-Chaos Damage as extra Chaos Damage per Chain
 ]],[[
 The Halcyon
@@ -629,6 +629,17 @@ Minions have (10-15)% increased Movement Speed
 Minions deal (10-15)% increased Damage
 {variant:2}(10-15)% reduced Mana Cost of Minion Skills
 ]],[[
+Solstice Vigil
+Onyx Amulet
+Source: Drops from unique{The Shaper}
+Requires Level 64
++(10–16) to all Attributes
+(20–25)% increased Damage
++(50–70) to maximum Life
+(2–3) Mana Regenerated per second
+Temporal Chains has 100% reduced Mana Reservation
+Gain Shaper's Presence for 10 seconds when you kill a Rare or Unique Enemy
+]],[[
 Star of Wraeclast
 Ruby Amulet
 Source: Vendor recipe
@@ -787,13 +798,13 @@ Yoke of Suffering
 Onyx Amulet
 Source: Drops from unique{The Eradicator} (Tier 11+)
 Requires Level 25
-+(10–16) to all Attributes 
-+(10–20)% to Fire Resistance 
-+(10–20)% to Cold Resistance 
-+(20–40)% to Lightning Resistance 
-30% reduced Duration of Ailments on Enemies 
-(5–10)% chance to Shock 
-Enemies take 5% increased Damage for each type of Ailment you have inflicted on them 
++(10–16) to all Attributes
++(10–20)% to Fire Resistance
++(10–20)% to Cold Resistance
++(20–40)% to Lightning Resistance
+30% reduced Duration of Ailments on Enemies
+(5–10)% chance to Shock
+Enemies take 5% increased Damage for each type of Ailment you have inflicted on them
 Your Elemental Damage can Shock
 ]],
 }
diff --git a/Data/Uniques/belt.lua b/Data/Uniques/belt.lua
index f7a96b50..27c09cbd 100644
--- a/Data/Uniques/belt.lua
+++ b/Data/Uniques/belt.lua
@@ -109,7 +109,7 @@ Leather Belt
 Source: Drops from unique{The Elder}
 Requires Level 68
 +(25-40) to maximum Life
-+(60–80) to maximum Life 
++(60–80) to maximum Life
 (5–15)% increased Attributes
 Cannot be Frozen if Dexterity is higher than Intelligence
 Cannot be Ignited if Strength is higher than Dexterity
@@ -224,6 +224,36 @@ Requires Level 40
 {variant:2}(20-30)% increased Damage with Hits against Rare monsters
 When you Kill a Rare monster, you gain its mods for 20 seconds
 ]],[[
+Hyperboreus
+Leather Belt
+League: Betrayal
+Variant: Life Regen
+Variant: Fire and Chaos Resistances
+Variant: Cold and Chaos Resistances
+Variant: Light and Chaos Resistances
+Variant: Strength and Dexterity
+Variant: Dexterity and Intelligence
+Variant: Strength and Intelligence
+Variant: Trap Throwing Speed
+Variant: Energy Shield Regen
+Variant: Lucky Crit Chance while Focussed
+Requires Level 60
++(25–40) to maximum Life
++(30–40)% to Cold Resistance
+Chill nearby Enemies when you Focus, causing 30% reduced Action Speed
+Focus has (15–25)% increased Cooldown Recovery Speed
+(50–70)% increased Damage with Hits and Ailments against Chilled Enemies
+{variant:1}{crafted}(1.0-2.0)% of Life Regenerated per second during any Flask Effect
+{variant:2}{crafted}+(8-15)% to Fire and Chaos Resistances
+{variant:3}{crafted}+(8-15)% to Cold and Chaos Resistances
+{variant:4}{crafted}+(8-15)% to Lightning and Chaos Resistances
+{variant:5}{crafted}+(6-17) to Strength and Dexterity
+{variant:6}{crafted}+(6-17) to Dexterity and Intelligence
+{variant:7}{crafted}+(6-17) to Strength and Intelligence
+{variant:8}{crafted}(7-12)% increased Trap Throwing Speed
+{variant:9}{crafted}(15-120) Energy Shield Regenerated per second while a Rare or Unique Enemy is Nearby
+{variant:10}{crafted}Your Critical Strike Chance is Lucky while Focussed
+]],[[
 Immortal Flesh
 Leather Belt
 Variant: Pre 1.3.0
@@ -361,13 +391,13 @@ Studded Belt
 Variant: Pre 3.5.0
 Variant: Current
 Requires Level 20
-(20–30)% increased Stun Duration on Enemies 
+(20–30)% increased Stun Duration on Enemies
 {variant:2}+(80-100) to maximum Life
-+(20–40) to Strength 
-Adds 1 to (15–20) Physical Damage to Attacks 
-Gain 50 Life when you Stun an Enemy 
-{variant:1}20% less Minimum Physical Attack Damage 
-{variant:2}(30-40)% less Minimum Physical Attack Damage 
++(20–40) to Strength
+Adds 1 to (15–20) Physical Damage to Attacks
+Gain 50 Life when you Stun an Enemy
+{variant:1}20% less Minimum Physical Attack Damage
+{variant:2}(30-40)% less Minimum Physical Attack Damage
 {variant:1}20% more Maximum Physical Attack Damage
 {variant:2}(30-40)% more Maximum Physical Attack Damage
 ]],[[
@@ -478,4 +508,4 @@ Requires Level 8
 0.4% of Physical Attack Damage Leeched as Life
 0.4% of Physical Attack Damage Leeched as Mana
 ]],
-}
\ No newline at end of file
+}
diff --git a/Data/Uniques/bow.lua b/Data/Uniques/bow.lua
index 437d7640..b8c1bf4d 100644
--- a/Data/Uniques/bow.lua
+++ b/Data/Uniques/bow.lua
@@ -9,9 +9,9 @@ Variant: Pre 3.5.0
 Variant: Current
 Requires Level 62
 Source: Vendor recipe
-{variant:1}Adds (60–70) to (180–210) Physical Damage 
-{variant:2}Adds (95-115) to (240-265) Physical Damage 
-(80–100)% increased Evasion Rating
+{variant:1}Adds (60-70) to (180-210) Physical Damage
+{variant:2}Adds (95-115) to (240-265) Physical Damage
+(80-100)% increased Evasion Rating
 2 Additional Arrows
 Every 16 seconds you gain iron Reflexes for 8 seconds
 30% more Bow Damage at Close Range while you have iron Reflexes
@@ -38,6 +38,47 @@ Adds 25 to 50 Fire Damage
 {variant:4}50% More Bow Damage at Close Range
 Bow Knockback at Close Range
 ]],[[
+The Crimson Storm
+Steelwood Bow
+League: Betrayal
+Variant: Crit Multi while Rare/Unique Nearby
+Variant: Attack Speed while Rare/Unique Nearby
+Variant: Damage per Power Charge
+Variant: Damage per Frenzy Charge
+Variant: Damage per Endurance Charge
+Variant: Accuracy and Quality
+Variant: Attack Speed and Quality
+Variant: Attack Speed/Trigger Blood Rage on Kill
+Variant: Cast Speed/Trigger Arcane Surge on Kill
+Variant: Minion Attack and Cast Speed
+Variant: Double Damage
+Variant: Double Damage while Foccused
+Variant: Socketed Spell Trigger
+Requires Level 57, 190 Dex
+(140–170)% increased Physical Damage
+(25–35)% increased Critical Strike Chance
+50% chance to inflict Bleeding on Critical Strike with Attacks
+Enemies you inflict Bleeding on grant (60–100)% increased Flask Charges
+Adds (100–120) to (150–165) Physical Damage against Bleeding Enemies
+50% chance to Maim Enemies on Critical Strike with Attacks
+{variant:1}{crafted}+(18-45)% Critical Strike Multiplier while there is a Rare or Unique Enemy Nearby
+{variant:2}{crafted}(11-22)% increased Attack Speed while a Rare or Unique Enemy is Nearby
+{variant:3}{crafted}(5-6)% increased Damage per Power Charge
+{variant:4}{crafted}(5-6)% increased Damage per Frenzy Charge
+{variant:5}{crafted}(5-6)% increased Damage per Endurance Charge
+{variant:6}{crafted}+(30-250) to Accuracy Rating
+{variant:7}{crafted}(8-16)% increased Attack Speed
+{variant:6,7}{crafted}+(7-18)% to Quality
+{variant:8}{crafted}(8-16)% increased Attack Speed
+{variant:8}{crafted}10% chance to Trigger Level 1 Blood Rage when you Kill an Enemy
+{variant:9}{crafted}(7-13)% increased Cast Speed
+{variant:9}{crafted}10% chance to gain Arcane Surge when you Kill an Enemy
+{variant:10}{crafted}Minions have (16-28)% increased Attack Speed
+{variant:10}{crafted}Minions have (16-28)% increased Cast Speed
+{variant:11}{crafted}(4-12)% chance to deal Double Damage
+{variant:12}{crafted}(13-36)% chance to deal Double Damage while Focussed
+{variant:13}{crafted}Trigger a Socketed Spell when you Use a Skill
+]],[[
 Darkscorn
 Assassin Bow
 Variant: Pre 1.2.0
@@ -131,13 +172,13 @@ Source: Drops from unique{The Elder} (Tier 6+)
 Variant: Pre 3.4.0
 Variant: Current
 Requires Level 60
-Adds (130–150) to (270–300) Cold Damage 
-4% increased Movement Speed per Frenzy Charge 
-+(400–500) to Accuracy Rating 
-{variant:2}(15–25)% increased Attack Speed
-12 to 14 Cold Damage per Frenzy Charge 
-2% chance to Avoid Elemental Damage when Hit per Frenzy Charge 
-0.5% of Attack Damage Leeched as Life per Frenzy Charge 
+Adds (130-150) to (270-300) Cold Damage
+4% increased Movement Speed per Frenzy Charge
++(400-500) to Accuracy Rating
+{variant:2}(15-25)% increased Attack Speed
+12 to 14 Cold Damage per Frenzy Charge
+2% chance to Avoid Elemental Damage when Hit per Frenzy Charge
+0.5% of Attack Damage Leeched as Life per Frenzy Charge
 {variant:1}400 Cold Damage taken per second per Frenzy Charge while moving
 {variant:2}200 Cold Damage taken per second per Frenzy Charge while moving
 Elder Item
@@ -286,7 +327,7 @@ Adds (15-25) to (50-60) Physical Damage
 +30 to Accuracy Rating
 +10 Mana gained on Kill
 ]],[[
-Slivertongue 
+Slivertongue
 Harbinger Bow
 Source: Drops from unique{Guardian of the Hydra}
 Variant: {2_6}Pre 3.0.0
@@ -383,4 +424,4 @@ Requires Level 64, 185 Dex
 {variant:2}Ignites your Skills cause spread to other Enemies within a Radius of 15
 Recover (40-60) Life when you Ignite an Enemy
 ]],
-}
\ No newline at end of file
+}
diff --git a/Data/Uniques/flask.lua b/Data/Uniques/flask.lua
index b9d05288..308371ad 100644
--- a/Data/Uniques/flask.lua
+++ b/Data/Uniques/flask.lua
@@ -68,7 +68,7 @@ Requires Level 30
 The Writhing Jar
 Hallowed Hybrid Flask
 Requires Level 60
-(75-65)% reduced Amount Recovered 
+(75-65)% reduced Amount Recovered
 Instant Recovery
 2 Enemy Writhing Worms escape the Flask when used
 (20-10)% reduced Charges used
@@ -90,11 +90,11 @@ Requires Level 68
 Coralito's Signature
 Diamond Flask
 Requires Level 27
-Take 30 Chaos Damage per Second during Flask effect 
-25% chance to Poison on Hit during Flask effect 
-Your Critical Strikes do not deal extra Damage during Flask effect 
-(50–75)% increased Duration of Poisons you inflict during Flask effect 
-Grants Perfect Agony during Flask effect 
+Take 30 Chaos Damage per Second during Flask effect
+25% chance to Poison on Hit during Flask effect
+Your Critical Strikes do not deal extra Damage during Flask effect
+(50-75)% increased Duration of Poisons you inflict during Flask effect
+Grants Perfect Agony during Flask effect
 ]],[[
 Coruscating Elixir
 Ruby Flask
@@ -107,6 +107,31 @@ Chaos Damage does not bypass Energy Shield during effect
 Removes all but one Life on use
 Removed life is regenerated as Energy Shield over 2 seconds
 ]],[[
+Cinderswallow Urn
+Silver Flask
+League: Betrayal
+Source: Drops from unique{Catarina, Master of Undeath}
+Variant: Crit Chance
+Variant: Damage Taken is Leeched as Life
+Variant: Item Rarity
+Variant: Reduced Mana Cost
+Variant: Movement Speed/Stun Avoidance
+Variant: Life Regen
+Requires Level 22
+Implicits: 0
+Recharges 1 Charge when you consume an Ignited Corpse
+Enemies Ignited by you during Flask Effect take 10% increased Damage
+Recover (1–3)% of Life when you Kill an Enemy during Flask Effect
+Recover (1–3)% of Mana when you Kill an Enemy during Flask Effect
+Recover (1–3)% of Energy Shield when you Kill an Enemy during Flask Effect
+{variant:1}{crafted}(60-80)% increased Critical Strike Chance during Flask Effect
+{variant:2}{crafted}15% of Damage Taken from Hits is Leeched as Life during Flask Effect
+{variant:3}{crafted}(20-30)% increased Rarity of Items found during Flask Effect
+{variant:4}{crafted}(25-20)% reduced Mana Cost of Skills during Flask Effect
+{variant:5}{crafted}(8-12)% increased Movement Speed during Flask effect
+{variant:5}{crafted}50% Chance to avoid being Stunned during Flask Effect
+{variant:6}{crafted}3% of Life Regenerated per second during Flask Effect
+]],[[
 Dying Sun
 Ruby Flask
 Source: Drops from unique{The Shaper}
@@ -289,7 +314,7 @@ During Flask Effect, 10% reduced Damage taken of each Element for which your Unc
 Elemental Resistance is lowest
 {variant:1}During Flask Effect, Damage Penetrates 20% Resistance of each Element for which your
 Uncapped Elemental Resistance is highest
-{variant:2}During Flask Effect, Damage Penetrates (10-15)% Resistance of each Element for which your 
+{variant:2}During Flask Effect, Damage Penetrates (10-15)% Resistance of each Element for which your
 Uncapped Elemental Resistance is highest
 ]],[[
 Witchfire Brew
@@ -304,4 +329,4 @@ Creates a Smoke Cloud on Use
 {variant:2}(25-40)% increased Damage Over Time during Flask Effect
 Grants level 21 Despair Curse Aura during Flask Effect
 ]],
-}
\ No newline at end of file
+}
diff --git a/Data/Uniques/gloves.lua b/Data/Uniques/gloves.lua
index e203e93b..7f937f23 100644
--- a/Data/Uniques/gloves.lua
+++ b/Data/Uniques/gloves.lua
@@ -23,9 +23,9 @@ Titan Gauntlets
 League: Bestiary
 Source: Drops from unique{Craiceann, First of the Deep}
 Requires Level 69
-(150–200)% increased Armour
-(50–70) Life Regenerated per second
-+(30–40)% to Fire Resistance
+(150-200)% increased Armour
+(50-70) Life Regenerated per second
++(30-40)% to Fire Resistance
 3% increased Damage per Crab Barrier
 10% chance that if you would gain a Crab Barrier, you instead gain up to
 your maximum number of Crab Barriers
@@ -55,9 +55,9 @@ Socketed Gems are Supported by level 10 Knockback
 Giantsbane
 Bronze Gauntlets
 Requires Level: 23
-Adds (3–6) to (10–12) Physical Damage to Attacks 
-+(30–40) to Strength 
-(80–100)% increased Armour 
+Adds (3-6) to (10-12) Physical Damage to Attacks
++(30-40) to Strength
+(80-100)% increased Armour
 Iron Grip
 ]],[[
 Lochtonial Caress
@@ -113,12 +113,12 @@ Blasphemer's Grasp
 Assassin's Mitts
 Source: Drops from unique{The Elder}
 Requires Level 58
-+(40–50) to Dexterity 
-(150–200)% increased Evasion and Energy Shield 
-+(50–60) to maximum Life 
-15% increased Damage with Ailments per Elder Item Equipped 
-+6 to Maximum Life per Elder Item Equipped 
-8% increased Effect of non-Damaging Ailments per Elder Item Equipped 
++(40-50) to Dexterity
+(150-200)% increased Evasion and Energy Shield
++(50-60) to maximum Life
+15% increased Damage with Ailments per Elder Item Equipped
++6 to Maximum Life per Elder Item Equipped
+8% increased Effect of non-Damaging Ailments per Elder Item Equipped
 Remove an Ailment when you use a Flask if all Equipped Items are Elder Items
 Elder Item
 ]],[[
@@ -172,11 +172,11 @@ Requires Level 21, 33 Dex
 Oskarm
 Nubuck Gloves
 Requires Level 33
-(30–40)% increased Accuracy Rating 
-+(40–50) to maximum Life 
-+(-20–-10)% to Chaos Resistance 
-(7–8)% chance to Dodge Spell Damage 
-Curse Enemies with Level 10 Assassin's Mark on Hit 
+(30-40)% increased Accuracy Rating
++(40-50) to maximum Life
++(-20-10)% to Chaos Resistance
+(7-8)% chance to Dodge Spell Damage
+Curse Enemies with Level 10 Assassin's Mark on Hit
 2% increased Attack Critical Strike Chance per 200 Accuracy Rating
 ]],
 -- Gloves: Energy Shield
@@ -206,9 +206,9 @@ Demon Stitcher
 Satin Gloves
 League: Delve
 Requires Level 41
-(15–20)% increased Cast Speed
-+(50–70) to maximum Energy Shield
-+(50–70) to maximum Life
+(15-20)% increased Cast Speed
++(50-70) to maximum Energy Shield
++(50-70) to maximum Life
 Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell
 ]],[[
 Doedre's Tenure
@@ -230,11 +230,11 @@ Doedre's Malevolence
 Velvet Gloves
 Source: Upgraded from unique{Doedre's Tenure} via prophecy{The Malevolent Witch}
 Requires Level 64
-(50–60)% increased Spell Damage
+(50-60)% increased Spell Damage
 +20 to Intelligence
-Adds (48–56) to (73–84) Chaos Damage to Spells
+Adds (48-56) to (73-84) Chaos Damage to Spells
 15% reduced Cast Speed
-+(64–96) to maximum Energy Shield
++(64-96) to maximum Energy Shield
 +50 to Total Mana Cost of Skills
 ]],[[
 Grip of the Council
@@ -252,9 +252,9 @@ Kalisa's Grace
 Samite Gloves
 Requires Level 47
 Socketed Gems are Supported by Level 18 Faster Casting
-+(20–30) to Intelligence 
-+(50–80) to maximum Energy Shield 
-+(50–70) to maximum Life 
++(20-30) to Intelligence
++(50-80) to maximum Energy Shield
++(50-70) to maximum Life
 Gain +2% to Critical Strike Chance for 2 seconds when you Spend a total of 800 Mana
 ]],[[
 Sadima's Touch
@@ -278,7 +278,7 @@ Variant: Current
 Requires Level 55, 79 Int
 (125-150)% increased Critical Strike Chance for Spells
 {variant:1,2}(280-350)% increased Energy Shield
-{variant:3}(180–250)% increased Energy Shield
+{variant:3}(180-250)% increased Energy Shield
 {variant:1}80% increased Mana Cost of Skills
 {variant:2,3}(40-80)% increased Mana Cost of Skills
 +(15-20) Energy Shield gained on Kill
@@ -299,11 +299,11 @@ Hydrascale Gauntlets
 League: Bestiary
 Source: Drops from unique{Farrul, First of the Plains}
 Requires Level 59
-(100–140)% increased Armour and Evasion
-+(50–70) to maximum Life
-+(400–500) to Accuracy against Bleeding Enemies
+(100-140)% increased Armour and Evasion
++(50-70) to maximum Life
++(400-500) to Accuracy against Bleeding Enemies
 Attacks always inflict Bleeding while you have Cat's Stealth
-(40–50)% increased Damage with Hits and Ailments against Bleeding Enemies
+(40-50)% increased Damage with Hits and Ailments against Bleeding Enemies
 You have Crimson Dance while you have Cat's Stealth
 ]],[[
 Flesh and Spirit
@@ -323,12 +323,12 @@ Rampage
 Haemophilia
 Serpentscale Gauntlets
 Requires Level 43, 34 Str, 34 Dex
-+(20–30) to Strength 
-25% increased Damage over Time 
-Attacks have 25% chance to cause Bleeding 
-(25–40)% increased Attack Damage against Bleeding Enemies 
++(20-30) to Strength
+25% increased Damage over Time
+Attacks have 25% chance to cause Bleeding
+(25-40)% increased Attack Damage against Bleeding Enemies
 Bleeding Enemies you Kill Explode, dealing 5% of
-their Maximum Life as Physical Damage 
+their Maximum Life as Physical Damage
 25% reduced Bleed duration
 ]],[[
 Slitherpinch
@@ -364,9 +364,9 @@ Variant: Two Abyssal Sockets
 Requires Level: 36
 {variant:1}Has 1 Abyssal Socket
 {variant:2}Has 2 Abyssal Sockets
-(6–10)% increased Attack Speed 
-(4–6)% increased maximum Life 
-With a Murderous Eye Jewel Socketed, Intimidate Enemies for 4 seconds on Hit with Attacks 
+(6-10)% increased Attack Speed
+(4-6)% increased maximum Life
+With a Murderous Eye Jewel Socketed, Intimidate Enemies for 4 seconds on Hit with Attacks
 With a Searching Eye Jewel Socketed, Maim Enemies for 4 seconds on Hit with Attacks
 ]],[[
 Vaal Caress
@@ -383,6 +383,16 @@ Requires Level 27, 22 Str, 22 Dex
 {variant:2}+40% to Cold Resistance
 You gain Onslaught for 5 seconds on using a Vaal Skill
 ]],[[
+Worldcarver
+Dragonscale Gauntlets
+Requires Level 67, 51 Str, 51 Dex
+Trigger Level 20 Arcane Wake after Spending a total of 200 Mana
++(200–300) to Accuracy Rating
+(120–150)% increased Armour and Evasion
++(60–80) to maximum Life
+6% increased Attack Damage for each Map Item Modifier affecting the Area
+3% increased Attack Speed for each Map Item Modifier affecting the Area
+]],[[
 Wyrmsign
 Wyrmscale Gauntlets
 Requires Level 49, 38 Str, 38 Dex
@@ -404,8 +414,8 @@ Variant: Two Abyssal Sockets
 Requires Level 37
 {variant:1}Has 1 Abyssal Socket
 {variant:2}Has 2 Abyssal Sockets
-(6–10)% increased Cast Speed
-(4–6)% increased maximum Life
+(6-10)% increased Cast Speed
+(4-6)% increased maximum Life
 With a Ghastly Eye Jewel Socketed, Minions have +1000 to Accuracy Rating
 With a Hypnotic Eye Jewel Socketed, gain Arcane Surge on Hit with Spells
 ]],[[
@@ -435,12 +445,12 @@ Soldier Gloves
 League: Bestiary
 Source: Drops from unique{Saqawal, First of the Sky}
 Requires Level 51
-(140–180)% increased Armour and Energy Shield
-+(30–60) to maximum Life
-+(20–25)% to Cold and Lightning Resistances
-+(-2–2) seconds to Avian's Might Duration
-Adds (20–25) to (37–40) Cold Damage while you have Avian's Might
-Adds (1–3) to (55–62) Lightning Damage while you have Avian's Might
+(140-180)% increased Armour and Energy Shield
++(30-60) to maximum Life
++(20-25)% to Cold and Lightning Resistances
++(-2-2) seconds to Avian's Might Duration
+Adds (20-25) to (37-40) Cold Damage while you have Avian's Might
+Adds (1-3) to (55-62) Lightning Damage while you have Avian's Might
 ]],[[
 Shackles of the Wretched
 Chain Gloves
@@ -456,7 +466,7 @@ You cannot be Ignited for 3 seconds after being Ignited
 {variant:2}You cannot be Shocked for 3 seconds after being Shocked
 You grant (4-6) Frenzy Charges to allies on Death
 ]],[[
-Shaper's Touch 
+Shaper's Touch
 Crusader Gloves
 Source: Drops from unique{The Shaper}
 Variant: Pre 2.6.0
@@ -517,10 +527,10 @@ Strapped Mitts
 League: Incursion
 Upgrade: Upgrades to unique{Slavedriver's Hand} via currency{Vial of Dominance}
 Requires Level 16
-+(30–40) to Dexterity
-(100–125)% increased Evasion and Energy Shield
-(20–30)% reduced Trap Throwing Speed
-Skills used by Traps have (10–20)% increased Area of Effect
++(30-40) to Dexterity
+(100-125)% increased Evasion and Energy Shield
+(20-30)% reduced Trap Throwing Speed
+Skills used by Traps have (10-20)% increased Area of Effect
 Increases and Reductions to Cast Speed also Apply to Trap Throwing Speed
 ]],[[
 Slavedriver's Hand
@@ -568,11 +578,11 @@ League: Bestiary
 Source: Drops from unique{Fenumus, First of the Night}
 Requires Level 50
 Grants Level 20 Aspect of the Spider Skill
-(120–170)% increased Evasion and Energy Shield
-+(40–50) to maximum Life
-(6–9)% increased Attack and Cast Speed
-(40–60)% increased Damage with Hits and Ailments against Enemies affected by 3 Spider's Webs
-Adds (8–10) to (13–15) Chaos Damage for each Spider's Web on the Enemy
+(120-170)% increased Evasion and Energy Shield
++(40-50) to maximum Life
+(6-9)% increased Attack and Cast Speed
+(40-60)% increased Damage with Hits and Ailments against Enemies affected by 3 Spider's Webs
+Adds (8-10) to (13-15) Chaos Damage for each Spider's Web on the Enemy
 ]],[[
 Ondar's Clasp
 Wrapped Mitts
diff --git a/Data/Uniques/helmet.lua b/Data/Uniques/helmet.lua
index 6dadd789..0f37aed1 100644
--- a/Data/Uniques/helmet.lua
+++ b/Data/Uniques/helmet.lua
@@ -140,7 +140,7 @@ Socketed Gems are Supported by Level 30 Cold to Fire
 60% increased Mana Regeneration Rate
 +(20–30)% to Fire and Cold Resistances
 ]],[[
-Obscurantis 
+Obscurantis
 Lion Pelt
 Source: Drops from unique{Guardian of the Chimera}
 Variant: {2_6}Pre 3.5.0
@@ -263,6 +263,43 @@ Reflects 5 Physical Damage to Melee Attackers
 Take 5 Physical Damage when hit by Attacks
 Pain Attunement
 ]],[[
+The Devouring Diadem
+Necromancer Circlet
+League: Betrayal
+Source: Drops from unique{Catarina, Master of Undeath}
+Requires Level 54, 112 Int
+Variant: Strength and Quality
+Variant: Dexterity and Quality
+Variant: Intelligence and Quality
+Variant: Fire and Chaos Resistances
+Variant: Cold and Chaos Resistances
+Variant: Lightning and Chaos Resistances
+Variant: Strength and Dexterity
+Variant: Dexterity and Intelligence
+Variant: Strength and Intelligence
+Variant: Mine Laying Speed
+Variant: Focus Spell Trigger
+Variant: Focus Ailment Duration
++1 to Level of Socketed Gems
+Socketed Gems have 20% reduced Mana Reservation
+Trigger Level 15 Feast of Flesh every 5 seconds
+(180-220)% increased Energy Shield
+10% chance for Energy Shield Recharge to start when you use a Skill
+Eldritch Battery
+{variant:1}{crafted}+(10-25) to Strength
+{variant:2}{crafted}+(10-25) to Dexterity
+{variant:3}{crafted}+(10-25) to Intelligence
+{variant:1,2,3}{crafted}+(7-18) to Quality
+{variant:4}{crafted}+(8-15)% to Fire and Chaos Resistances
+{variant:5}{crafted}+(8-15)% to Cold and Chaos Resistances
+{variant:6}{crafted}+(8-15)% to Lightning and Chaos Resistances
+{variant:7}{crafted}+(6-17) to Strength and Dexterity
+{variant:8}{crafted}+(6-17) to Dexterity and Intelligence
+{variant:9}{crafted}+(6-17) to Strength and Intelligence
+{variant:10}{crafted}(7-12)% increased Mine Laying Speed
+{variant:11}{crafted}Trigger Socketed Spells when you Focus
+{variant:12}{crafted}(81-140)% increased Duration of Ailments you inflict while Focussed
+]],[[
 Doedre's Scorn
 Lunaris Circlet
 Variant: Pre 2.6.0
@@ -301,6 +338,26 @@ Adds (16–21) to (31–36) Chaos Damage to Spells
 (15–20)% increased Damage with Poison per Power Charge
 Aspect of the Spider inflicts Spider's Webs and Hinder every 0.5 Seconds instead
 ]],[[
+Flamesight
+Solaris Circlet
+Requires Level 59, 122 Int
+(240–280)% increased Energy Shield
++(30–40)% to Fire Resistance
+(30–40)% increased Elemental Damage
+25% chance to Scorch Enemies
+Cannot inflict Ignite
+10% increased Elemental Damage per Sextant affecting the area
+]],[[
+Galesight
+Solaris Circlet
+Requires Level 59, 122 Int
+(240–280)% increased Energy Shield
++(30–40)% to Cold Resistance
+(30–40)% increased Elemental Damage
+25% chance to inflict Brittle
+Cannot inflict Freeze or Chill
+10% increased Elemental Damage per Sextant affecting the area
+]],[[
 Hale Negator
 Mind Cage
 League: Delve
@@ -367,12 +424,22 @@ Requires Level 65, 138 Int
 +(30-60) to maximum Mana
 Your Skills deal you 400% of Mana Cost as Physical Damage
 ]],[[
+Thundersight
+Solaris Circlet
+Requires Level 59, 122 Int
+(240–280)% increased Energy Shield
++(30–40)% to Lightning Resistance
+(30–40)% increased Elemental Damage
+25% chance to Sap Enemies
+Cannot inflict Shock
+10% increased Elemental Damage per Sextant affecting the area
+]],[[
 Wraithlord
 Bone Circlet
 Requires Level: 34
-+2 to Level of Socketed Minion Gems 
-(120–150)% increased Energy Shield 
-Minions Regenerate 1% Life per second 
++2 to Level of Socketed Minion Gems
+(120–150)% increased Energy Shield
+Minions Regenerate 1% Life per second
 +1000 to Spectre maximum Life
 ]],[[
 Ylfeban's Trickery
@@ -495,11 +562,11 @@ Minions Regenerate 2% Life per Second
 Ahn's Contempt
 Praetor Crown
 Requires Level 68
-+(15–20) to all Attributes 
-(60–140)% increased Armour and Energy Shield 
-+(60–70) to maximum Life 
--1 to Maximum Power Charges 
-Gain (8–12)% of Physical Damage as Extra Chaos Damage while at maximum Power Charges 
++(15–20) to all Attributes
+(60–140)% increased Armour and Energy Shield
++(60–70) to maximum Life
+-1 to Maximum Power Charges
+Gain (8–12)% of Physical Damage as Extra Chaos Damage while at maximum Power Charges
 You take 50% reduced Extra Damage from Critical Strikes while you have no Power Charges
 ]],[[
 The Brine Crown
@@ -596,13 +663,13 @@ Adds 1 to 13 Lightning Damage to Attacks
 +20% to all Elemental Resistances while on Low Life
 20% reduced Mana Cost of Skills when on Low Life
 ]],[[
-Kitava's Thirst 
+Kitava's Thirst
 Zealot Helmet
 Requires Level 44, 50 Str, 50 Int
 15% reduced Cast Speed
 (70-80)% increased Armour and Energy Shield
 +(30-50) to maximum Mana
-30% chance to Cast Socketed Spells when 
+30% chance to Cast Socketed Spells when
 you Spend at least 100 Mana to Use a Skill
 ]],[[
 Lightpoacher
@@ -613,10 +680,10 @@ Variant: One Abyssal Socket
 Variant: Two Abyssal Sockets
 {variant:1}Has 1 Abyssal Socket
 {variant:2}Has 2 Abyssal Sockets
-Trigger Level 20 Spirit Burst when you Use a Skill while you have a Spirit Charge 
-+(10–15)% to all Elemental Resistances 
-Recover (4–5)% of Life when a Spirit Charge expires or is consumed 
-(15–20)% chance to gain a Spirit Charge on Kill 
+Trigger Level 20 Spirit Burst when you Use a Skill while you have a Spirit Charge
++(10–15)% to all Elemental Resistances
+Recover (4–5)% of Life when a Spirit Charge expires or is consumed
+(15–20)% chance to gain a Spirit Charge on Kill
 +1 to Maximum Spirit Charges per Abyss Jewel affecting you
 ]],[[
 Malachai's Vision
@@ -665,11 +732,11 @@ Memory Vault
 Praetor Crown
 Source: Drops from unique{The Enslaver}
 Requires Level 68
-+(130–160) to maximum Energy Shield 
-+(150–200) to maximum Mana 
-(30–40)% increased Mana Regeneration Rate 
-+(20–25)% to Fire Resistance 
-10% increased Mana Reserved 
++(130–160) to maximum Energy Shield
++(150–200) to maximum Mana
+(30–40)% increased Mana Regeneration Rate
++(20–25)% to Fire Resistance
+10% increased Mana Reserved
 Gain Armour equal to your Reserved Mana
 ]],[[
 Mindspiral
diff --git a/Data/Uniques/ring.lua b/Data/Uniques/ring.lua
index be6bdb75..b61023d5 100644
--- a/Data/Uniques/ring.lua
+++ b/Data/Uniques/ring.lua
@@ -266,10 +266,10 @@ Minions have 10% increased Area of Effect of Area Skills
 The Hungry Loop
 Unset Ring
 Requires Level: 45
-Has 1 Socket 
+Has 1 Socket
 Consumes Socketed Support Gems when they reach Maximum Level
 Can Consume 4 Support Gems
-Has not Consumed any Gems 
+Has not Consumed any Gems
 ]],[[
 Kaom's Sign
 Coral Ring
@@ -470,7 +470,7 @@ Variant: Current
 {variant:2}2% increased Intelligence for each Unique Item you have equipped
 3% additional chance for Slain monsters to drop Scrolls of Wisdom
 ]],[[
-Praxis 
+Praxis
 Paua Ring
 Requires Level 22
 +(20-25) to maximum Mana
@@ -606,7 +606,7 @@ Adds (8-15) to (20-28) Fire Damage to Attacks
 {variant:1,2}Right ring slot: 30% reduced Reflected Physical Damage taken
 {variant:3,4}Right ring slot: 40% reduced Reflected Physical Damage taken
 ]],[[
-Snakepit 
+Snakepit
 Sapphire Ring
 Variant: Pre {2_6}3.5.0
 Variant: Current
@@ -765,7 +765,7 @@ Requires Level 38
 {variant:1}5% chance to Shock
 {variant:2,3}10% chance to Shock
 ]],[[
-Valyrium 
+Valyrium
 Moonstone Ring
 Requires Level 38
 +(15-25) to maximum Energy Shield
@@ -785,6 +785,39 @@ Requires Level 65
 +(−25 to 50)% to Cold Resistance
 +(−25 to 50)% to Lightning Resistance
 ]],[[
+Vivinsect
+Unset Ring
+League: Betrayal
+Variant: Fire and Chaos Resistances
+Variant: Cold and Chaos Resistances
+Variant: Lightning and Chaos Resistances
+Variant: Strength and Dexterity
+Variant: Dexterity and Intelligence
+Variant: Strength and Intelligence
+Variant: Effect of non-Damaging Ailments
+Variant: Focus Shock Nearby Enemies
+Variant: Minimum Frenzy Charges
+Variant: Minimum Power Charges
+Variant: Minimum Endurance Charges
+Requires Level 45
+Has 1 Socket
++5 to Level of Socketed Aura Gems
+Socketed Gems have 10% increased Mana Reservation
++(15–25) to all Attributes
+15 Life Regenerated per second for each Uncorrupted Item Equipped
+-2 to Total Mana Cost of Skills for each Corrupted Item Equipped
+{variant:1}{crafted}+(8-15)% to Fire and Chaos Resistances
+{variant:2}{crafted}+(8-15)% to Cold and Chaos Resistances
+{variant:3}{crafted}+(8-15)% to Lightning and Chaos Resistances
+{variant:4}{crafted}+(6-17) to Strength and Dexterity
+{variant:5}{crafted}+(6-17) to Dexterity and Intelligence
+{variant:6}{crafted}+(6-17) to Strength and Intelligence
+{variant:7}{crafted}(11-30)% increased Effect of non-Damaging Ailments on Enemies
+{variant:8}{crafted}Shock nearby Enemies for (2-4) Seconds when you Focus
+{variant:9}{crafted}+1 to Minimum Frenzy Charges
+{variant:10}{crafted}+1 to Minimum Power Charges
+{variant:11}{crafted}+1 to Minimum Endurance Charges
+]],[[
 Voideye
 Unset Ring
 League: Ambush, Invasion
@@ -792,7 +825,7 @@ Requires Level 45
 Has 1 Socket
 +5 to Level of Socketed Gems
 ]],[[
-The Warden's Brand 
+The Warden's Brand
 Iron Ring
 Requires Level 30
 Adds 1 to 4 Physical Damage to Attacks
@@ -800,4 +833,4 @@ Adds (5–15) to (25–50) Physical Damage to Attacks
 30% reduced Attack Speed
 15% chance to gain a Frenzy Charge when you Stun an Enemy
 ]],
-}
\ No newline at end of file
+}
diff --git a/Data/Uniques/shield.lua b/Data/Uniques/shield.lua
index d772b256..53934b39 100644
--- a/Data/Uniques/shield.lua
+++ b/Data/Uniques/shield.lua
@@ -113,11 +113,11 @@ Magna Eclipsis
 Pinnacle Tower Shield
 Source: Vendor recipe
 Requires Level 70
-+(20–30) to maximum Life 
-+2 to Level of Socketed Gems 
-Triggers Level 20 Elemental Aegis when Equipped 
-(180–220)% increased Armour 
-+(60–80) to maximum Life 
++(20–30) to maximum Life
++2 to Level of Socketed Gems
+Triggers Level 20 Elemental Aegis when Equipped
+(180–220)% increased Armour
++(60–80) to maximum Life
 +(80–100) to Evasion Rating and Energy Shield
 ]],[[
 Redblade Banner
@@ -375,6 +375,34 @@ You take Chaos Damage instead of Physical Damage from Bleeding
 +3% to all maximum Resistances while Poisoned
 Poisons on you expire 50% slower
 ]],[[
+Bitterbind Point
+Titanium Spirit Shield
+League: Betrayal
+Source: Drops from unique{Catarina, Master of Undeath}
+Variant: Fire and Cold Damage
+Variant: Cold and Lightning Damage
+Variant: Fire and Lightning Damage
+Variant: Energy Shield and Life
+Variant: Armour during Soul Gain Prevention
+Variant: Level of Socketed Support Gems
+Requires Level 68, 159 Int
+(30–50)% increased Spell Damage
+(180–220)% increased Energy Shield
+Spectres have (50–100)% increased maximum Life
+Gain Arcane Surge when you deal a Critical Strike
+Your Raised Spectres also gain Arcane Surge when you do
+(40–50)% increased Critical Strike Chance for Spells per Raised Spectre
+{variant:1}{crafted}Adds (3-12) to (5-16) Fire Damage
+{variant:1}{crafted}Adds (3-12) to (5-16) Cold Damage
+{variant:2}{crafted}Adds (3-12) to (5-16) Cold Damage
+{variant:2}{crafted}Adds 1 to (7-24) Lightning Damage
+{variant:3}{crafted}Adds (3-12) to (5-16) Fire Damage
+{variant:3}{crafted}Adds 1 to (7-24) Lightning Damage
+{variant:4}{crafted}(20-40)% increased Energy Shield
+{variant:4}{crafted}+(10-28) to maximum Life
+{variant:5}{crafted}+(500-3000) to Armour during Soul Gain Prevention
+{variant:6}{crafted}+(1-2) to Level of Socketed Support Gems
+]],[[
 Brinerot Flag
 Tarnished Spirit Shield
 League: Warbands
@@ -477,6 +505,7 @@ You are Shocked for 4 seconds on reaching Maximum Power Charges
 ]],[[
 Matua Tupuna
 Tarnished Spirit Shield
+Source: Upgrades to unique{Matua Tupuna} via prophecy{The Mentor}
 Variant: {2_6}Pre 3.0.0
 Variant: Current
 Requires Level 23, 60 Int
@@ -490,6 +519,20 @@ Implicits: 2
 10% increased Effect of Auras on your Minions
 Spreads Tar when you take a Critical Strike
 ]],[[
+Whakatutuki o Matua
+Tarnished Spirit Shield
+Source: Upgraded from unique{Matua Tupuna} via prophecy{The Mentor}
+Requires Level 63, 60 Int
+(5–10)% increased Spell Damage
++3 to Level of Socketed Minion Gems
++(40–80) to maximum Energy Shield
+(40–80)% increased Energy Shield
++(15–25) to maximum Mana
+20% increased Effect of Auras on you
+20% increased Effect of Auras on your Minions
+Spreads Tar when you Block
+If you have Blocked Recently, you and nearby Allies Regenerate 5% of Life per second
+]],[[
 Rathpith Globe
 Titanium Spirit Shield
 Variant: {2_6}Pre 3.0.0
@@ -559,10 +602,10 @@ Curse Enemies with level 5 Vulnerability on Block
 Vix Lunaris
 Cardinal Round Shield
 Requires Level: 66
-+2 to Level of Socketed Gems 
-Triggers Level 20 Cold Aegis when Equipped 
-(200–250)% increased Armour and Evasion 
-+(60–80) to maximum Life 
++2 to Level of Socketed Gems
+Triggers Level 20 Cold Aegis when Equipped
+(200–250)% increased Armour and Evasion
++(60–80) to maximum Life
 Cannot be Frozen
 ]],[[
 Wheel of the Stormsail
@@ -614,10 +657,10 @@ Invictus Solaris
 Archon Kite Shield
 Requires Level: 68
 +12% to all Elemental Resistances
-+2 to Level of Socketed Gems 
-Triggers Level 20 Fire Aegis when Equipped 
-(200–250)% increased Armour and Energy Shield 
-+(60–80) to maximum Life 
++2 to Level of Socketed Gems
+Triggers Level 20 Fire Aegis when Equipped
+(200–250)% increased Armour and Energy Shield
++(60–80) to maximum Life
 Cannot be Ignited
 ]],[[
 Prism Guardian
@@ -647,9 +690,9 @@ Implicits: 2
 {variant:2,3}+8% to all Elemental Resistances
 {variant:3}+(40-60) Maximum Life
 (80-100)% increased Armour and Energy Shield
-{variant:1,2}6 Life Regenerated per second 
+{variant:1,2}6 Life Regenerated per second
 {variant:3}(15-20) Life Regenerated per second
-{variant:1,2}+8% to maximum Fire Resistance 
+{variant:1,2}+8% to maximum Fire Resistance
 {variant:3}+5% to maximum Fire Resistance
 +(20-25)% to Fire Resistance
 +25% to Fire Resistance while on Low Life
@@ -788,12 +831,12 @@ Source: Drops from unique{The Eradicator}
 Variant: Pre 3.5.0
 Variant: Current
 Requires Level 66
-4% chance to Dodge Attacks 
-{variant:1}(130–150)% increased Evasion and Energy Shield 
-{variant:2}(500-600)% increased Evasion and Energy Shield 
-+(60–80) to maximum Life 
-40% increased Duration of Ailments on Enemies 
-+(3–4)% Chance to Block 
+4% chance to Dodge Attacks
+{variant:1}(130–150)% increased Evasion and Energy Shield
+{variant:2}(500-600)% increased Evasion and Energy Shield
++(60–80) to maximum Life
+40% increased Duration of Ailments on Enemies
++(3–4)% Chance to Block
 Shared Suffering
 ]],[[
 Maligaro's Lens
diff --git a/Modules/ModParser-3_0.lua b/Modules/ModParser-3_0.lua
index 52e92c23..c28a34fa 100644
--- a/Modules/ModParser-3_0.lua
+++ b/Modules/ModParser-3_0.lua
@@ -633,6 +633,8 @@ local modTagList = {
 	["per shaper item equipped"] = { tag = { type = "Multiplier", var = "ShaperItem" } },
 	["per elder or shaper item equipped"] = { tag = { type = "Multiplier", varList = { "ElderItem", "ShaperItem" } } },
 	["for each equipped corrupted item"] = { tag = { type = "Multiplier", var = "CorruptedItem" } },
+	["for each corrupted item equipped"] = { tag = { type = "Multiplier", var = "CorruptedItem" } },
+	["for each uncorrupted item equipped"] = { tag = { type = "Multiplier", var = "NonCorruptedItem" } },
 	["per abyssa?l? jewel affecting you"] = { tag = { type = "Multiplier", var = "AbyssJewel" } },
 	["for each type of abyssa?l? jewel affecting you"] = { tag = { type = "Multiplier", var = "AbyssJewelType" } },
 	["per buff on you"] = { tag = { type = "Multiplier", var = "BuffOnSelf" } },