diff --git a/assets/lang/enUS/affixes.json b/assets/lang/enUS/affixes.json
index 4db8d170..c7c529a2 100644
--- a/assets/lang/enUS/affixes.json
+++ b/assets/lang/enUS/affixes.json
@@ -8,10 +8,13 @@
     "armored_hide_active_thorns_bonus": "armored hide active thorns bonus",
     "armored_hide_resolve_generation_rate": "armored hide resolve generation rate",
     "attack_speed": "attack speed",
+    "attack_speed_for_seconds_after_casting_a_defensive_skill": "attack speed for seconds after casting a defensive skill",
     "attack_speed_for_seconds_after_dodging_an_attack": "attack speed for seconds after dodging an attack",
     "attack_speed_while_berserking": "attack speed while berserking",
     "attacks_reduce_evades_cooldown_by_seconds": "attacks reduce evades cooldown by seconds",
     "attacks_reduce_ultimate_cooldown_by_seconds": "attacks reduce ultimate cooldown by seconds",
+    "ball_lightning_can_be_cast_while_moving.": "ball lightning can be cast while moving.",
+    "ball_lightning_projectile_speed": "ball lightning projectile speed",
     "barrier_generation": "barrier generation",
     "bash_cleaves_for_damage": "bash cleaves for damage",
     "basic_attack_speed": "basic attack speed",
@@ -37,6 +40,7 @@
     "blood_overpower_damage": "blood overpower damage",
     "blood_surge_drains_times_from_elites": "blood surge drains times from elites",
     "blood_surge_nova_size": "blood surge nova size",
+    "blood_wave_cooldown_reduction": "blood wave cooldown reduction",
     "bone_critical_strike_chance": "bone critical strike chance",
     "bone_critical_strike_damage": "bone critical strike damage",
     "bone_damage": "bone damage",
@@ -55,6 +59,8 @@
     "caltrops_duration": "caltrops duration",
     "caltrops_size": "caltrops size",
     "casted_hydras_have_heads": "casted hydras have heads",
+    "casting_blood_wave_fortifies_you_for_maximum_life": "casting blood wave fortifies you for maximum life",
+    "casting_bone_spear_reduces_blood_waves_cooldown_by_seconds.": "casting bone spear reduces blood waves cooldown by seconds.",
     "casting_macabre_skills_restores_primary_resource": "casting macabre skills restores primary resource",
     "casting_ultimate_skills_restores_primary_resource": "casting ultimate skills restores primary resource",
     "casting_wrath_skills_restores_primary_resource": "casting wrath skills restores primary resource",
@@ -68,6 +74,7 @@
     "chance_for_arc_lash_to_swipe_twice": "chance for arc lash to swipe twice",
     "chance_for_army_of_the_dead_to_deal_double_damage": "chance for army of the dead to deal double damage",
     "chance_for_ball_lightning_projectiles_to_cast_twice": "chance for ball lightning projectiles to cast twice",
+    "chance_for_ball_lightning_projectiles_to_cast_twice_is_converted_to_chance_to_cast_a_super_ball_lightning.": "chance for ball lightning projectiles to cast twice is converted to chance to cast a super ball lightning.",
     "chance_for_barrage_projectiles_to_cast_twice": "chance for barrage projectiles to cast twice",
     "chance_for_basic_projectiles_to_cast_twice": "chance for basic projectiles to cast twice",
     "chance_for_basic_skills_to_deal_double_damage": "chance for basic skills to deal double damage",
@@ -142,7 +149,9 @@
     "chance_for_minion_attacks_to_fortify_you_for_maximum_life": "chance for minion attacks to fortify you for maximum life",
     "chance_for_payback_to_deal_double_damage": "chance for payback to deal double damage",
     "chance_for_penetrating_shot_projectiles_to_cast_twice": "chance for penetrating shot projectiles to cast twice",
+    "chance_for_pestilent_swarm_to_deal_double_damage": "chance for pestilent swarm to deal double damage",
     "chance_for_poison_creeper_to_deal_double_damage": "chance for poison creeper to deal double damage",
+    "chance_for_potency_skills_to_deal_double_damage": "chance for potency skills to deal double damage",
     "chance_for_projectiles_to_cast_twice": "chance for projectiles to cast twice",
     "chance_for_pulverize_to_hit_twice": "chance for pulverize to hit twice",
     "chance_for_puncture_projectiles_to_cast_twice": "chance for puncture projectiles to cast twice",
@@ -153,7 +162,7 @@
     "chance_for_rapid_fire_projectiles_to_cast_twice": "chance for rapid fire projectiles to cast twice",
     "chance_for_ravager_to_deal_double_damage": "chance for ravager to deal double damage",
     "chance_for_ravens_to_deal_double_damage": "chance for ravens to deal double damage",
-    "chance_for_razor_wings_projectiles_to_cast_twice": "chance for razor wings projectiles to cast twice",
+    "chance_for_razor_wings_to_deal_double_damage": "chance for razor wings to deal double damage",
     "chance_for_reap_to_hit_twice": "chance for reap to hit twice",
     "chance_for_rend_to_hit_twice": "chance for rend to hit twice",
     "chance_for_rock_splitter_to_deal_double_damage": "chance for rock splitter to deal double damage",
@@ -161,7 +170,8 @@
     "chance_for_rushing_claw_to_deal_double_damage": "chance for rushing claw to deal double damage",
     "chance_for_sever_projectiles_to_cast_twice": "chance for sever projectiles to cast twice",
     "chance_for_sever_to_deal_double_damage": "chance for sever to deal double damage",
-    "chance_for_shred_to_hit_twice": "chance for shred to hit twice",
+    "chance_for_shadow_clone_to_deal_double_damage": "chance for shadow clone to deal double damage",
+    "chance_for_shred_to_deal_double_damage": "chance for shred to deal double damage",
     "chance_for_skeletal_mage_attacks_to_cast_twice": "chance for skeletal mage attacks to cast twice",
     "chance_for_skeleton_warriors_to_hit_twice": "chance for skeleton warriors to hit twice",
     "chance_for_smoke_grenade_to_deal_double_damage": "chance for smoke grenade to deal double damage",
@@ -201,7 +211,6 @@
     "cold_resistance": "cold resistance",
     "companion_cooldown_reduction": "companion cooldown reduction",
     "companion_damage": "companion damage",
