diff --git a/Data/Bases/claw.lua b/Data/Bases/claw.lua
index 20d42d4a..2dc8994d 100644
--- a/Data/Bases/claw.lua
+++ b/Data/Bases/claw.lua
@@ -3,49 +3,49 @@ local itemBases = ...
 
 itemBases["Nailed Fist"] = {
 	type = "Claw",
-	implicit = "+3 Life gained for each enemy hit by Attacks",
+	implicit = "+3 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 4, PhysicalMax = 11, critChanceBase = 6.2, attackRateBase = 1.6, },
 	req = { level = 3, dex = 11, int = 11, },
 }
 itemBases["Sharktooth Claw"] = {
 	type = "Claw",
-	implicit = "+6 Life gained for each enemy hit by Attacks",
+	implicit = "+6 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 7, PhysicalMax = 18, critChanceBase = 6.5, attackRateBase = 1.4, },
 	req = { level = 7, dex = 14, int = 20, },
 }
 itemBases["Awl"] = {
 	type = "Claw",
-	implicit = "+7 Life gained for each enemy hit by Attacks",
+	implicit = "+7 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 7, PhysicalMax = 24, critChanceBase = 6.3, attackRateBase = 1.5, },
 	req = { level = 12, dex = 25, int = 25, },
 }
 itemBases["Cat's Paw"] = {
 	type = "Claw",
-	implicit = "+8 Life gained for each enemy hit by Attacks",
+	implicit = "+8 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 12, PhysicalMax = 22, critChanceBase = 6, attackRateBase = 1.6, },
 	req = { level = 17, dex = 39, int = 27, },
 }
 itemBases["Blinder"] = {
 	type = "Claw",
-	implicit = "+12 Life gained for each enemy hit by Attacks",
+	implicit = "+12 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 12, PhysicalMax = 32, critChanceBase = 6.3, attackRateBase = 1.5, },
 	req = { level = 22, dex = 41, int = 41, },
 }
 itemBases["Timeworn Claw"] = {
 	type = "Claw",
-	implicit = "+19 Life gained for each enemy hit by Attacks",
+	implicit = "+19 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 16, PhysicalMax = 43, critChanceBase = 6.5, attackRateBase = 1.3, },
 	req = { level = 26, dex = 39, int = 56, },
 }
 itemBases["Sparkling Claw"] = {
 	type = "Claw",
-	implicit = "+15 Life gained for each enemy hit by Attacks",
+	implicit = "+15 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 14, PhysicalMax = 43, critChanceBase = 6, attackRateBase = 1.6, },
 	req = { level = 30, dex = 64, int = 44, },
 }
 itemBases["Fright Claw"] = {
 	type = "Claw",
-	implicit = "+20 Life gained for each enemy hit by Attacks",
+	implicit = "+20 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 12, PhysicalMax = 46, critChanceBase = 6.3, attackRateBase = 1.5, },
 	req = { level = 34, dex = 61, int = 61, },
 }
@@ -63,7 +63,7 @@ itemBases["Thresher Claw"] = {
 }
 itemBases["Gouger"] = {
 	type = "Claw",
-	implicit = "+24 Life gained for each enemy hit by Attacks",
+	implicit = "+24 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 15, PhysicalMax = 51, critChanceBase = 6.3, attackRateBase = 1.5, },
 	req = { level = 40, dex = 70, int = 70, },
 }
@@ -75,7 +75,7 @@ itemBases["Tiger's Paw"] = {
 }
 itemBases["Gut Ripper"] = {
 	type = "Claw",
-	implicit = "+44 Life gained for each enemy hit by Attacks",
+	implicit = "+44 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 20, PhysicalMax = 53, critChanceBase = 6.3, attackRateBase = 1.5, },
 	req = { level = 46, dex = 80, int = 80, },
 }
@@ -123,7 +123,7 @@ itemBases["Hellion's Paw"] = {
 }
 itemBases["Eye Gouger"] = {
 	type = "Claw",
-	implicit = "+50 Life gained for each enemy hit by Attacks",
+	implicit = "+50 Life gained for each Enemy hit by Attacks",
 	weapon = { PhysicalMin = 26, PhysicalMax = 68, critChanceBase = 6.3, attackRateBase = 1.5, },
 	req = { level = 64, dex = 113, int = 113, },
 }
diff --git a/Data/Bases/dagger.lua b/Data/Bases/dagger.lua
index 5c56eba1..199694ab 100644
--- a/Data/Bases/dagger.lua
+++ b/Data/Bases/dagger.lua
@@ -49,18 +49,18 @@ itemBases["Imp Dagger"] = {
 	weapon = { PhysicalMin = 15, PhysicalMax = 59, critChanceBase = 6.5, attackRateBase = 1.2, },
 	req = { level = 32, dex = 36, int = 78, },
 }
-itemBases["Prong Dagger"] = {
-	type = "Dagger",
-	implicit = "4% Chance to Block",
-	weapon = { PhysicalMin = 14, PhysicalMax = 57, critChanceBase = 6.2, attackRateBase = 1.3, },
-	req = { level = 36, dex = 55, int = 77, },
-}
 itemBases["Flaying Knife"] = {
 	type = "Dagger",
 	implicit = "30% increased Global Critical Strike Chance",
 	weapon = { PhysicalMin = 16, PhysicalMax = 64, critChanceBase = 6, attackRateBase = 1.2, },
 	req = { level = 35, dex = 73, int = 51, },
 }