-    "companion_movement_speed": "companion movement speed",
     "concealment_cooldown_reduction": "concealment cooldown reduction",
     "concealment_duration": "concealment duration",
     "concussive_stomp_barrier_generation": "concussive stomp barrier generation",
@@ -250,10 +259,12 @@
     "damage_for_seconds_after_picking_up_a_blood_orb": "damage for seconds after picking up a blood orb",
     "damage_on_next_attack_after_entering_stealth": "damage on next attack after entering stealth",
     "damage_over_time": "damage over time",
+    "damage_over_time_duration": "damage over time duration",
     "damage_per_combo_point_spent": "damage per combo point spent",
     "damage_per_dark_shroud_shadow": "damage per dark shroud shadow",
     "damage_reduction": "damage reduction",
-    "damage_reduction_for_your_minions": "damage reduction for your minions",
+    "damage_reduction_for_each_active_ball_lightning.": "damage reduction for each active ball lightning.",
+    "damage_reduction_for_your_summons": "damage reduction for your summons",
     "damage_reduction_from_bleeding_enemies": "damage reduction from bleeding enemies",
     "damage_reduction_from_burning_enemies": "damage reduction from burning enemies",
     "damage_reduction_from_close_enemies": "damage reduction from close enemies",
@@ -311,6 +322,7 @@
     "death_blow_cooldown_reduction": "death blow cooldown reduction",
     "death_blow_damage": "death blow damage",
     "death_blow_size": "death blow size",
+    "death_trap_cooldown_reduction": "death trap cooldown reduction",
     "debilitating_roar_cooldown_reduction": "debilitating roar cooldown reduction",
     "debilitating_roar_duration": "debilitating roar duration",
     "decompose_explosion_size": "decompose explosion size",
@@ -386,7 +398,7 @@
     "fury_per_second": "fury per second",
     "gem_strength_in_this_item": "gem strength in this item",
     "golem_active_cooldown_reduction": "golem active cooldown reduction",
-    "golems_damage": "golems damage",
+    "golem_damage": "golem damage",
     "golems_inherit_of_your_thorns": "golems inherit of your thorns",
     "gorilla_damage": "gorilla damage",
     "grenade_damage": "grenade damage",
@@ -395,6 +407,7 @@
     "ground_stomp_cooldown_reduction": "ground stomp cooldown reduction",
     "ground_stomp_damage": "ground stomp damage",
     "ground_stomp_size": "ground stomp size",
+    "hammer_of_the_ancients_damage_for_seconds_after_an_earthquake_explodes": "hammer of the ancients damage for seconds after an earthquake explodes",
     "hammer_of_the_ancients_size": "hammer of the ancients size",
     "healing_received": "healing received",
     "heartseeker_duration": "heartseeker duration",
@@ -502,20 +515,20 @@
     "maximum_life": "maximum life",
     "maximum_life_while_dark_shroud_is_active": "maximum life while dark shroud is active",
     "maximum_mana": "maximum mana",
-    "maximum_minion_life": "maximum minion life",
     "maximum_poison_resistance": "maximum poison resistance",
     "maximum_resistance_to_all_elements": "maximum resistance to all elements",
     "maximum_resolve_stacks": "maximum resolve stacks",
     "maximum_resource": "maximum resource",
     "maximum_shadow_resistance": "maximum shadow resistance",
     "maximum_spirit": "maximum spirit",
+    "maximum_summon_life": "maximum summon life",
     "maximum_vigor": "maximum vigor",
     "meteor_size": "meteor size",
     "mighty_throw_pulse_size": "mighty throw pulse size",
-    "minion_attack_speed": "minion attack speed",
     "minions_inherit_of_your_thorns": "minions inherit of your thorns",
     "mobility_cooldown_reduction": "mobility cooldown reduction",
     "mobility_damage": "mobility damage",
+    "mobility_skills_grant_movement_speed_for_seconds.": "mobility skills grant movement speed for seconds.",
     "movement_speed": "movement speed",
     "movement_speed_during_blood_mist": "movement speed during blood mist",
     "movement_speed_for_seconds_after_killing_an_elite": "movement speed for seconds after killing an elite",
@@ -527,6 +540,7 @@
     "movement_speed_while_berserking": "movement speed while berserking",
     "movement_speed_while_cataclysm_is_active": "movement speed while cataclysm is active",
     "movement_speed_while_hurricane_is_active": "movement speed while hurricane is active",
+    "movement_speed_while_shapeshifted_into_a_werewolf": "movement speed while shapeshifted into a werewolf",
     "movement_speed_while_the_inner_sight_gauge_is_full": "movement speed while the inner sight gauge is full",
     "mystic_circle_potency": "mystic circle potency",
     "nature_magic_cooldown_reduction": "nature magic cooldown reduction",
@@ -608,8 +622,10 @@
     "scourge_poisoning_duration": "scourge poisoning duration",
     "scourge_size": "scourge size",
     "sever_size": "sever size",
+    "shadow_clone_cooldown_reduction": "shadow clone cooldown reduction",
     "shadow_clone_damage": "shadow clone damage",
     "shadow_clone_duration": "shadow clone duration",
+    "shadow_clones_execute_injured_nonelite_enemies.": "shadow clones execute injured nonelite enemies.",
     "shadow_damage": "shadow damage",
     "shadow_damage_over_time": "shadow damage over time",
     "shadow_imbue_lasts_for_casts": "shadow imbue lasts for casts",
@@ -627,9 +643,9 @@
     "shout_cooldown_reduction": "shout cooldown reduction",
     "shred_critical_strike_chance": "shred critical strike chance",
     "shrine_buff_duration": "shrine buff duration",
-    "skeletal_mages_damage": "skeletal mages damage",
     "skeletal_mages_inherit_of_your_thorns": "skeletal mages inherit of your thorns",
     "skeletal_warriors_inherit_of_your_thorns": "skeletal warriors inherit of your thorns",
+    "skeleton_mage_damage": "skeleton mage damage",
     "skeleton_priest_effect_duration": "skeleton priest effect duration",
     "slow_duration_reduction": "slow duration reduction",
     "smoke_grenade_cooldown_reduction": "smoke grenade cooldown reduction",