+itemBases["Prong Dagger"] = {
+	type = "Dagger",
+	implicit = "4% Chance to Block",
+	weapon = { PhysicalMin = 14, PhysicalMax = 57, critChanceBase = 6.2, attackRateBase = 1.3, },
+	req = { level = 36, dex = 55, int = 77, },
+}
 itemBases["Butcher Knife"] = {
 	type = "Dagger",
 	implicit = "30% increased Global Critical Strike Chance",
diff --git a/Data/Bases/staff.lua b/Data/Bases/staff.lua
index 84750cd4..e26c7967 100644
--- a/Data/Bases/staff.lua
+++ b/Data/Bases/staff.lua
@@ -4,132 +4,132 @@ local itemBases = ...
 itemBases["Gnarled Branch"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 8, PhysicalMax = 17, critChanceBase = 6.4, attackRateBase = 1.3, },
+	weapon = { PhysicalMin = 8, PhysicalMax = 17, critChanceBase = 6, attackRateBase = 1.3, },
 	req = { },
 }
 itemBases["Primitive Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 9, PhysicalMax = 28, critChanceBase = 6.8, attackRateBase = 1.25, },
+	weapon = { PhysicalMin = 9, PhysicalMax = 28, critChanceBase = 6.2, attackRateBase = 1.25, },
 	req = { level = 9, str = 20, int = 20, },
 }
 itemBases["Long Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 17, PhysicalMax = 28, critChanceBase = 6.4, attackRateBase = 1.3, },
+	weapon = { PhysicalMin = 17, PhysicalMax = 28, critChanceBase = 6, attackRateBase = 1.3, },
 	req = { level = 13, str = 27, int = 27, },
 }
 itemBases["Iron Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 16, PhysicalMax = 47, critChanceBase = 7, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 16, PhysicalMax = 47, critChanceBase = 6.4, attackRateBase = 1.2, },
 	req = { level = 18, str = 35, int = 35, },
 }
 itemBases["Coiled Staff"] = {
 	type = "Staff",
 	implicit = "20% Chance to Block",
-	weapon = { PhysicalMin = 23, PhysicalMax = 48, critChanceBase = 6.4, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 23, PhysicalMax = 48, critChanceBase = 6, attackRateBase = 1.2, },
 	req = { level = 23, str = 43, int = 43, },
 }
 itemBases["Royal Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 23, PhysicalMax = 70, critChanceBase = 7.2, attackRateBase = 1.15, },
+	weapon = { PhysicalMin = 23, PhysicalMax = 70, critChanceBase = 6.5, attackRateBase = 1.15, },
 	req = { level = 28, str = 51, int = 51, },
 }
 itemBases["Vile Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 33, PhysicalMax = 62, critChanceBase = 6.6, attackRateBase = 1.25, },
+	weapon = { PhysicalMin = 33, PhysicalMax = 62, critChanceBase = 6.1, attackRateBase = 1.25, },
 	req = { level = 33, str = 59, int = 59, },
 }
 itemBases["Crescent Staff"] = {
 	type = "Staff",
 	implicit = "60% increased Global Critical Strike Chance",
-	weapon = { PhysicalMin = 35, PhysicalMax = 73, critChanceBase = 6.4, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 35, PhysicalMax = 73, critChanceBase = 6, attackRateBase = 1.2, },
 	req = { level = 36, str = 66, int = 66, },
 }
 itemBases["Woodful Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 29, PhysicalMax = 88, critChanceBase = 6.8, attackRateBase = 1.15, },
+	weapon = { PhysicalMin = 29, PhysicalMax = 88, critChanceBase = 6.2, attackRateBase = 1.15, },
 	req = { level = 37, str = 65, int = 65, },
 }
 itemBases["Quarterstaff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 41, PhysicalMax = 68, critChanceBase = 6.4, attackRateBase = 1.3, },
+	weapon = { PhysicalMin = 41, PhysicalMax = 68, critChanceBase = 6, attackRateBase = 1.3, },
 	req = { level = 41, str = 72, int = 72, },
 }
 itemBases["Military Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 34, PhysicalMax = 101, critChanceBase = 7, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 34, PhysicalMax = 101, critChanceBase = 6.4, attackRateBase = 1.2, },
 	req = { level = 45, str = 78, int = 78, },
 }
 itemBases["Serpentine Staff"] = {
 	type = "Staff",
 	implicit = "20% Chance to Block",
-	weapon = { PhysicalMin = 46, PhysicalMax = 95, critChanceBase = 6.4, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 46, PhysicalMax = 95, critChanceBase = 6, attackRateBase = 1.2, },
 	req = { level = 49, str = 85, int = 85, },
 }
 itemBases["Highborn Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 42, PhysicalMax = 125, critChanceBase = 7.2, attackRateBase = 1.15, },
+	weapon = { PhysicalMin = 42, PhysicalMax = 125, critChanceBase = 6.5, attackRateBase = 1.15, },
 	req = { level = 52, str = 89, int = 89, },
 }
 itemBases["Foul Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 55, PhysicalMax = 103, critChanceBase = 6.6, attackRateBase = 1.25, },
+	weapon = { PhysicalMin = 55, PhysicalMax = 103, critChanceBase = 6.1, attackRateBase = 1.25, },
 	req = { level = 55, str = 94, int = 94, },
 }
 itemBases["Moon Staff"] = {
 	type = "Staff",
 	implicit = "60% increased Global Critical Strike Chance",
-	weapon = { PhysicalMin = 57, PhysicalMax = 118, critChanceBase = 6.4, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 57, PhysicalMax = 118, critChanceBase = 6, attackRateBase = 1.2, },
 	req = { level = 57, str = 101, int = 101, },
 }
 itemBases["Primordial Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 47, PhysicalMax = 141, critChanceBase = 6.8, attackRateBase = 1.15, },
+	weapon = { PhysicalMin = 47, PhysicalMax = 141, critChanceBase = 6.2, attackRateBase = 1.15, },
 	req = { level = 58, str = 99, int = 99, },
 }
 itemBases["Lathi"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 62, PhysicalMax = 103, critChanceBase = 6.4, attackRateBase = 1.3, },