@@ -638,6 +654,7 @@
     "smoke_grenade_size": "smoke grenade size",
     "soar_cooldown_reduction": "soar cooldown reduction",
     "soar_deals_up_to_damage_based_on_distance_traveled": "soar deals up to damage based on distance traveled",
+    "soar_duration": "soar duration",
     "soar_grants_maximum_life_as_barrier_for_seconds": "soar grants maximum life as barrier for seconds",
     "soar_size": "soar size",
     "soulrift_duration": "soulrift duration",
@@ -659,7 +676,9 @@
     "stun_grenade_damage": "stun grenade damage",
     "stun_grenade_size": "stun grenade size",
     "subterfuge_cooldown_reduction": "subterfuge cooldown reduction",
-    "summoning_damage": "summoning damage",
+    "summon_attack_speed": "summon attack speed",
+    "summon_damage": "summon damage",
+    "summon_movement_speed": "summon movement speed",
     "teleport_cooldown_reduction": "teleport cooldown reduction",
     "teleport_damage": "teleport damage",
     "teleport_nova_size": "teleport nova size",
@@ -698,6 +717,7 @@
     "to_bash": "to bash",
     "to_basic_skills": "to basic skills",
     "to_bastion": "to bastion",
+    "to_belligerence": "to belligerence",
     "to_blade_shift": "to blade shift",
     "to_blight": "to blight",
     "to_blizzard": "to blizzard",
@@ -733,7 +753,6 @@
     "to_concussion": "to concussion",
     "to_concussive_stomp": "to concussive stomp",
     "to_conduction": "to conduction",
-    "to_conjuration_mastery": "to conjuration mastery",
     "to_conjuration_skills": "to conjuration skills",
     "to_consuming_shadows": "to consuming shadows",
     "to_convulsions": "to convulsions",
@@ -786,7 +805,9 @@
     "to_exploit": "to exploit",
     "to_expose_vulnerability": "to expose vulnerability",
     "to_familiar": "to familiar",
+    "to_feral_aptitude": "to feral aptitude",
     "to_fiery_surge": "to fiery surge",
+    "to_finality": "to finality",
     "to_fire_bolt": "to fire bolt",
     "to_fireball": "to fireball",
     "to_firewall": "to firewall",
@@ -817,6 +838,7 @@
     "to_haste": "to haste",
     "to_heartseeker": "to heartseeker",
     "to_heavy_handed": "to heavy handed",
+    "to_heavy_hitter": "to heavy hitter",
     "to_heightened_senses": "to heightened senses",
     "to_hellbent_commander": "to hellbent commander",
     "to_hemorrhage": "to hemorrhage",
@@ -850,6 +872,7 @@
     "to_lupine_ferocitys_damage_bonus": "to lupine ferocitys damage bonus",
     "to_macabre_skills": "to macabre skills",
     "to_malice": "to malice",
+    "to_marksman_and_cutthroat_skills": "to marksman and cutthroat skills",
     "to_martial_vigor": "to martial vigor",
     "to_mastery_skills": "to mastery skills",
     "to_maul": "to maul",
@@ -859,6 +882,7 @@
     "to_meteor": "to meteor",
     "to_mighty_throw": "to mighty throw",
     "to_mirage": "to mirage",
+    "to_mobility_skills": "to mobility skills",
     "to_natural_disaster": "to natural disaster",
     "to_nature_magic_skills": "to nature magic skills",
     "to_natures_reach": "to natures reach",
@@ -884,6 +908,7 @@
     "to_predatory_instinct": "to predatory instinct",
     "to_pressure_point": "to pressure point",
     "to_prime_bone_storms_damage_reduction": "to prime bone storms damage reduction",
+    "to_primordial_binding": "to primordial binding",
     "to_prolific_fury": "to prolific fury",
     "to_pulverize": "to pulverize",
     "to_puncture": "to puncture",
@@ -949,6 +974,7 @@
     "to_thrash": "to thrash",
     "to_thunderspike": "to thunderspike",
     "to_tides_of_blood": "to tides of blood",
+    "to_titans_fall": "to titans fall",
     "to_tornado": "to tornado",
     "to_touch_of_death": "to touch of death",
     "to_tough_as_nails": "to tough as nails",
@@ -970,6 +996,7 @@
     "to_wallop": "to wallop",
     "to_war_cry": "to war cry",
     "to_warmth": "to warmth",
+    "to_warpath": "to warpath",
     "to_weapon_mastery": "to weapon mastery",
     "to_weapon_mastery_skills": "to weapon mastery skills",
     "to_whirlwind": "to whirlwind",
@@ -997,6 +1024,7 @@
     "vigor_cost_reduction": "vigor cost reduction",
     "vigor_on_kill": "vigor on kill",
     "vigor_per_second": "vigor per second",
+    "vigor_when_resolve_is_lost": "vigor when resolve is lost",
     "vortex_size": "vortex size",
     "vulnerable_damage": "vulnerable damage",
     "war_cry_cooldown_reduction": "war cry cooldown reduction",
@@ -1020,5 +1048,6 @@
     "wolves_cooldown_reduction": "wolves cooldown reduction",
     "wolves_damage": "wolves damage",
     "wrath_of_the_berserker_cooldown_reduction": "wrath of the berserker cooldown reduction",
-    "your_potion_also_grants_maximum_resistances_for_seconds": "your potion also grants maximum resistances for seconds"
+    "your_potion_also_grants_maximum_resistances_for_seconds": "your potion also grants maximum resistances for seconds",
+    "your_trap_and_grenade_skills_are_also_considered_core_skills": "your trap and grenade skills are also considered core skills"
 }