+	weapon = { PhysicalMin = 62, PhysicalMax = 103, critChanceBase = 6, attackRateBase = 1.3, },
 	req = { level = 60, str = 113, int = 113, },
 }
 itemBases["Ezomyte Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 46, PhysicalMax = 138, critChanceBase = 7, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 46, PhysicalMax = 138, critChanceBase = 6.4, attackRateBase = 1.2, },
 	req = { level = 62, str = 113, int = 113, },
 }
 itemBases["Maelstrom Staff"] = {
 	type = "Staff",
 	implicit = "20% Chance to Block",
-	weapon = { PhysicalMin = 57, PhysicalMax = 119, critChanceBase = 6.4, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 57, PhysicalMax = 119, critChanceBase = 6, attackRateBase = 1.2, },
 	req = { level = 64, str = 113, int = 113, },
 }
 itemBases["Imperial Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 49, PhysicalMax = 147, critChanceBase = 7.2, attackRateBase = 1.15, },
+	weapon = { PhysicalMin = 49, PhysicalMax = 147, critChanceBase = 6.5, attackRateBase = 1.15, },
 	req = { level = 66, str = 113, int = 113, },
 }
 itemBases["Judgement Staff"] = {
 	type = "Staff",
 	implicit = "18% Chance to Block",
-	weapon = { PhysicalMin = 61, PhysicalMax = 113, critChanceBase = 6.6, attackRateBase = 1.25, },
+	weapon = { PhysicalMin = 61, PhysicalMax = 113, critChanceBase = 6.1, attackRateBase = 1.25, },
 	req = { level = 68, str = 113, int = 113, },
 }
 itemBases["Eclipse Staff"] = {
 	type = "Staff",
 	implicit = "80% increased Global Critical Strike Chance",
-	weapon = { PhysicalMin = 60, PhysicalMax = 125, critChanceBase = 6.4, attackRateBase = 1.2, },
+	weapon = { PhysicalMin = 60, PhysicalMax = 125, critChanceBase = 6, attackRateBase = 1.2, },
 	req = { level = 70, str = 117, int = 117, },
 }
diff --git a/Data/Bases/sword.lua b/Data/Bases/sword.lua
index d25b5fb5..39f78a8b 100644
--- a/Data/Bases/sword.lua
+++ b/Data/Bases/sword.lua
@@ -3,49 +3,49 @@ local itemBases = ...
 
 itemBases["Rusted Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 4, PhysicalMax = 10, critChanceBase = 5, attackRateBase = 1.45, },
 	req = { level = 1, str = 8, dex = 8, },
 }
 itemBases["Copper Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+45 to Accuracy Rating",
 	weapon = { PhysicalMin = 7, PhysicalMax = 15, critChanceBase = 5, attackRateBase = 1.4, },
 	req = { level = 5, str = 14, dex = 14, },
 }
 itemBases["Sabre"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 5, PhysicalMax = 22, critChanceBase = 5, attackRateBase = 1.55, },
 	req = { level = 10, str = 18, dex = 26, },
 }
 itemBases["Broad Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 17, PhysicalMax = 25, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 15, str = 30, dex = 30, },
 }
 itemBases["War Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 20, PhysicalMax = 37, critChanceBase = 5, attackRateBase = 1.2, },
 	req = { level = 20, str = 41, dex = 35, },
 }
 itemBases["Ancient Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+165 to Accuracy Rating",
 	weapon = { PhysicalMin = 20, PhysicalMax = 38, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 24, str = 44, dex = 44, },
 }
 itemBases["Elegant Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+190 to Accuracy Rating",
 	weapon = { PhysicalMin = 20, PhysicalMax = 33, critChanceBase = 5, attackRateBase = 1.5, },
 	req = { level = 28, str = 46, dex = 55, },
 }
 itemBases["Dusk Blade"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 19, PhysicalMax = 54, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 32, str = 57, dex = 57, },
 }
@@ -57,43 +57,43 @@ itemBases["Hook Sword"] = {
 }
 itemBases["Variscite Blade"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+240 to Accuracy Rating",
 	weapon = { PhysicalMin = 25, PhysicalMax = 53, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 35, str = 62, dex = 62, },
 }
 itemBases["Cutlass"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 13, PhysicalMax = 53, critChanceBase = 5, attackRateBase = 1.55, },
 	req = { level = 38, str = 55, dex = 79, },
 }
 itemBases["Baselard"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 37, PhysicalMax = 53, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 41, str = 72, dex = 72, },
 }
 itemBases["Battle Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 38, PhysicalMax = 70, critChanceBase = 5, attackRateBase = 1.2, },
 	req = { level = 44, str = 83, dex = 70, },
 }
 itemBases["Elder Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 36, PhysicalMax = 66, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 47, str = 81, dex = 81, },
 }
 itemBases["Graceful Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+350 to Accuracy Rating",
 	weapon = { PhysicalMin = 34, PhysicalMax = 55, critChanceBase = 5, attackRateBase = 1.5, },
 	req = { level = 50, str = 78, dex = 94, },
 }
 itemBases["Twilight Blade"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 30, PhysicalMax = 86, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 53, str = 91, dex = 91, },
 }
@@ -105,43 +105,43 @@ itemBases["Grappler"] = {
 }
 itemBases["Gemstone Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+400 to Accuracy Rating",
 	weapon = { PhysicalMin = 39, PhysicalMax = 83, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 56, str = 96, dex = 96, },
 }
 itemBases["Corsair Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 20, PhysicalMax = 80, critChanceBase = 5, attackRateBase = 1.55, },
 	req = { level = 58, str = 81, dex = 117, },
 }
 itemBases["Gladius"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 54, PhysicalMax = 78, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 60, str = 113, dex = 113, },
 }
 itemBases["Legion Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 53, PhysicalMax = 98, critChanceBase = 5, attackRateBase = 1.2, },
 	req = { level = 62, str = 122, dex = 104, },
 }
 itemBases["Vaal Blade"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+460 to Accuracy Rating",
 	weapon = { PhysicalMin = 48, PhysicalMax = 86, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 64, str = 113, dex = 113, },
 }
 itemBases["Eternal Sword"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+475 to Accuracy Rating",
 	weapon = { PhysicalMin = 41, PhysicalMax = 68, critChanceBase = 5, attackRateBase = 1.5, },
 	req = { level = 66, str = 104, dex = 122, },
 }
 itemBases["Midnight Blade"] = {
 	type = "One Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 35, PhysicalMax = 99, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 68, str = 113, dex = 113, },
 }