diff --git a/assets/lang/enUS/uniques.json b/assets/lang/enUS/uniques.json
index 7fdc6836..633abc74 100644
--- a/assets/lang/enUS/uniques.json
+++ b/assets/lang/enUS/uniques.json
@@ -53,8 +53,8 @@
         "num_idx": []
     },
     "arreats_bearing": {
-        "desc": "ancients you summon are empowered. korlic creates an earthquake that deals physical damage over seconds when he leaps. talic leaves behind dust devils that deal damage while he whirlwinds. mawdac ignites the ground burning enemies for an additional damage over seconds when he upheaves the ground.",
-        "full": "Ancients you summon are empowered.\r\n\r\n{icon:bullet}Korlic creates an {c_important}Earthquake{/c} that deals {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * Affix_Value_1]{/c} Physical damage over {c_number}[PowerTag.Barbarian_Earthquake.\"Script Formula 1\"]{/c} seconds when he leaps.\r\n{icon:bullet}Talic leaves behind {c_important}Dust Devils{/c} that deal {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * (Affix_Value_1 * 2)]{/c} damage while he whirlwinds.\r\n{icon:bullet}Mawdac ignites the ground Burning enemies for an additional {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * (Affix_Value_1)]{/c} damage over {c_number}[Affix.\"Static Value 0\"]{/c} seconds when he upheaves the ground.",
+        "desc": "your ancients are empowered korlic creates an earthquake that deals physical damage over seconds when he leaps. talic leaves behind dust devils that deal damage while he whirlwinds. madawc ignites the earth, burning enemies for an additional damage over seconds when he upheaves the ground.",
+        "full": "Your Ancients are empowered:\r\n\r\n{icon:bullet}Korlic creates an {c_important}Earthquake{/c} that deals {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * Affix_Value_1]{/c} Physical damage over {c_number}[PowerTag.Barbarian_Earthquake.\"Script Formula 1\"]{/c} seconds when he leaps.\r\n{icon:bullet}Talic leaves behind {c_important}Dust Devils{/c} that deal {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * (Affix_Value_1 * 2)]{/c} damage while he whirlwinds.\r\n{icon:bullet}Madawc ignites the earth, Burning enemies for an additional {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * (Affix_Value_1)]{/c} damage over {c_number}[Affix.\"Static Value 0\"]{/c} seconds when he upheaves the ground.",
         "num_idx": [
             0,
             2,
@@ -69,6 +69,14 @@
             2
         ]
     },
+    "assassins_stride": {
+        "desc": "mobility skills are always shadow imbued with increased potency. lucky hit damaging an elite or boss with a mobility skill has up to a chance to instantly triggers a free shadow imbuement explosion.",
+        "full": "{c_important}Mobility{/c} Skills are always {c_important}Shadow Imbued{/c} with {c_random}[Affix_Value_1|%x|]{/c} increased potency. \r\n\r\n{c_label}Lucky Hit:{/c} Damaging an Elite or Boss with a {c_important}Mobility{/c} Skill has up to a {c_random}[Affix_Value_2|%|]{/c} chance to instantly triggers a free {c_important}Shadow Imbuement{/c} explosion.",
+        "num_idx": [
+            0,
+            1
+        ]
+    },
     "axial_conduit": {
         "desc": "chain lightning alternates between orbiting you and seeking up to enemies. when it returns, it drains mana from you for each active chain lightning. after draining total mana, the bolt explodes for lightning damage. chain lightning expires if you dont have enough mana for it to drain.",
         "full": "{c_important}Chain Lightning{/c} alternates between orbiting you and seeking up to {c_number}[Affix.\"Static Value 2\"]{/c} enemies. When it returns, it drains {c_number}[Affix.\"Static Value 0\"]{/c} Mana from you for each active {c_important}Chain Lightning{/c}. After draining {c_number}[Affix.\"Static Value 3\"]{/c} total Mana, the bolt explodes for {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * Affix_Value_1 * Affix.\"Static Value 1\"]{/c} Lightning Damage.\r\n                       \r\n{c_important}Chain Lightning{/c} expires if you don't have enough Mana for it to drain.",
@@ -83,8 +91,8 @@
         ]
     },
     "band_of_first_breath": {
-        "desc": "casting evade consumes stacks of resolve to generate vigor. gain armored hides passive effect.",
-        "full": "Casting {c_important}Evade{/c} consumes {c_number}[Affix.\"Static Value 0\"]{/c} |4stack:stacks; of {c_important}{u}Resolve{/u}{/c} to generate {c_random}[Affix_Value_1]{/c} Vigor.\r\n\r\nGain {c_important}Armored Hide's{/c} Passive Effect.",
+        "desc": "casting evade consumes stacks of resolve to increase your damage dealt by for seconds. gain armored hides passive effect.",
+        "full": "Casting {c_important}Evade{/c} consumes {c_number}[Affix.\"Static Value 0\"]{/c} |4stack:stacks; of {c_important}{u}Resolve{/u}{/c} to increase your damage dealt by {c_random}[Affix_Value_1|x%|]{/c} for {c_number}[Affix.\"Static Value 1\"]{/c} seconds.\r\n\r\nGain {c_important}Armored Hide's{/c} Passive Effect.",
         "num_idx": [
             1
         ]
@@ -134,8 +142,8 @@
         ]
     },
     "blood_moon_breeches": {
-        "desc": "your minions attacks have a chance to randomly inflict decrepify or iron maiden. you deal increased overpower damage to enemies affected by your curses.",
-        "full": "Your Minions' attacks have a {c_random}[Affix_Value_1|1%|]{/c} chance to randomly inflict {c_important}Decrepify{/c} or {c_important}Iron Maiden{/c}.  \r\n\r\nYou deal {c_random}[Affix_Value_2|%x|]{/c} increased {c_important}Overpower{/c} damage to enemies affected by your {c_important}Curses{/c}.",
+        "desc": "your summons have a chance to randomly inflict decrepify or iron maiden when they deal damage. you deal increased critical strike damage to enemies affected by your curses.",
+        "full": "Your {c_important}Summons{/c} have a {c_random}[Affix_Value_1|1%|]{/c} chance to randomly inflict {c_important}Decrepify{/c} or {c_important}Iron Maiden{/c} when they deal damage.  \r\n\r\nYou deal {c_random}[Affix_Value_2|%x|]{/c} increased Critical Strike Damage to enemies affected by your {c_important}Curses{/c}.",
         "num_idx": [
             0,
             1
@@ -211,15 +219,16 @@
         ]
     },
     "deathless_visage": {
-        "desc": "bone spear leaves behind echoes that explode for physical damage, increased by for every critical strike damage you have. current bonus",
-        "full": "{c_important}Bone Spear{/c} leaves behind echoes that explode for {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * (1 + Owner.Main_Hand_Damage_Percent_Bonus) * Affix_Value_1]{/c} Physical damage, increased by {c_number}[Affix.\"Static Value 0\"|%x|]{/c} for every {c_number}[Affix.\"Static Value 1\"|%|]{/c} Critical Strike Damage you have.\r\n\r\nCurrent Bonus: {c_number}[Floor((Owner.(ComputeCritDamageScalar() + (-1)) + Owner.Crit_Damage_Percent) / (Affix.\"Static Value 1\" / 100)) * Affix.\"Static Value 0\"|x%||1|]{/c}",
+        "desc": "bone spear deals more critical strike damage and forms echoes that burst for physical damage, increased by for every of your total critical strike damage bonus. current bonus",
+        "full": "{c_important}Bone Spear{/c} deals {c_random}[Affix_Value_2|1%x|]{/c} more Critical Strike Damage and forms echoes that burst for {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * (1 + Owner.Main_Hand_Damage_Percent_Bonus) * Affix_Value_1]{/c} Physical damage, increased by {c_number}[Affix.\"Static Value 0\"|%x|]{/c} for every {c_number}[Affix.\"Static Value 1\"|%|]{/c} of your total Critical Strike Damage bonus.\r\n\r\nCurrent Bonus: {c_number}[Floor((Owner.(ComputeCritDamageScalar() + (-1)) + Owner.Crit_Damage_Percent) / (Affix.\"Static Value 1\" / 100)) * Affix.\"Static Value 0\"|x%||1|]{/c}",
         "num_idx": [
-            0
+            0,
+            1
         ]
     },
     "deathspeakers_pendant": {
         "desc": "blood surge casts a mini nova on your minions, dealing damage. damage is increased by per target drained by the initial cast, up to .",
-        "full": "{c_important}Blood Surge{/c} casts a mini nova on your Minions, dealing {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * (1 + Owner.Main_Hand_Damage_Percent_Bonus) * Affix_Value_1]{/c} damage. Damage is increased by {c_number}[Affix.\"Static Value 0\"|%|]{/c} per target drained by the initial cast, up to {c_number}[Affix.\"Static Value 1\"|%|]{/c}.",
+        "full": "{c_important}Blood Surge{/c} casts a mini nova on your {c_important}Minions{/c}, dealing {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * (1 + Owner.Main_Hand_Damage_Percent_Bonus) * Affix_Value_1]{/c} damage. Damage is increased by {c_number}[Affix.\"Static Value 0\"|%|]{/c} per target drained by the initial cast, up to {c_number}[Affix.\"Static Value 1\"|%|]{/c}.",
         "num_idx": [
             0
         ]
@@ -363,8 +372,8 @@
         ]
     },
     "grasp_of_shadow": {
-        "desc": "lucky hit damaging an enemy with a marksman or cutthroat skill has up to a chance to summon a shadow clone that mimics that skill.",
-        "full": "{c_label}Lucky Hit:{/c} Damaging an enemy with a {c_important}Marksman{/c} or {c_important}Cutthroat{/c} Skill has up to a {c_random}[Affix_Value_1|%|]{/c} chance to summon a {c_important}Shadow Clone{/c} that mimics that Skill.",
+        "desc": "casting a marksman or cutthroat skill has a chance to summon a shadow clone that mimics that skill.",
+        "full": "Casting a {c_important}Marksman{/c} or {c_important}Cutthroat{/c} Skill has a {c_random}[Affix_Value_1|%|]{/c} chance to Summon a {c_important}Shadow Clone{/c} that mimics that Skill.",
         "num_idx": [
             0
         ]
@@ -408,8 +417,8 @@
         ]
     },
     "howl_from_below": {
-        "desc": "instead of detonating immediately, corpse explosion summons a volatile skeleton that charges at a random enemy and explodes. corpse explosions damage is increased by .",
-        "full": "Instead of detonating immediately, {c_important}Corpse Explosion{/c} summons a Volatile Skeleton that charges at a random enemy and explodes. {c_important}Corpse Explosion's{/c} damage is increased by {c_random}[Affix_Value_1|%x|]{/c}.",
+        "desc": "instead of detonating immediately, corpse explosion now summons a volatile skeleton that charges at a random enemy and explodes. corpse explosion deals increased damage.",
+        "full": "Instead of detonating immediately, {c_important}Corpse Explosion{/c} now Summons a {c_important}Volatile Skeleton{/c} that charges at a random enemy and explodes. \r\n\r\n{c_important}Corpse Explosion{/c} deals {c_random}[Affix_Value_1|%x|]{/c} increased damage.",
         "num_idx": [
             0
         ]
@@ -428,6 +437,13 @@
             0
         ]
     },
+    "indiras_memory": {
+        "desc": "blood wave is additionally a bone skill. it spawns a bone prison at its end point and increases your blood skill damage by for seconds when cast. bone spear is additionally a blood skill. it drains maximum life each cast after hitting an enemy to consume a surrounding corpse and launch a new bone spear from it.",
+        "full": "{c_important}Blood Wave{/c} is additionally a {c_important}Bone{/c} Skill. It spawns a {c_important}Bone Prison{/c} at its end point and increases your {c_important}Blood{/c} Skill damage by {c_random}[Affix_Value_1|%x|]{/c} for {c_number}[Affix.\"Static Value 0\"]{/c} seconds when Cast.\r\n\r\n{c_important}Bone Spear{/c} is additionally a {c_important}Blood{/c} Skill. It drains {c_number}[Affix.\"Static Value 2\"*100|%|]{/c} Maximum Life each Cast after hitting an enemy to consume a surrounding Corpse and launch a new {c_important}Bone Spear{/c} from it.",
+        "num_idx": [
+            0
+        ]
+    },
     "insatiable_fury": {
         "desc": "werebear form is now your true form, and you gain ranks to all werebear skills.",
         "full": "Werebear form is now your true form, and you gain {c_random}[Affix_Value_1]{/c} Ranks to all {c_important}Werebear{/c} Skills.",
@@ -437,14 +453,23 @@
     },
     "jacinth_shell": {
         "desc": "spending vigor heals you for of your maximum life. every second, your active cooldowns each drain maximum life from you to reduce their durations by seconds.",
-        "full": "Spending Vigor Heals you for {c_random}[Affix_Value_1*100|%|]{/c} of your Maximum Life. \r\n\r\nEvery second, your active Cooldowns each drain {c_number}[Affix.\"Static Value 0\"*100|%|]{/c} Maximum Life from you to reduce their durations by {c_number}[Affix.\"Static Value 1\"]{/c} seconds. ",
+        "full": "Spending Vigor Heals you for {c_random}[Affix_Value_1*100|1%|]{/c} of your Maximum Life. \r\n\r\nEvery second, your active Cooldowns each drain {c_number}[Affix.\"Static Value 0\"*100|%|]{/c} Maximum Life from you to reduce their durations by {c_number}[Affix.\"Static Value 1\"]{/c} seconds. ",
         "num_idx": [
             0
         ]
     },