@@ -332,37 +332,37 @@ itemBases["Dragoon Sword"] = {
 
 itemBases["Corroded Blade"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 7, PhysicalMax = 13, critChanceBase = 5, attackRateBase = 1.45, },
 	req = { },
 }
 itemBases["Longsword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+60 to Accuracy Rating",
 	weapon = { PhysicalMin = 10, PhysicalMax = 24, critChanceBase = 5, attackRateBase = 1.35, },
 	req = { level = 8, str = 20, dex = 17, },
 }
 itemBases["Bastard Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 15, PhysicalMax = 25, critChanceBase = 5, attackRateBase = 1.45, },
 	req = { level = 12, str = 21, dex = 30, },
 }
 itemBases["Two-Handed Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+120 to Accuracy Rating",
 	weapon = { PhysicalMin = 19, PhysicalMax = 34, critChanceBase = 5, attackRateBase = 1.35, },
 	req = { level = 17, str = 33, dex = 33, },
 }
 itemBases["Etched Greatsword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 22, PhysicalMax = 46, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 22, str = 45, dex = 38, },
 }
 itemBases["Ornate Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+185 to Accuracy Rating",
 	weapon = { PhysicalMin = 26, PhysicalMax = 43, critChanceBase = 5, attackRateBase = 1.4, },
 	req = { level = 27, str = 45, dex = 54, },
 }
@@ -380,31 +380,31 @@ itemBases["Curved Blade"] = {
 }
 itemBases["Butcher Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+250 to Accuracy Rating",
 	weapon = { PhysicalMin = 29, PhysicalMax = 68, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 36, str = 69, dex = 58, },
 }
 itemBases["Footman Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 34, PhysicalMax = 56, critChanceBase = 5, attackRateBase = 1.45, },
 	req = { level = 40, str = 57, dex = 83, },
 }
 itemBases["Highland Blade"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+305 to Accuracy Rating",
 	weapon = { PhysicalMin = 39, PhysicalMax = 72, critChanceBase = 5, attackRateBase = 1.35, },
 	req = { level = 44, str = 77, dex = 77, },
 }
 itemBases["Engraved Greatsword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 42, PhysicalMax = 87, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 48, str = 91, dex = 76, },
 }
 itemBases["Tiger Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+360 to Accuracy Rating",
 	weapon = { PhysicalMin = 46, PhysicalMax = 76, critChanceBase = 5, attackRateBase = 1.4, },
 	req = { level = 51, str = 80, dex = 96, },
 }
@@ -422,31 +422,31 @@ itemBases["Lithe Blade"] = {
 }
 itemBases["Headman's Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+400 to Accuracy Rating",
 	weapon = { PhysicalMin = 47, PhysicalMax = 109, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 57, str = 106, dex = 89, },
 }
 itemBases["Reaver Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 52, PhysicalMax = 86, critChanceBase = 5, attackRateBase = 1.45, },
 	req = { level = 59, str = 82, dex = 119, },
 }
 itemBases["Ezomyte Blade"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+435 to Accuracy Rating",
 	weapon = { PhysicalMin = 55, PhysicalMax = 102, critChanceBase = 5, attackRateBase = 1.35, },
 	req = { level = 61, str = 113, dex = 113, },
 }
 itemBases["Vaal Greatsword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "40% increased Accuracy Rating",
 	weapon = { PhysicalMin = 55, PhysicalMax = 113, critChanceBase = 5, attackRateBase = 1.3, },
 	req = { level = 63, str = 122, dex = 104, },
 }
 itemBases["Lion Sword"] = {
 	type = "Two Handed Sword",
-	implicit = "18% increased Accuracy Rating",
+	implicit = "+470 to Accuracy Rating",
 	weapon = { PhysicalMin = 57, PhysicalMax = 94, critChanceBase = 5, attackRateBase = 1.4, },
 	req = { level = 65, str = 104, dex = 122, },
 }
diff --git a/Data/Rares.lua b/Data/Rares.lua
index 33a75b44..63569e9a 100644
--- a/Data/Rares.lua
+++ b/Data/Rares.lua
@@ -119,7 +119,7 @@ Suffixes:
 Prefixes:
 {range:.5}(0-179)% increased Physical Damage
 {range:.5}(0-79)% increased Physical Damage