+    "kessimes_legacy": {
+        "desc": "blood wave now forms a wave on each side of you. both waves converge at your feet, pulling in all surrounding enemies and exploding for damage. each wave hit causes enemies to take more damage from your blood waves, up to .",
+        "full": "{c_important}Blood Wave{/c} now forms a wave on each side of you. Both waves converge at your feet, Pulling In all surrounding enemies and exploding for {c_random}[(Owner.Weapon_Damage_Min_Total + Owner.Weapon_Damage_Delta_Total) * Affix_Value_2]{/c} damage.\r\n\r\nEach wave hit causes enemies to take {c_random}[Affix_Value_1|%2|]{/c} more damage from your {c_important}Blood Waves{/c}, up to {c_random}[(Affix_Value_1*Affix.\"Static Value 0\")|%1|]{/c}.",
+        "num_idx": [
+            0,
+            1,
+            2
+        ]
+    },
     "lidless_wall": {
-        "desc": "lucky hit while you have an active bone storm, hitting an enemy outside of a bone storm has up to a chance to spawn an additional bone storm at their location. each of your active sacrifice bonuses increases this chance by and the maximum possible bone storms by .",
-        "full": "{c_label}Lucky Hit:{/c} While you have an active {c_important}Bone Storm{/c}, hitting an enemy outside of a {c_important}Bone Storm{/c} has up to a {c_random}[Affix_Value_1|%|]{/c} chance to spawn an additional {c_important}Bone Storm{/c} at their location. \r\n\r\nEach of your active Sacrifice bonuses increases this chance by {c_number}[Affix_Value_2|%|]{/c} and the maximum possible {c_important}Bone Storms{/c} by {c_number}[Affix.\"Static Value 0\"|~|]{/c}.",
+        "desc": "lucky hit while you have an active bone storm, hitting an enemy has up to a chance to spawn a bone storm around their location. each sacrifice bonus increases this chance by and allows you to spawn additional bone storm. each active bone storm grants critical strike damage.",
+        "full": "{c_label}Lucky Hit:{/c} While you have an active {c_important}Bone Storm{/c}, hitting an enemy has up to a {c_random}[Affix_Value_1|%|]{/c} chance to spawn a {c_important}Bone Storm{/c} around their location. \r\n\r\nEach Sacrifice bonus increases this chance by {c_number}[Affix_Value_2|%|]{/c} and allows you to spawn {c_number}[Affix.\"Static Value 0\"||]{/c} additional {c_important}Bone Storm{/c}. Each active {c_important}Bone Storm{/c} grants {c_number}[Affix.\"Static Value 1\"|%|]{/c} Critical Strike Damage. ",
         "num_idx": [
             0
         ]
@@ -470,14 +495,28 @@
             0
         ]
     },
+    "malefic_crescent": {
+        "desc": "lupine ferocitys critical strike damage is increased to for consecutive critical strikes.",
+        "full": "{c_important}Lupine Ferocity's{/c} Critical Strike Damage is increased to {c_random}[Affix_Value_1 * 100|%x|]{/c} for consecutive Critical Strikes.",
+        "num_idx": [
+            0
+        ]
+    },
+    "mantle_of_mountains_fury": {
+        "desc": "hammer of the ancients also forms a seismic line that deals its damage and slows enemies hit by for seconds. earthquakes it passes through explode for their total damage and are consumed.",
+        "full": "{c_important}Hammer of the Ancients{/c} also forms a seismic line that deals its damage and Slows enemies hit by {c_random}[Affix_Value_1|%|]{/c} for {c_number}[Affix.\"Static Value 0\"]{/c} seconds. {c_important}Earthquakes{/c} it passes through explode for their total damage and are consumed. ",
+        "num_idx": [
+            0
+        ]
+    },
     "melted_heart_of_selig": {
         "desc": "gain maximum resource. when taking damage, is drained as resource for every of maximum life you would have lost.",
         "full": "Gain {c_number}[Affix.\"Static Value 0\"]{/c} Maximum Resource.\r\n\r\nWhen taking damage, {c_number}[Affix.\"Static Value 2\"|%|]{/c} is drained as {c_number}[Affix_Value_1]{/c} Resource for every {c_number}[Affix.\"Static Value 1\"|%|]{/c} of Maximum Life you would have lost.",
         "num_idx": []
     },
     "mjölnic_ryng": {
-        "desc": "while cataclysm is active, you gain unlimited spirit and deal increased damage.",
-        "full": "While {c_important}Cataclysm{/c} is active, you gain unlimited Spirit and deal {c_random}[Affix_Value_1|%x|]{/c} increased damage.",
+        "desc": "while cataclysm is active, you gain unlimited spirit and deal increased damage. cataclysm receives your lightning bolt benefits.",
+        "full": "While {c_important}Cataclysm{/c} is active, you gain unlimited Spirit and deal {c_random}[Affix_Value_1|%x|]{/c} increased damage.\r\n\r\n{c_important}Cataclysm{/c} receives your {c_important}Lightning Bolt{/c} benefits.",
         "num_idx": [
             0
         ]
@@ -502,6 +541,13 @@
         "full": "Every {c_number}[Affix.\"Static Value 0\"]{/c} seconds, you randomly mark a Nearby enemy. Marked enemies are {c_important}{u}Vulnerable{/u}{/c}, and your attacks against them are guaranteed to Critically Strike and {c_important}{u}Overpower{/u}{/c}.\r\n\r\nHitting a marked enemy {c_number}[Affix_Value_1]{/c} times clears the mark from them.",
         "num_idx": []
     },
+    "okuns_catalyst": {
+        "desc": "ball lightning orbits you creating a static field that damages all enemies within for of ball lightnings damage per active ball. you are unhindered as long as the field is active.",
+        "full": "{c_important}Ball Lightning{/c} orbits you creating a static field that damages all enemies within for {c_random}[Affix_Value_1* 100|%x|]{/c} of {c_important}Ball Lightning's{/c} damage per active ball. You are {c_important} {u}Unhindered{/u}{/c} as long as the field is active.",
+        "num_idx": [
+            0
+        ]
+    },
     "overkill": {
         "desc": "death blow creates a shockwave, dealing of its base damage to enemies. enemies who die to this effect also reset death blows cooldown.",
         "full": "{c_important}Death Blow{/c} creates a shockwave, dealing {c_random}[Affix_Value_1|%|]{/c} of its Base damage to enemies. Enemies who die to this effect also reset {c_important}Death Blow’s{/c} Cooldown.",
@@ -639,10 +685,10 @@
         ]
     },
     "rod_of_kepeleke": {
-        "desc": "your core skills are now additionally basic skills and free to cast, but deal up to reduced damage based on their vigor cost. when cast at maximum vigor, your core skills consume all vigor to return to full damage, cast at their largest size, and become guaranteed critical strikes, with increased critical strike damage for each point of vigor spent this way.",
-        "full": "Your {c_important}Core{/c} Skills are now additionally {c_important}Basic{/c} Skills and free to cast, but deal up to {c_number}[Affix.\"Static Value 0\"*100|%|]{/c} reduced damage based on their Vigor Cost. \r\n\r\nWhen cast at Maximum Vigor, your {c_important}Core{/c} Skills consume all Vigor to return to full damage, cast at their largest Size, and become guaranteed Critical Strikes, with {c_random}[Affix_Value_1*100|%2x|]{/c} increased Critical Strike Damage for each point of Vigor spent this way.",
+        "desc": "your core skills are now additionally basic skills and free to cast. when cast at maximum vigor, your core skills consume all vigor to cast at their largest size, and become guaranteed critical strikes, with increased critical strike damage for each point of vigor spent this way.",
+        "full": "Your {c_important}Core{/c} Skills are now additionally {c_important}Basic{/c} Skills and free to cast.\r\n\r\nWhen cast at Maximum Vigor, your {c_important}Core{/c} Skills consume all Vigor to cast at their largest Size, and become guaranteed Critical Strikes, with {c_random}[Affix_Value_1*100|%2x|]{/c} increased Critical Strike Damage for each point of Vigor spent this way.",
         "num_idx": [
-            1
+            0
         ]
     },
     "saboteurs_signet": {
@@ -668,10 +714,11 @@
         ]
     },
     "scoundrels_leathers": {
-        "desc": "while you have unlimited energy from inner sight, casting a core skill has a chance to spawn caltrops, poison trap, or death trap.",
-        "full": "While you have unlimited Energy from {c_important}Inner Sight{/c}, casting a {c_important}Core{/c} Skill has a {c_random}[Affix_Value_1|%|]{/c} chance to spawn {c_important}Caltrops{/c}, {c_important}Poison Trap{/c}, or {c_important}Death Trap{/c}.",
+        "desc": "while you have unlimited energy from inner sight, casting a core skill has a chance to spawn caltrops, poison trap, or death trap. gain core skill damage.",
+        "full": "While you have unlimited Energy from {c_important}Inner Sight{/c}, casting a {c_important}Core{/c} Skill has a {c_random}[Affix_Value_1|%|]{/c} chance to spawn {c_important}Caltrops{/c}, {c_important}Poison Trap{/c}, or {c_important}Death Trap{/c}. Gain {c_random}[Affix_Value_2|%x|]{/c} {c_important}Core{/c} Skill Damage.",
         "num_idx": [
-            0
+            0,
+            1
         ]
     },
     "sepazontec": {
@@ -746,6 +793,21 @@
         "full": "Your {c_important}Wolf{/c} Companions are infused with the power of the storm, dealing Lightning damage and gaining the {c_important}Storm Howl{/c} ability.",
         "num_idx": []
     },