-{range:.5}Adds (0-25) to (0-45) Physical Damage]],
+{range:.5}Adds (0-27) to (0-49) Physical Damage]],
 	["phys 2h pre"] = [[
 Prefixes:
 {range:.5}(0-179)% increased Physical Damage
@@ -910,28 +910,28 @@ Gemini Claw
 ]],[[
 Elemental Claw
 Imperial Claw
-+25 Life gained for each Enemy hit by Attacks
++46 Life gained for each Enemy hit by Attacks
 {elem 1h}
 ]],[[
 Physical Dagger
 Ambusher
-40% increased Global Critical Strike Chance
+30% increased Global Critical Strike Chance
 {phys 1h}
 ]],[[
 Elemental Dagger
 Ambusher
-40% increased Global Critical Strike Chance
+30% increased Global Critical Strike Chance
 {elem 1h}
 ]],[[
 Spell Dagger
 Platinum Kris
-80% increased Global Critical Strike Chance
+50% increased Global Critical Strike Chance
 {spell 1h}
 {range:.0}(0-27)% increased Attack Speed
 ]],[[
 Vagan Dagger
 Royal Skean
-40% increased Global Critical Strike Chance
+30% increased Global Critical Strike Chance
 Prefixes:
 Hits can't be Evaded
 {range:0}Adds (0-61) to (0-106) Fire Damage
@@ -994,7 +994,7 @@ Eclipse Staff
 ]],[[
 +3 Fire Staff
 Maelstrom Staff
-18% Chance to Block
+20% Chance to Block
 Prefixes:
 {range:1}+(0-1) to Level of Socketed Gems
 {range:1}+(0-2) to Level of Socketed Fire Gems
@@ -1006,7 +1006,7 @@ Prefixes:
 ]],[[
 +3 Cold Staff
 Maelstrom Staff
-18% Chance to Block
+20% Chance to Block
 Prefixes:
 {range:1}+(0-1) to Level of Socketed Gems
 {range:1}+(0-2) to Level of Socketed Cold Gems
@@ -1018,7 +1018,7 @@ Prefixes:
 ]],[[
 +3 Lightning Staff
 Maelstrom Staff
-18% Chance to Block
+20% Chance to Block
 Prefixes:
 {range:1}+(0-1) to Level of Socketed Gems
 {range:1}+(0-2) to Level of Socketed Lightning Gems
@@ -1030,7 +1030,7 @@ Prefixes:
 ]],[[
 +3 Chaos Staff
 Maelstrom Staff
-18% Chance to Block
+20% Chance to Block
 Prefixes:
 {range:1}+(0-1) to Level of Socketed Gems
 {range:1}+(0-2) to Level of Socketed Chaos Gems
@@ -1047,17 +1047,17 @@ Tiger Hook
 ]],[[
 Physical 1H Sword
 Jewelled Foil
-+30% to Global Critical Strike Multiplier
++25% to Global Critical Strike Multiplier
 {phys 1h}
 ]],[[
 Elemental 1H Sword
 Eternal Sword
-18% increased Accuracy Rating
++475 to Accuracy Rating
 {elem 1h}
 ]],[[
 Elemental 1H Sword
 Jewelled Foil
-+30% to Global Critical Strike Multiplier
++25% to Global Critical Strike Multiplier
 {elem 1h}
 ]],[[
 Physical 2H Sword
@@ -1067,7 +1067,7 @@ Exquisite Blade
 ]],[[
 Elemental 2H Sword
 Reaver Sword
-18% increased Accuracy Rating
+40% increased Accuracy Rating
 {elem 2h}
 ]],[[
 Physical Wand
diff --git a/Data/Uniques/claw.lua b/Data/Uniques/claw.lua
index 8194f54d..d12acc0f 100644
--- a/Data/Uniques/claw.lua
+++ b/Data/Uniques/claw.lua
@@ -5,8 +5,12 @@ return {
 [[
 Advancing Fortress
 Gut Ripper
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 46, 80 Dex, 80 Int
-+21 Life gained for each Enemy hit by Attacks
+Implicits: 2
+{variant:1}+21 Life gained for each Enemy hit by Attacks
+{variant:2}+44 Life gained for each Enemy hit by Attacks
 Socketed Gems are Supported by level 12 Fortify
 (100-120)% increased Physical Damage
 +110 to Evasion Rating
@@ -24,7 +28,7 @@ Requires Level 26, 39 Dex, 56 Int
 Implicits: 3
 {variant:1}+8 Life gained for each Enemy hit by Attacks
 {variant:2}2% of Physical Attack Damage Leeched as Life
-{variant:3}+19 Life gained for each enemy hit by Attacks
+{variant:3}+19 Life gained for each Enemy hit by Attacks
 {variant:1}(60-80)% increased Physical Damage
 {variant:2,3}(100-120)% increased Physical Damage
 3% of Physical Attack Damage Leeched as Life
@@ -101,9 +105,13 @@ Ghost Reaver
 ]],[[
 Hand of Thought and Motion
 Blinder
+Variant: Pre 2.6.0
+Variant: Current
 League: Breach
 Requires Level 22, 41 Dex, 41 Int
-+10 Life gained for each Enemy hit by Attacks
+Implicits: 2
+{variant:1}+10 Life gained for each Enemy hit by Attacks
+{variant:2}+12 Life gained for each Enemy hit by Attacks
 (20-25)% increased Elemental Damage with Weapons
 Adds 1 to (50-60) Lightning Damage
 (10-15)% increased Attack Speed
@@ -111,9 +119,13 @@ Adds 1-3 Lightning Damage to Attacks per 10 Intelligence
 ]],[[
 Hand of Wisdom and Action
 Imperial Claw
+Variant: Pre 2.6.0
+Variant: Current
 League: Breach
 Requires Level 68, 131 Dex, 95 Int
-+25 Life gained for each Enemy hit by Attacks
+Implicits: 2
+{variant:1}+25 Life gained for each Enemy hit by Attacks
+{variant:2}+46 Life gained for each Enemy hit by Attacks
 (25-30)% increased Elemental Damage with Weapons
 (8-12)% increased Dexterity
 (8-12)% increased Intelligence
@@ -122,8 +134,12 @@ Adds 1-6 Lightning Damage to Attacks per 10 Intelligence
 ]],[[
 Izaro's Dilemma
 Imperial Claw
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 68, 131 Dex, 95 Int
-+25 Life gained for each Enemy hit by Attacks
+Implicits: 2
+{variant:1}+25 Life gained for each Enemy hit by Attacks
+{variant:2}+46 Life gained for each Enemy hit by Attacks
 (40-60)% increased Physical Damage
 Adds 20 to 50 Physical Damage
 (10-15)% increased Attack Speed
@@ -147,7 +163,7 @@ Variant: Current
 Requires Level 34, 61 Dex, 61 Int
 Implicits: 2
 {variant:1,2}2% of Physical Attack Damage Leeched as Life
-{variant:3}+20 Life gained for each enemy hit by Attacks
+{variant:3}+20 Life gained for each Enemy hit by Attacks
 (75-100)% increased Physical Damage
 20% increased Attack Speed
 25% increased Critical Strike Chance
@@ -159,8 +175,12 @@ Poisonous Hit
 ]],[[
 Ornament of the East
 Gut Ripper
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 46, 80 Dex, 80 Int
-+21 Life gained for each Enemy hit by Attacks
+Implicits: 2
+{variant:1}+21 Life gained for each Enemy hit by Attacks
+{variant:2}+44 Life gained for each Enemy hit by Attacks
 (100-120)% increased Physical Damage
 (10-15)% increased Attack Speed
 25% increased Stun Recovery
@@ -191,8 +211,12 @@ Increases and reductions to Minion Damage also affects you
 ]],[[
 Touch of Anguish
 Imperial Claw
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 68, 131 Dex, 95 Int
-+25 Life gained for each Enemy hit by Attacks
+Implicits: 2
+{variant:1}+25 Life gained for each Enemy hit by Attacks
+{variant:2}+46 Life gained for each Enemy hit by Attacks
 Adds (40-50) to (130-150) Physical Damage
 30% increased Cold Damage
 (30-40)% increased Critical Strike Chance
@@ -203,8 +227,12 @@ Critical Strikes do not always Freeze
 ]],[[
 Wildslash
 Awl
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 12, 25 Dex, 25 Int
-+5 Life gained for each Enemy hit by Attacks
+Implicits: 2
+{variant:1}+5 Life gained for each Enemy hit by Attacks
+{variant:2}+7 Life gained for each Enemy hit by Attacks
 +(10-15) to Strength
 +(10-15) to Dexterity
 15% reduced Accuracy Rating
diff --git a/Data/Uniques/helmet.lua b/Data/Uniques/helmet.lua
index 0190786b..7334807c 100644
--- a/Data/Uniques/helmet.lua
+++ b/Data/Uniques/helmet.lua
@@ -228,13 +228,17 @@ Your Skills deal you 400% of Mana Cost as Physical Damage
 ]],[[
 Ylfeban's Trickery
 Hubris Circlet
+Variant: Pre 2.6.0
+Variant: Current
 League: Tempest
 Requires Level 69, 154 Int
+{variant:2}Cast Level 10 Shock Ground when Hit
 Adds 1 to (60-80) Lightning Damage to Spells and Attacks
 (130-170)% increased Energy Shield
 +(25-35)% to Lightning Resistance
-10% chance to Curse Enemies with a random Curse on Hit
-5% chance to create Shocked Ground when Hit
+{variant:1}10% chance to Curse Enemies with a random Curse on Hit
+{variant:2}20% chance to Curse non-Cursed Enemies with a random Curse on Hit
+{variant:1}5% chance to create Shocked Ground when Hit
 ]],
 -- Helmet: Armour/Evasion
 [[
diff --git a/Data/Uniques/sword.lua b/Data/Uniques/sword.lua
index 7ac1302d..b5d4c37b 100644
--- a/Data/Uniques/sword.lua
+++ b/Data/Uniques/sword.lua
@@ -9,7 +9,9 @@ Variant: Pre 2.0.0
 Variant: Pre 2.6.0
 Variant: Current
 Requires Level 66, 104 Str, 122 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1,2}18% increased Accuracy Rating
+{variant:3}+475 to Accuracy Rating
 {variant:1}Adds (15-30) to (35-50) Physical Damage
 {variant:2}Adds (20-40) to (55-70) Physical Damage
 {variant:3}Adds (30-50) to (65-80) Physical Damage
@@ -22,11 +24,14 @@ Requires Level 66, 104 Str, 122 Dex
 Ephemeral Edge
 Dusk Blade
 Variant: Pre 2.0.0
+Variant: Pre 2.6.0
 Variant: Current
 Requires Level 32, 57 Str, 57 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1,2}18% increased Accuracy Rating
+{variant:3}40% increased Accuracy Rating
 {variant:1}100% increased Physical Damage
-{variant:2}150% increased Physical Damage
+{variant:2,3}150% increased Physical Damage
 +10 to Intelligence
 50% increased Global Critical Strike Chance
 (0.6-1)% of Physical Attack Damage Leeched as Mana
@@ -36,14 +41,17 @@ Requires Level 32, 57 Str, 57 Dex
 The Goddess Scorned
 Elegant Sword
 Variant: Pre 2.2.0
+Variant: Pre 2.6.0
 Variant: Current
 Requires Level 28, 46 Str, 55 Dex
-18% Increased Accuracy Rating
+Implicits: 2
+{variant:1,2}18% Increased Accuracy Rating
+{variant:3}+190 to Accuracy Rating
 Uses both hand slots
 (250-300)% increased Physical Damage
 (90-110)% increased Critical Strike Chance
 {variant:1}+(15-20)% to Global Critical Strike Multiplier
-{variant:2}+(20-30)% to Global Critical Strike Multiplier
+{variant:2,3}+(20-30)% to Global Critical Strike Multiplier
 +(40-50)% to Fire Resistance
 Cannot be Ignited
 100% of Physical Damage Converted to Fire Damage
@@ -52,8 +60,12 @@ You can only deal Damage with this Weapon and Ignite
 ]],[[
 The Goddess Unleashed
 Eternal Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 51, 104 Str, 122 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+475 to Accuracy Rating
 Uses both hand slots
 Adds (3-6) to (33-66) Physical Damage
 (44-66)% increased Critical Strike Chance
@@ -68,14 +80,17 @@ Hyaon's Fury
 Legion Sword
 Variant: Pre 1.3.0
 Variant: Pre 2.0.0
+Variant: Pre 2.6.0
 Variant: Current
 Requires Level 62, 122 Str, 104 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1,2,3}18% increased Accuracy Rating
+{variant:4}40% increased Accuracy Rating
 {variant:1,2}Adds 1 to (500-600) Lightning Damage
-{variant:3}Adds 1 to (550-650) Lightning Damage
+{variant:3,4}Adds 1 to (550-650) Lightning Damage
 (7-10)% increased Attack Speed
 {variant:1}6% increased Damage taken per Frenzy Charge
-{variant:2,3}3% increased Damage taken per Frenzy Charge
+{variant:2,3,4}3% increased Damage taken per Frenzy Charge
 12% increased Lightning Damage per Frenzy Charge
 +20 Life gained on Kill per Frenzy Charge
 ]],[[
@@ -84,7 +99,9 @@ Corsair Sword
 Variant: Pre 2.6.0
 Variant: Current
 Requires Level 58, 81 Str, 117 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 Adds (5-10) to (13-20) Physical Damage
 {variant:1}(60-80)% increased Physical Damage
 {variant:2}(80-95)% increased Physical Damage
@@ -97,8 +114,12 @@ Your Aura Buffs do not affect allies
 ]],[[
 Innsbury Edge
 Elder Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 47, 81 Str, 81 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 (100-140)% increased Physical Damage
 (17-25)% increased Attack Speed
 0.2% of Chaos Damage Leeched as Life
@@ -107,8 +128,12 @@ Attacks with this Weapon Maim on hit
 ]],[[
 Lakishu's Blade
 Elegant Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 28, 46 Str, 55 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+190 to Accuracy Rating
 (60-80)% increased Physical Damage
 Adds (5-8) to (10-14) Physical Damage
 (10-15)% increased Attack Speed
@@ -121,7 +146,9 @@ Sabre
 Variant: Pre 2.6.0
 Variant: Current
 Requires Level 10, 18 Str, 26 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 (20-50)% increased Physical Damage
 Adds (3-4) to (5-8) Physical Damage
 15% increased Attack Speed
@@ -133,11 +160,14 @@ Adds (3-4) to (5-8) Physical Damage
 Prismatic Eclipse
 Twilight Blade
 Variant: Pre 1.3.0
+Variant: Pre 2.6.0
 Variant: Current
 Requires Level 53, 91 Str, 91 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1,2}18% increased Accuracy Rating
+{variant:3}40% increased Accuracy Rating
 {variant:1}10% additional Chance to Block while Dual Wielding
-{variant:2}8% additional Chance to Block while Dual Wielding
+{variant:2,3}8% additional Chance to Block while Dual Wielding
 Adds (20-30) to (31-40) Physical Damage
 25% increased Physical Damage with Weapons per Red Socket
 12% increased Global Attack Speed per Green Socket
@@ -146,8 +176,12 @@ Adds (20-30) to (31-40) Physical Damage
 ]],[[
 Razor of the Seventh Sun 
 Midnight Blade
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 68, 113 Str, 113 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 Adds (65-75) to (110-130) Physical Damage
 100% increased Burning Damage if you've Ignited an Enemy Recently
 Recovery 1% of Maximum Life when you Ignite an Enemy
@@ -155,8 +189,12 @@ Recovery 1% of Maximum Life when you Ignite an Enemy
 ]],[[
 Rebuke of the Vaal
 Vaal Blade
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 64, 113 Str, 113 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+460 to Accuracy Rating
 Adds (19-28) to (31-40) Physical Damage
 Adds (19-28) to (31-40) Fire Damage
 Adds (19-28) to (31-40) Cold Damage
@@ -166,7 +204,11 @@ Adds (19-28) to (31-40) Chaos Damage
 ]],[[
 Redbeak
 Rusted Sword
-18% increased Accuracy Rating
+Variant: Pre 2.6.0
+Variant: Current
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 100% increased Damage when on Low Life
 50% increased Physical Damage
 Adds 2 to 6 Physical Damage
@@ -176,9 +218,13 @@ Adds 2 to 6 Physical Damage
 ]],[[
 Rigwald's Command
 Midnight Blade
+Variant: Pre 2.6.0
+Variant: Current
 League: Talisman Standard, Talisman Hardcore
 Requires Level 68, 113 Str, 113 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 10% additional Block Chance while Dual Wielding
 Adds (60-80) to (150-180) Physical Damage
 80% increased Physical Damage with Axes
@@ -187,8 +233,12 @@ Adds (60-80) to (150-180) Physical Damage
 ]],[[
 Scaeva
 Gladius
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 60, 113 Str, 113 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 Adds (75-92) to (125-154) Physical Damage
 (15-25)% increased Critical Strike Chance
 0.3% of Physical Attack Damage Leeched as Life per Red Socket
@@ -200,9 +250,13 @@ Adds (75-92) to (125-154) Physical Damage
 ]],[[
 Severed in Sleep
 Cutlass
+Variant: Pre 2.6.0
+Variant: Current
 League: Breach
 Requires Level 38, 55 Str, 79 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 +(10-20) to all Attributes
 Minions deal (20-30)% increased Damage
 Minions have +17% to Chaos Resistance
@@ -211,9 +265,13 @@ Minions Recover 20% of Maximum Life on Killing a Poisoned Enemy
 ]],[[
 United in Dream
 Cutlass
+Variant: Pre 2.6.0
+Variant: Current
 League: Breach
 Requires Level 69, 55 Str, 79 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 Grants level 15 Envy Skill
 Minions deal (30-40)% increased Damage
 Minions have +29% to Chaos Resistance
@@ -222,8 +280,12 @@ Minions Leech 5% of Damage as Life against Poisoned Enemies
 ]],[[
 The Tempestuous Steel
 War Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 20, 41 Str, 35 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 Adds (5-8) to (15-20) Physical Damage
 (8-14)% increased Attack Speed
 Hits can't be Evaded
@@ -233,9 +295,13 @@ Attacks with this Weapon Penetrate 30% Elemental Resistances
 ]],[[
 Varunastra
 Vaal Blade
+Variant: Pre 2.6.0
+Variant: Current
 League: Perandus
 Requires Level 64, 113 Str, 113 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+460 to Accuracy Rating
 (40-60)% increased Physical Damage
 Adds (30-45) to (80-100) Physical Damage
 +(2-3) Mana gained for each Enemy hit by Attacks
@@ -361,8 +427,12 @@ Adds 3 to 7 Fire Damage
 [[
 The Dancing Dervish
 Reaver Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 59, 82 Str, 119 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 (160-190)% increased Physical Damage
 (25-30)% increased Attack Speed
 5% increased Movement Speed
@@ -373,8 +443,12 @@ Manifest Dancing Dervish dies when Rampage ends
 ]],[[
 Doomsower
 Lion Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 65, 104 Str, 122 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+470 to Accuracy Rating
 Socketed Melee Gems have 15% increased Area of Effect
 Socketed Red Gems get 10% Physical Damage as Extra Fire Damage
 (50-70)% increased Physical Damage
@@ -387,7 +461,9 @@ Variant: Pre 2.6.0
 Variant: Current
 League: Beyond
 Requires Level 22, 45 Str, 38 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 +1 to Level of Active Socketed Skill Gems
 (60-80)% increased Physical Damage
 Adds (60-65) to (90-105) Chaos Damage
@@ -398,8 +474,12 @@ Adds (60-65) to (90-105) Chaos Damage
 ]],[[
 Hiltless
 Reaver Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 59, 82 Str, 119 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 Socketed Gems are Supported by level 1 Blood Magic
 Adds (90-115) to (230-260) Physical Damage
 (40-50)% increased Critical Strike Chance
@@ -408,8 +488,12 @@ Enemies you Attack Reflect 100 Physical Damage to you
 ]],[[
 Kondo's Pride 
 Ezomyte Blade
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 61, 113 Str, 113 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+435 to Accuracy Rating
 (270-320)% increased Physical Damage
 0.6% of Physical Attack Damage Leeched as Life
 50% increased Melee Damage against Bleeding Enemies
@@ -436,8 +520,12 @@ Gain a Frenzy Charge if an Attack Ignites an Enemy
 ]],[[
 Queen's Decree
 Ornate Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 27, 56 Str, 54 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+185 to Accuracy Rating
 Minions have (10-15)% increased maximum Life
 (150-200)% increased Skeleton Duration
 Minions deal (10-15)% increased Damage
@@ -448,8 +536,12 @@ Minions deal (10-15)% increased Damage
 ]],[[
 Queen's Escape
 Ornate Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 38, 56 Str, 54 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+185 to Accuracy Rating
 Minions have (10-15)% increased maximum Life
 Minions have (80-100)% increased Movement Speed
 (150-200)% increased Skeleton Duration
@@ -461,8 +553,12 @@ Minions deal (10-15)% increased Damage
 ]],[[
 Rigwald's Charge
 Highland Blade
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 44, 77 Str, 77 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+305 to Accuracy Rating
 (120-150)% increased Physical Damage
 20% increased Attack Speed
 +(150-200) to Accuracy Rating
@@ -470,8 +566,12 @@ Requires Level 44, 77 Str, 77 Dex
 ]],[[
 Shiversting
 Bastard Sword
+Variant: Pre 2.6.0
+Variant: Current
 Requires Level 14, 21 Str, 30 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}40% increased Accuracy Rating
 (80-100)% increased Physical Damage
 Adds 35 to 70 Cold Damage
 0.6% of Physical Attack Damage Leeched as Mana
@@ -493,7 +593,9 @@ Tiger Sword
 Variant: Pre 2.6.0
 Variant: Current
 Requires Level 51, 80 Str, 96 Dex
-18% increased Accuracy Rating
+Implicits: 2
+{variant:1}18% increased Accuracy Rating
+{variant:2}+360 to Accuracy Rating
 {variant:1}(120-180)% increased Physical Damage
 {variant:2}(220-260)% increased Physical Damage
 {variant:2}(50-75)% increased Critical Strike Chance
diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua
index 5506fc67..29d52ce5 100644
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -3,7 +3,7 @@
 -- Module: Calcs
 -- Performs all the offense and defense calculations.
 -- Here be dragons!
--- This file is 3100 lines long, over half of which is in one function...
+-- This file is 3300 lines long, over half of which is in one function...
 --
 
 local pairs = pairs
diff --git a/Modules/ModParser.lua b/Modules/ModParser.lua
index 04d2600c..5f17320f 100644
--- a/Modules/ModParser.lua
+++ b/Modules/ModParser.lua
@@ -640,6 +640,7 @@ local specialModList = {
 	["grants level (%d+) (.+)"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
 	["casts level (%d+) (.+) when equipped"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
 	["cast level (%d+) (.+) when you deal a critical strike"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
+	["cast level (%d+) (.+) when hit"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
 	["%d+%% chance to attack with level (%d+) (.+) on melee hit"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
 	["%d+%% chance to cast level (%d+) (.+) on hit"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
 	["attack with level (%d+) (.+) when you kill a bleeding enemy"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
diff --git a/README.md b/README.md
index a8ae6abf..30264dce 100644
--- a/README.md
+++ b/README.md
@@ -50,10 +50,11 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases)
 ### 1.3.18 - 2017/03/05
  * Added support for threshold jewels:
     * Most of the relevant modifiers from threshold jewels should now be supported
-	* The tooltip for jewel sockets now indicates which types of threshold jewels will work there
+	* The tooltips for jewel sockets now indicate which types of threshold jewels will work there
  * Added and updated many new uniques (shoutout to chuanhsing for the list on PoEDB)
  * Applied the remaining balance changes to unique items (including threshold jewels)
- * Updated all item bases (thanks Patrick)
+ * Updated all item bases (thanks Patrick for doing most of the work)
+    * Claw and Sword uniques and templates have been updated to account for the new implicits
  * Corrected the conversion on Wild Strike
 
 ### 1.3.17 - 2017/03/04