+    "strike_of_stormhorn": {
+        "desc": "ball lightning splashes on impact for increased damage. it stuns enemies for second if it reaches its maximum range. super ball lightnings are larger, deal increased damage, have a higher lucky hit chance, and their stun duration is increased to seconds.",
+        "full": "{c_important}Ball Lightning{/c} splashes on impact for {c_random}[Affix_Value_1*100|%x|]{/c} increased damage. It Stuns enemies for {c_number}[Affix.\"Static Value 2\"]{/c} second if it reaches its maximum range.\r\n\r\n{c_important}Super Ball Lightnings{/c} are larger, deal  {c_number}[Affix.\"Static Value 4\"|%x|]{/c} increased damage, have a higher Lucky Hit Chance, and their Stun duration is increased to {c_number}[Affix.\"Static Value 3\"]{/c} seconds.",
+        "num_idx": [
+            0
+        ]
+    },
+    "sunstained war-crozier": {
+        "desc": "your focus skills benefit from all their upgrades, and they increase the damage of your potency skills by for seconds, up to .",
+        "full": "Your {c_important}Focus{/c} Skills benefit from all their Upgrades, and they increase the damage of your {c_important}Potency{/c} Skills by {c_random}[Affix_Value_1|x%|]{/c} for {c_number}[Affix.\"Static Value 0\"]{/c} seconds, up to {c_random}[Affix_Value_1*Affix.\"Static Value 1\"|x%|]{/c}.",
+        "num_idx": [
+            0,
+            2
+        ]
+    },
     "tal_rashas_iridescent_loop": {
         "desc": "casting a pyromancy, shock, or frost skill increases your damage by for seconds, stacking once per element. casting again refreshes all bonuses if the previous skill was a different element.",
         "full": "Casting a {c_important}Pyromancy{/c}, {c_important}Shock{/c}, or {c_important}Frost{/c} Skill increases your damage by {c_random}[Affix_Value_1|1%x|]{/c} for {c_number}[Affix.\"Static Value 0\"]{/c} seconds, stacking once per element. Casting again refreshes all bonuses if the previous skill was a different Element.",
@@ -837,8 +899,8 @@
         ]
     },
     "twin_strikes": {
-        "desc": "after casting double swing times, your next double swing will hit additional times, each dealing increased damage.",
-        "full": "After casting {c_important}Double Swing{/c} {c_number}[Affix.\"Static Value 0\" - 1]{/c} times, your next {c_important}Double Swing{/c} will hit {c_number}[Affix.\"Static Value 1\"]{/c} additional times, each dealing {c_random}[Affix_Value_1|%x|]{/c} increased damage.",
+        "desc": "after casting double swing times, your next double swing will hit additional times, each dealing increased damage and stunning for second.",
+        "full": "After casting {c_important}Double Swing{/c} {c_number}[Affix.\"Static Value 0\" - 1]{/c} times, your next {c_important}Double Swing{/c} will hit {c_number}[Affix.\"Static Value 1\"]{/c} additional times, each dealing {c_random}[Affix_Value_1|%x|]{/c} increased damage and Stunning for {c_number}[Affix.\"Static Value 2\"]{/c} second.",
         "num_idx": [
             2
         ]
@@ -902,16 +964,18 @@
         ]
     },
     "windforce": {
-        "desc": "hits of barrage have a chance to deal double damage and knock down enemies.",
-        "full": "Hits of {c_important}Barrage{/c} have a {c_random}[Affix_Value_1|%|]{/c} chance to deal double damage and Knock Down enemies.",
+        "desc": "hits of barrage have a chance to deal triple damage and knock down enemies.",
+        "full": "Hits of {c_important}Barrage{/c} have a {c_random}[Affix_Value_1|%|]{/c} chance to deal triple damage and Knock Down enemies.",
         "num_idx": [
             0
         ]
     },
     "word_of_hakan": {
-        "desc": "your rain of arrows is always imbued with all imbuements and receives your arrow storm benefits.",
-        "full": "Your {c_important}Rain of Arrows{/c} is always {c_important}Imbued{/c} with all {c_important}Imbuements{/c} and receives your {c_important}Arrow Storm{/c} benefits.",
-        "num_idx": []
+        "desc": "your rain of arrows is always imbued with all imbuements and receives your arrow storm benefits. gain increased damage to distant enemies.",
+        "full": "Your {c_important}Rain of Arrows{/c} is always {c_important}Imbued{/c} with all {c_important}Imbuements{/c} and receives your {c_important}Arrow Storm{/c} benefits.\r\n\r\nGain {c_random}[Affix_Value_1|%x|]{/c} increased damage to Distant enemies.",
+        "num_idx": [
+            0
+        ]
     },
     "wound_drinker": {
         "desc": "every time you deal thorns damage, you gain vigor. gain toxic skins passive effect.",
@@ -942,8 +1006,8 @@
         ]
     },
     "yens_blessing": {
-        "desc": "casting a skill has a chance to cast a nonmobility, nonultimate skill that is currently on cooldown. can only occur once every seconds.",
-        "full": "Casting a Skill has a {c_random}[Affix_Value_1|%|]{/c} chance to cast a Non-{c_important}Mobility{/c}, Non-{c_important}Ultimate{/c} Skill that is currently on Cooldown. Can only occur once every {c_number}[Affix.\"Static Value 0\"]{/c} seconds.",
+        "desc": "casting a skill has a chance to trigger a nonmobility, nonultimate skill that is currently on cooldown. can only occur once every seconds.",
+        "full": "Casting a Skill has a {c_random}[Affix_Value_1|%|]{/c} chance to trigger a Non-{c_important}Mobility{/c}, Non-{c_important}Ultimate{/c} Skill that is currently on Cooldown. Can only occur once every {c_number}[Affix.\"Static Value 0\"]{/c} seconds.",
         "num_idx": [
             0
         ]
diff --git a/src/gui/importer/maxroll.py b/src/gui/importer/maxroll.py
index 2ae92139..1c82a98a 100644
--- a/src/gui/importer/maxroll.py
+++ b/src/gui/importer/maxroll.py
@@ -64,11 +64,14 @@ def import_maxroll(url: str):
             unique_model = UniqueModel()
             unique_name = mapping_data["items"][resolved_item["id"]]["name"]
             try:
+                unique_name = _unique_name_special_handling(unique_name)
                 unique_model.aspect = AspectUniqueFilterModel(name=unique_name)
-                unique_model.affix = [
-                    AffixFilterModel(name=x.name)
-                    for x in _find_item_affixes(mapping_data=mapping_data, item_affixes=resolved_item["explicits"])
-                ]
+                # Maxroll's uniques are all over the place in quality when it comes to affixes and names.
+                # Removing support for this for now.
+                # unique_model.affix = [
+                #     AffixFilterModel(name=x.name)
+                #     for x in _find_item_affixes(mapping_data=mapping_data, item_affixes=resolved_item["explicits"])
+                # ]
                 unique_filters.append(unique_model)
             except Exception:
                 LOGGER.exception(f"Unexpected error importing unique {unique_name}, please report a bug.")
@@ -195,6 +198,16 @@ def _attr_desc_special_handling(affix_id: str) -> str:
             return ""
 
 
+def _unique_name_special_handling(unique_name: str) -> str:
+    match unique_name:
+        case "[PH] Season 7 Necro Pants":
+            return "kessimes_legacy"
+        case "[PH] Season 7 Barb Chest":
+            return "mantle_of_mountains_fury"
+        case _:
+            return unique_name
+
+
 def _find_item_type(mapping_data: dict, value: str) -> ItemType | None:
     for d_key, d_value in mapping_data.items():
         if d_key == value:
diff --git a/src/tools/data/custom_uniques_enUS.json b/src/tools/data/custom_uniques_enUS.json
index ccb3639a..d089be3d 100644
--- a/src/tools/data/custom_uniques_enUS.json
+++ b/src/tools/data/custom_uniques_enUS.json
@@ -29,6 +29,12 @@
             0
         ]
     },
+    "pitfighters_gull": {
+        "desc": "seconds and leaves behind a cloud of shadows. While within the cloud",
+        "num_idx": [
+            0
+        ]
+    },
     "rakanoths_wake": {
         "desc": "when you cast a skill with a cooldown you explode dealing fire damage",
         "num_idx": [