diff --git a/data-otservbr-global/npc/alaistar.lua b/data-otservbr-global/npc/alaistar.lua
index e893975b24b..68aaa75679a 100644
--- a/data-otservbr-global/npc/alaistar.lua
+++ b/data-otservbr-global/npc/alaistar.lua
@@ -36,13 +36,14 @@ local itemsTable = {
 		{ itemName = "strong health potion", clientId = 236, buy = 115 },
 		{ itemName = "strong mana potion", clientId = 237, buy = 93 },
 		{ itemName = "supreme health potion", clientId = 23375, buy = 625 },
-		{ itemName = "ultimate health potion", clientId = 7643, buy = 438 },
-		{ itemName = "ultimate mana potion", clientId = 23373, buy = 379 },
+		{ itemName = "ultimate health potion", clientId = 7643, buy = 379 },
+		{ itemName = "ultimate mana potion", clientId = 23373, buy = 438 },
 		{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
 		{ itemName = "vial", clientId = 2874, sell = 5 },
 	},
 	["creature products"] = {
 		{ itemName = "cowbell", clientId = 21204, sell = 210 },
+		{ itemName = "execowtioner mask", clientId = 21201, sell = 240 },
 		{ itemName = "giant pacifier", clientId = 21199, sell = 170 },
 		{ itemName = "glob of glooth", clientId = 21182, sell = 125 },
 		{ itemName = "glooth injection tube", clientId = 21103, sell = 350 },
diff --git a/data-otservbr-global/npc/alexander.lua b/data-otservbr-global/npc/alexander.lua
index 78f51e486c8..fda2799bf4d 100644
--- a/data-otservbr-global/npc/alexander.lua
+++ b/data-otservbr-global/npc/alexander.lua
@@ -30,6 +30,28 @@ npcConfig.voices = {
 }
 
 local itemsTable = {
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["creature products"] = {
+		{ itemName = "crystal ball", clientId = 3076, buy = 530, sell = 190 },
+		{ itemName = "life crystal", clientId = 3061, sell = 83 },
+		{ itemName = "mind stone", clientId = 3062, sell = 170 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook of enlightenment", clientId = 8072, sell = 4000 },
+		{ itemName = "spellbook of warding", clientId = 8073, sell = 8000 },
+		{ itemName = "spellbook of mind control", clientId = 8074, sell = 13000 },
+		{ itemName = "spellbook of lost souls", clientId = 8075, sell = 19000 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
 	["runes"] = {
 		{ itemName = "animate dead rune", clientId = 3203, buy = 375 },
 		{ itemName = "blank rune", clientId = 3147, buy = 10 },
diff --git a/data-otservbr-global/npc/asima.lua b/data-otservbr-global/npc/asima.lua
index 645689c42d4..c3aca3fcd5e 100644
--- a/data-otservbr-global/npc/asima.lua
+++ b/data-otservbr-global/npc/asima.lua
@@ -24,6 +24,14 @@ npcConfig.flags = {
 }
 
 local itemsTable = {
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
 	["potions"] = {
 		{ itemName = "empty potion flask", clientId = 283, sell = 5 },
 		{ itemName = "empty potion flask", clientId = 284, sell = 5 },
@@ -41,6 +49,12 @@ local itemsTable = {
 		{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
 		{ itemName = "vial", clientId = 2874, sell = 5 },
 	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 	["runes"] = {
 		{ itemName = "avalanche rune", clientId = 3161, buy = 57 },
 		{ itemName = "blank rune", clientId = 3147, buy = 10 },
@@ -61,8 +75,27 @@ local itemsTable = {
 		{ itemName = "poison field rune", clientId = 3172, buy = 21 },
 		{ itemName = "poison wall rune", clientId = 3176, buy = 52 },
 		{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
+		{ itemName = "stalagmite rune", clientId = 3179, buy = 12 },
 		{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
 	},
+	["wands"] = {
+		{ itemName = "hailstorm rod", clientId = 3067, buy = 15000 },
+		{ itemName = "moonlight rod", clientId = 3070, buy = 1000 },
+		{ itemName = "necrotic rod", clientId = 3069, buy = 5000 },
+		{ itemName = "northwind rod", clientId = 8083, buy = 7500 },
+		{ itemName = "snakebite rod", clientId = 3066, buy = 500 },
+		{ itemName = "springsprout rod", clientId = 8084, buy = 18000 },
+		{ itemName = "terra rod", clientId = 3065, buy = 10000 },
+		{ itemName = "underworld rod", clientId = 8082, buy = 22000 },
+		{ itemName = "wand of cosmic energy", clientId = 3073, buy = 10000 },
+		{ itemName = "wand of decay", clientId = 3072, buy = 5000 },
+		{ itemName = "wand of draconia", clientId = 8093, buy = 7500 },
+		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
+		{ itemName = "wand of inferno", clientId = 3071, buy = 15000 },
+		{ itemName = "wand of starstorm", clientId = 8092, buy = 18000 },
+		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
+		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/briasol.lua b/data-otservbr-global/npc/briasol.lua
index 6905011fee9..38dcd074159 100644
--- a/data-otservbr-global/npc/briasol.lua
+++ b/data-otservbr-global/npc/briasol.lua
@@ -113,7 +113,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/chantalle.lua b/data-otservbr-global/npc/chantalle.lua
index 2615f6557da..3ed42984f5c 100644
--- a/data-otservbr-global/npc/chantalle.lua
+++ b/data-otservbr-global/npc/chantalle.lua
@@ -99,7 +99,7 @@ npcConfig.shop = {
 	{ itemName = "diamond", clientId = 32770, sell = 15000 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/chuckles.lua b/data-otservbr-global/npc/chuckles.lua
index 51fb3f2add6..4eb06b6bb3d 100644
--- a/data-otservbr-global/npc/chuckles.lua
+++ b/data-otservbr-global/npc/chuckles.lua
@@ -59,6 +59,38 @@ local itemsTable = {
 		{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
 		{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
 	},
+	["wands"] = {
+		{ itemName = "hailstorm rod", clientId = 3067, buy = 15000 },
+		{ itemName = "moonlight rod", clientId = 3070, buy = 1000 },
+		{ itemName = "necrotic rod", clientId = 3069, buy = 5000 },
+		{ itemName = "northwind rod", clientId = 8083, buy = 7500 },
+		{ itemName = "snakebite rod", clientId = 3066, buy = 500 },
+		{ itemName = "springsprout rod", clientId = 8084, buy = 18000 },
+		{ itemName = "terra rod", clientId = 3065, buy = 10000 },
+		{ itemName = "underworld rod", clientId = 8082, buy = 22000 },
+		{ itemName = "wand of cosmic energy", clientId = 3073, buy = 10000 },
+		{ itemName = "wand of decay", clientId = 3072, buy = 5000 },
+		{ itemName = "wand of draconia", clientId = 8093, buy = 7500 },
+		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
+		{ itemName = "wand of inferno", clientId = 3071, buy = 15000 },
+		{ itemName = "wand of starstorm", clientId = 8092, buy = 18000 },
+		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
+		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
+	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/edmund.lua b/data-otservbr-global/npc/edmund.lua
index d8635297949..c61a95bcd72 100644
--- a/data-otservbr-global/npc/edmund.lua
+++ b/data-otservbr-global/npc/edmund.lua
@@ -68,7 +68,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/fenech.lua b/data-otservbr-global/npc/fenech.lua
index 7152c0ef9c5..f69dcafaa89 100644
--- a/data-otservbr-global/npc/fenech.lua
+++ b/data-otservbr-global/npc/fenech.lua
@@ -71,6 +71,20 @@ local itemsTable = {
 		{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
 		{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/frans.lua b/data-otservbr-global/npc/frans.lua
index 8761a7d89d6..a1b695adf14 100644
--- a/data-otservbr-global/npc/frans.lua
+++ b/data-otservbr-global/npc/frans.lua
@@ -58,6 +58,20 @@ local itemsTable = {
 		{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
 		{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/frederik.lua b/data-otservbr-global/npc/frederik.lua
index 9b33ccf9684..81ff1ec58b6 100644
--- a/data-otservbr-global/npc/frederik.lua
+++ b/data-otservbr-global/npc/frederik.lua
@@ -82,6 +82,20 @@ local itemsTable = {
 		{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
 		{ itemName = "vial", clientId = 2874, sell = 5 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/gail.lua b/data-otservbr-global/npc/gail.lua
index 80a9b54b3e5..de2a52dc7f4 100644
--- a/data-otservbr-global/npc/gail.lua
+++ b/data-otservbr-global/npc/gail.lua
@@ -109,7 +109,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/gnomegica.lua b/data-otservbr-global/npc/gnomegica.lua
index 0805ca33ace..b860caf3962 100644
--- a/data-otservbr-global/npc/gnomegica.lua
+++ b/data-otservbr-global/npc/gnomegica.lua
@@ -78,6 +78,20 @@ local itemsTable = {
 		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/hanna.lua b/data-otservbr-global/npc/hanna.lua
index 7fca4c908aa..dfea1547135 100644
--- a/data-otservbr-global/npc/hanna.lua
+++ b/data-otservbr-global/npc/hanna.lua
@@ -145,7 +145,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/ishina.lua b/data-otservbr-global/npc/ishina.lua
index 1fd61200c15..358ee2619a3 100644
--- a/data-otservbr-global/npc/ishina.lua
+++ b/data-otservbr-global/npc/ishina.lua
@@ -139,7 +139,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/iwan.lua b/data-otservbr-global/npc/iwan.lua
index 2cc24843318..77689b12003 100644
--- a/data-otservbr-global/npc/iwan.lua
+++ b/data-otservbr-global/npc/iwan.lua
@@ -78,7 +78,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/jessica.lua b/data-otservbr-global/npc/jessica.lua
index 37ac18ed54a..43b1839b3ee 100644
--- a/data-otservbr-global/npc/jessica.lua
+++ b/data-otservbr-global/npc/jessica.lua
@@ -98,7 +98,7 @@ npcConfig.shop = {
 	{ itemName = "diamond", clientId = 32770, sell = 15000 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/khanna.lua b/data-otservbr-global/npc/khanna.lua
index 02fcee7b6d5..76b5c1e70da 100644
--- a/data-otservbr-global/npc/khanna.lua
+++ b/data-otservbr-global/npc/khanna.lua
@@ -34,7 +34,7 @@ local itemsTable = {
 	["runes"] = {
 		{ itemName = "animate dead rune", clientId = 3203, buy = 375 },
 		{ itemName = "avalanche rune", clientId = 3161, buy = 57 },
-		{ itemName = "blank rune", clientId = 3147, buy = 10 },
+		{ itemName = "blank rune", clientId = 3147, buy = 20 },
 		{ itemName = "chameleon rune", clientId = 3178, buy = 210 },
 		{ itemName = "convince creature rune", clientId = 3177, buy = 80 },
 		{ itemName = "cure poison rune", clientId = 3153, buy = 65 },
@@ -84,6 +84,46 @@ local itemsTable = {
 		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["creature products"] = {
+		{ itemName = "bashmu fang", clientId = 36820, sell = 600 },
+		{ itemName = "bashmu feather", clientId = 36820, sell = 350 },
+		{ itemName = "bashmu tongue", clientId = 36820, sell = 400 },
+		{ itemName = "blue goanna scale", clientId = 31559, sell = 230 },
+		{ itemName = "crystal ball", clientId = 3076, buy = 650 },
+		{ itemName = "fafnar symbol", clientId = 31443, sell = 950 },
+		{ itemName = "goanna claw", clientId = 31561, sell = 950 },
+		{ itemName = "goanna meat", clientId = 31560, sell = 190 },
+		{ itemName = "lamassu hoof", clientId = 31441, sell = 330 },
+		{ itemName = "lamassu horn", clientId = 31442, sell = 240 },
+		{ itemName = "life crystal", clientId = 3061, sell = 85 },
+		{ itemName = "lizard heart", clientId = 31340, sell = 530 },
+		{ itemName = "manticore ear", clientId = 31440, sell = 310 },
+		{ itemName = "manticore tail", clientId = 31439, sell = 220 },
+		{ itemName = "mind stone", clientId = 3062, sell = 170 },
+		{ itemName = "old girtablilu carapace", clientId = 36972, sell = 570 },
+		{ itemName = "red goanna scale", clientId = 31558, sell = 270 },
+		{ itemName = "scorpion charm", clientId = 36822, sell = 620 },
+		{ itemName = "sphinx feather", clientId = 31437, sell = 470 },
+		{ itemName = "sphinx tiara", clientId = 31438, sell = 360 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+		{ itemName = "spellbook of enlightenment", clientId = 8072, sell = 4000 },
+		{ itemName = "spellbook of lost souls", clientId = 8075, sell = 19000 },
+		{ itemName = "spellbook of mind control", clientId = 8074, sell = 13000 },
+		{ itemName = "spellbook of warding", clientId = 8073, sell = 8000 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/mordecai.lua b/data-otservbr-global/npc/mordecai.lua
index 60063a423ba..dc0e3c07a77 100644
--- a/data-otservbr-global/npc/mordecai.lua
+++ b/data-otservbr-global/npc/mordecai.lua
@@ -88,6 +88,17 @@ local itemsTable = {
 		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/nelly.lua b/data-otservbr-global/npc/nelly.lua
index 8c3b123c47a..911464524c6 100644
--- a/data-otservbr-global/npc/nelly.lua
+++ b/data-otservbr-global/npc/nelly.lua
@@ -94,6 +94,20 @@ local itemsTable = {
 		{ itemName = "letter", clientId = 3505, buy = 8 },
 		{ itemName = "parcel", clientId = 3503, buy = 15 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/nipuna.lua b/data-otservbr-global/npc/nipuna.lua
index aa9d74cec52..ef3211bce42 100644
--- a/data-otservbr-global/npc/nipuna.lua
+++ b/data-otservbr-global/npc/nipuna.lua
@@ -101,6 +101,17 @@ local itemsTable = {
 		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/odemara.lua b/data-otservbr-global/npc/odemara.lua
index bcfe94bf8eb..3e1986714c7 100644
--- a/data-otservbr-global/npc/odemara.lua
+++ b/data-otservbr-global/npc/odemara.lua
@@ -70,7 +70,7 @@ npcConfig.shop = {
 	{ itemName = "diamond", clientId = 32770, sell = 15000 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/oiriz.lua b/data-otservbr-global/npc/oiriz.lua
index 3a5d3a6b411..4b731c015a2 100644
--- a/data-otservbr-global/npc/oiriz.lua
+++ b/data-otservbr-global/npc/oiriz.lua
@@ -68,7 +68,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/rabaz.lua b/data-otservbr-global/npc/rabaz.lua
index 3e47da6a5ca..e532e7def66 100644
--- a/data-otservbr-global/npc/rabaz.lua
+++ b/data-otservbr-global/npc/rabaz.lua
@@ -82,6 +82,20 @@ local itemsTable = {
 		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/rachel.lua b/data-otservbr-global/npc/rachel.lua
index 3206c99864a..057787692c9 100644
--- a/data-otservbr-global/npc/rachel.lua
+++ b/data-otservbr-global/npc/rachel.lua
@@ -71,6 +71,23 @@ local itemsTable = {
 		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["valuables"] = {
+		{ itemName = "talon", clientId = 3034, sell = 320 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/romir.lua b/data-otservbr-global/npc/romir.lua
index 11ea038d266..09ab62ab1a4 100644
--- a/data-otservbr-global/npc/romir.lua
+++ b/data-otservbr-global/npc/romir.lua
@@ -82,6 +82,20 @@ local itemsTable = {
 		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/shiriel.lua b/data-otservbr-global/npc/shiriel.lua
index 546bb26447b..fd982f345b9 100644
--- a/data-otservbr-global/npc/shiriel.lua
+++ b/data-otservbr-global/npc/shiriel.lua
@@ -70,6 +70,20 @@ local itemsTable = {
 		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/sigurd.lua b/data-otservbr-global/npc/sigurd.lua
index cca63a33e3e..e4d1b585307 100644
--- a/data-otservbr-global/npc/sigurd.lua
+++ b/data-otservbr-global/npc/sigurd.lua
@@ -72,6 +72,20 @@ local itemsTable = {
 		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/sundara.lua b/data-otservbr-global/npc/sundara.lua
index c1364240fa9..95ff206f2ad 100644
--- a/data-otservbr-global/npc/sundara.lua
+++ b/data-otservbr-global/npc/sundara.lua
@@ -101,6 +101,17 @@ local itemsTable = {
 		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/tandros.lua b/data-otservbr-global/npc/tandros.lua
index e25ba65f2a3..ae647b26127 100644
--- a/data-otservbr-global/npc/tandros.lua
+++ b/data-otservbr-global/npc/tandros.lua
@@ -88,6 +88,20 @@ local itemsTable = {
 		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/tesha.lua b/data-otservbr-global/npc/tesha.lua
index 95e31f97cb7..6a3c4b9fadb 100644
--- a/data-otservbr-global/npc/tesha.lua
+++ b/data-otservbr-global/npc/tesha.lua
@@ -98,7 +98,7 @@ npcConfig.shop = {
 	{ itemName = "diamond", clientId = 32770, sell = 15000 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/tezila.lua b/data-otservbr-global/npc/tezila.lua
index dab92c807f5..fe667133ad7 100644
--- a/data-otservbr-global/npc/tezila.lua
+++ b/data-otservbr-global/npc/tezila.lua
@@ -67,7 +67,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/topsy.lua b/data-otservbr-global/npc/topsy.lua
index 395fd23cbeb..66ea6f27e6a 100644
--- a/data-otservbr-global/npc/topsy.lua
+++ b/data-otservbr-global/npc/topsy.lua
@@ -78,6 +78,20 @@ local itemsTable = {
 		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/valindara.lua b/data-otservbr-global/npc/valindara.lua
index 69655358dfe..cf9506fcdd5 100644
--- a/data-otservbr-global/npc/valindara.lua
+++ b/data-otservbr-global/npc/valindara.lua
@@ -111,7 +111,7 @@ npcConfig.shop = {
 	{ itemName = "fire wall rune", clientId = 3190, buy = 61 },
 	{ itemName = "fireball rune", clientId = 3189, buy = 30 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/npc/xodet.lua b/data-otservbr-global/npc/xodet.lua
index 2d8832bd964..f687b491e89 100644
--- a/data-otservbr-global/npc/xodet.lua
+++ b/data-otservbr-global/npc/xodet.lua
@@ -72,6 +72,20 @@ local itemsTable = {
 		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}
diff --git a/data-otservbr-global/npc/yasir.lua b/data-otservbr-global/npc/yasir.lua
index d576b611e53..9c5cf3dbf69 100644
--- a/data-otservbr-global/npc/yasir.lua
+++ b/data-otservbr-global/npc/yasir.lua
@@ -60,6 +60,7 @@ npcConfig.shop = {
 	{ itemName = "ape fur", clientId = 5883, sell = 120 },
 	{ itemName = "apron", clientId = 33933, sell = 1300 },
 	{ itemName = "badger fur", clientId = 903, sell = 15 },
+	{ itemName = "bakragore's amalgamation", clientId = 43968, sell = 2000000 },
 	{ itemName = "bamboo stick", clientId = 11445, sell = 30 },
 	{ itemName = "banana sash", clientId = 11511, sell = 55 },
 	{ itemName = "basalt fetish", clientId = 17856, sell = 210 },
@@ -75,6 +76,7 @@ npcConfig.shop = {
 	{ itemName = "black hood", clientId = 9645, sell = 190 },
 	{ itemName = "black wool", clientId = 11448, sell = 300 },
 	{ itemName = "blazing bone", clientId = 16131, sell = 610 },
+	{ itemName = "bloated maggot", clientId = 43856, sell = 5200 },
 	{ itemName = "blood preservation", clientId = 11449, sell = 320 },
 	{ itemName = "blood tincture in a vial", clientId = 18928, sell = 360 },
 	{ itemName = "bloody dwarven beard", clientId = 17827, sell = 110 },
@@ -173,7 +175,11 @@ npcConfig.shop = {
 	{ itemName = "dandelion seeds", clientId = 25695, sell = 200 },
 	{ itemName = "dangerous proto matter", clientId = 23515, sell = 300 },
 	{ itemName = "dark bell", clientId = 32596, sell = 310000 },
+	{ itemName = "dark obsidian splinter", clientId = 43850, sell = 4400 },
 	{ itemName = "dark rosary", clientId = 10303, sell = 48 },
+	{ itemName = "darklight core", clientId = 43853, sell = 4100 },
+	{ itemName = "darklight figurine", clientId = 43961, sell = 3400000 },
+	{ itemName = "darklight matter", clientId = 43851, sell = 5500 },
 	{ itemName = "dead weight", clientId = 20202, sell = 450 },
 	{ itemName = "deepling breaktime snack", clientId = 14011, sell = 90 },
 	{ itemName = "deepling claw", clientId = 14044, sell = 430 },
@@ -229,6 +235,7 @@ npcConfig.shop = {
 	{ itemName = "falcon crest", clientId = 28823, sell = 650 },
 	{ itemName = "fern", clientId = 3737, sell = 20 },
 	{ itemName = "fiery heart", clientId = 9636, sell = 375 },
+	{ itemName = "fiery tear", clientId = 39040, sell = 1070000 },
 	{ itemName = "fig leaf", clientId = 25742, sell = 200 },
 	{ itemName = "figurine of cruelty", clientId = 34019, sell = 3100000 },
 	{ itemName = "figurine of greed", clientId = 34021, sell = 2900000 },
@@ -480,6 +487,8 @@ npcConfig.shop = {
 	{ itemName = "rorc feather", clientId = 18993, sell = 70 },
 	{ itemName = "rotten heart", clientId = 31589, sell = 74000 },
 	{ itemName = "rotten piece of cloth", clientId = 10291, sell = 30 },
+	{ itemName = "rotten roots", clientId = 43849, sell = 3800 },
+	{ itemName = "rotten vermin ichor", clientId = 43847, sell = 4500 },
 	{ itemName = "sabretooth", clientId = 10311, sell = 400 },
 	{ itemName = "sabretooth fur", clientId = 39378, sell = 2500 },
 	{ itemName = "safety pin", clientId = 11493, sell = 120 },
@@ -636,6 +645,7 @@ npcConfig.shop = {
 	{ itemName = "wolf paw", clientId = 5897, sell = 70 },
 	{ itemName = "wood", clientId = 5901, sell = 5 },
 	{ itemName = "wool", clientId = 10319, sell = 15 },
+	{ itemName = "worm sponge", clientId = 43848, sell = 4200 },
 	{ itemName = "writhing brain", clientId = 32600, sell = 370000 },
 	{ itemName = "writhing heart", clientId = 32599, sell = 185000 },
 	{ itemName = "wyrm scale", clientId = 9665, sell = 400 },
diff --git a/data-otservbr-global/npc/yonan.lua b/data-otservbr-global/npc/yonan.lua
index 44dbb8dd83c..69bddee5cb3 100644
--- a/data-otservbr-global/npc/yonan.lua
+++ b/data-otservbr-global/npc/yonan.lua
@@ -39,7 +39,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },
diff --git a/data-otservbr-global/world/otservbr-monster.xml b/data-otservbr-global/world/otservbr-monster.xml
index d3bbc69e858..974c2ea6809 100644
--- a/data-otservbr-global/world/otservbr-monster.xml
+++ b/data-otservbr-global/world/otservbr-monster.xml
@@ -4076,7 +4076,6 @@
 		<monster name="Midnight Asura" x="-2" y="2" z="3" spawntime="90" />
 	</monster>
 	<monster centerx="32959" centery="32672" centerz="3" radius="3">
-		<monster name="Destroyer" x="-1" y="3" z="3" spawntime="90" />
 		<monster name="Midnight Asura" x="1" y="3" z="3" spawntime="90" />
 	</monster>
 	<monster centerx="33064" centery="32672" centerz="3" radius="3">
@@ -4122,9 +4121,6 @@
 	<monster centerx="33060" centery="32684" centerz="3" radius="1">
 		<monster name="Massive Energy Elemental" x="1" y="-1" z="3" spawntime="90" />
 	</monster>
-	<monster centerx="32938" centery="32686" centerz="3" radius="3">
-		<monster name="Destroyer" x="-1" y="-2" z="3" spawntime="90" />
-	</monster>
 	<monster centerx="33379" centery="32686" centerz="3" radius="3">
 		<monster name="Cobra Scout" x="3" y="0" z="3" spawntime="60" />
 	</monster>
@@ -6928,19 +6924,13 @@
 		<monster name="Hydra" x="0" y="2" z="4" spawntime="90" />
 	</monster>
 	<monster centerx="32945" centery="32672" centerz="4" radius="3">
-		<monster name="Massive Fire Elemental" x="0" y="-1" z="4" spawntime="90" />
 		<monster name="Midnight Asura" x="1" y="-1" z="4" spawntime="90" />
 		<monster name="Destroyer" x="0" y="1" z="4" spawntime="90" />
 	</monster>
 	<monster centerx="32959" centery="32672" centerz="4" radius="3">
-		<monster name="Massive Fire Elemental" x="2" y="-2" z="4" spawntime="90" />
 		<monster name="Midnight Asura" x="3" y="-1" z="4" spawntime="90" />
 		<monster name="Destroyer" x="1" y="2" z="4" spawntime="60" />
 	</monster>
-	<monster centerx="32966" centery="32672" centerz="4" radius="3">
-		<monster name="Destroyer" x="-3" y="-2" z="4" spawntime="90" />
-		<monster name="Destroyer" x="-1" y="1" z="4" spawntime="90" />
-	</monster>
 	<monster centerx="33085" centery="32672" centerz="4" radius="1">
 		<monster name="Energy Elemental" x="-1" y="1" z="4" spawntime="90" />
 	</monster>
@@ -6953,9 +6943,6 @@
 		<monster name="Dawnfire Asura" x="1" y="-1" z="4" spawntime="90" />
 		<monster name="Midnight Asura" x="0" y="0" z="4" spawntime="90" />
 	</monster>
-	<monster centerx="32934" centery="32677" centerz="4" radius="1">
-		<monster name="Massive Fire Elemental" x="0" y="0" z="4" spawntime="90" />
-	</monster>
 	<monster centerx="32944" centery="32677" centerz="4" radius="1">
 		<monster name="Dawnfire Asura" x="0" y="0" z="4" spawntime="90" />
 	</monster>
@@ -6963,7 +6950,6 @@
 		<monster name="Destroyer" x="0" y="0" z="4" spawntime="60" />
 	</monster>
 	<monster centerx="32952" centery="32679" centerz="4" radius="3">
-		<monster name="Destroyer" x="0" y="-3" z="4" spawntime="90" />
 		<monster name="Midnight Asura" x="-1" y="-2" z="4" spawntime="90" />
 	</monster>
 	<monster centerx="33379" centery="32679" centerz="4" radius="3">
@@ -6985,15 +6971,11 @@
 		<monster name="Dawnfire Asura" x="0" y="0" z="4" spawntime="90" />
 	</monster>
 	<monster centerx="32957" centery="32684" centerz="4" radius="1">
-		<monster name="Massive Fire Elemental" x="-1" y="0" z="4" spawntime="90" />
 		<monster name="Dawnfire Asura" x="0" y="0" z="4" spawntime="90" />
 	</monster>
 	<monster centerx="33073" centery="32684" centerz="4" radius="2">
 		<monster name="Energy Elemental" x="0" y="0" z="4" spawntime="90" />
 	</monster>
-	<monster centerx="32931" centery="32686" centerz="4" radius="3">
-		<monster name="Destroyer" x="2" y="-1" z="4" spawntime="90" />
-	</monster>
 	<monster centerx="32121" centery="32687" centerz="4" radius="7">
 		<monster name="Demon" x="-4" y="-4" z="4" spawntime="90" />
 		<monster name="Demon" x="4" y="-4" z="4" spawntime="90" />
@@ -7009,9 +6991,6 @@
 	<monster centerx="32953" centery="32687" centerz="4" radius="1">
 		<monster name="Dawnfire Asura" x="0" y="0" z="4" spawntime="90" />
 	</monster>
-	<monster centerx="32964" centery="32687" centerz="4" radius="1">
-		<monster name="Massive Fire Elemental" x="0" y="0" z="4" spawntime="90" />
-	</monster>
 	<monster centerx="33049" centery="32687" centerz="4" radius="1">
 		<monster name="Dragon Lord" x="1" y="0" z="4" spawntime="90" />
 	</monster>
@@ -63284,9 +63263,6 @@
 	<monster centerx="33319" centery="32310" centerz="8" radius="1">
 		<monster name="Rotworm" x="0" y="1" z="8" spawntime="90" />
 	</monster>
-	<monster centerx="31968" centery="32311" centerz="8" radius="1">
-		<monster name="Demon" x="0" y="0" z="8" spawntime="60" />
-	</monster>
 	<monster centerx="31991" centery="32311" centerz="8" radius="1">
 		<monster name="Mean Lost Soul" x="0" y="0" z="8" spawntime="60" />
 	</monster>
@@ -63491,9 +63467,6 @@
 	<monster centerx="33309" centery="32327" centerz="8" radius="1">
 		<monster name="Rotworm" x="1" y="1" z="8" spawntime="90" />
 	</monster>
-	<monster centerx="31951" centery="32328" centerz="8" radius="1">
-		<monster name="Demon" x="0" y="0" z="8" spawntime="60" />
-	</monster>
 	<monster centerx="33106" centery="32328" centerz="8" radius="1">
 		<monster name="Burster Spectre" x="0" y="0" z="8" spawntime="60" />
 	</monster>
@@ -96125,15 +96098,15 @@
 	<monster centerx="33234" centery="32794" centerz="9" radius="2">
 		<monster name="Larva" x="0" y="-2" z="9" spawntime="90" />
 	</monster>
+	<monster centerx="32006" centery="32795" centerz="9" radius="2">
+		<monster name="Ghoul" x="-1" y="-1" z="9" spawntime="90" />
+	</monster>
 	<monster centerx="32296" centery="32795" centerz="9" radius="1">
 		<monster name="Corym Skirmisher" x="0" y="0" z="9" spawntime="60" />
 	</monster>
 	<monster centerx="32300" centery="32795" centerz="9" radius="1">
 		<monster name="Corym Charlatan" x="0" y="0" z="9" spawntime="60" />
 	</monster>
-	<monster centerx="32006" centery="32795" centerz="9" radius="2">
-		<monster name="Ghoul" x="-1" y="-1" z="9" spawntime="90" />
-	</monster>
 	<monster centerx="33071" centery="32795" centerz="9" radius="2">
 		<monster name="Scarab" x="1" y="-1" z="9" spawntime="90" />
 	</monster>
@@ -96718,6 +96691,9 @@
 	<monster centerx="32245" centery="32835" centerz="9" radius="1">
 		<monster name="Rotworm" x="1" y="-1" z="9" spawntime="90" />
 	</monster>
+	<monster centerx="32274" centery="32835" centerz="9" radius="1">
+		<monster name="Corym Skirmisher" x="0" y="0" z="9" spawntime="60" />
+	</monster>
 	<monster centerx="32015" centery="32836" centerz="9" radius="3">
 		<monster name="Ghoul" x="1" y="-3" z="9" spawntime="90" />
 		<monster name="Ghoul" x="-2" y="0" z="9" spawntime="90" />
@@ -96725,9 +96701,6 @@
 	<monster centerx="32024" centery="32836" centerz="9" radius="3">
 		<monster name="Pirate Skeleton" x="2" y="-1" z="9" spawntime="90" />
 	</monster>
-	<monster centerx="32274" centery="32835" centerz="9" radius="1">
-		<monster name="Corym Skirmisher" x="0" y="0" z="9" spawntime="60" />
-	</monster>
 	<monster centerx="32566" centery="32836" centerz="9" radius="2">
 		<monster name="Water Elemental" x="0" y="0" z="9" spawntime="90" />
 	</monster>
@@ -118889,12 +118862,12 @@
 		<monster name="Rotworm" x="-3" y="3" z="10" spawntime="90" />
 		<monster name="Carrion Worm" x="1" y="3" z="10" spawntime="90" />
 	</monster>
-	<monster centerx="32026" centery="32830" centerz="10" radius="2">
-		<monster name="Pirate Skeleton" x="0" y="-1" z="10" spawntime="90" />
-	</monster>
 	<monster centerx="32276" centery="32829" centerz="10" radius="1">
 		<monster name="Corym Skirmisher" x="0" y="0" z="10" spawntime="60" />
 	</monster>
+	<monster centerx="32026" centery="32830" centerz="10" radius="2">
+		<monster name="Pirate Skeleton" x="0" y="-1" z="10" spawntime="90" />
+	</monster>
 	<monster centerx="32224" centery="32831" centerz="10" radius="4">
 		<monster name="Rotworm" x="-3" y="-1" z="10" spawntime="90" />
 		<monster name="Carrion Worm" x="2" y="1" z="10" spawntime="90" />
diff --git a/data/items/items.xml b/data/items/items.xml
index 45cde62bd9d..e7e73d9753b 100644
--- a/data/items/items.xml
+++ b/data/items/items.xml
@@ -64466,8 +64466,8 @@ hands of its owner. Granted by TibiaRoyal.com"/>
 		<attribute key="range" value="5"/>
 		<attribute key="weight" value="2600"/>
 		<attribute key="imbuementslot" value="2">
+			<attribute key="life leech" value="3"/>
 			<attribute key="mana leech" value="3"/>
-			<attribute key="critical hit" value="3"/>
 			<attribute key="skillboost magic level" value="3"/>
 		</attribute>
 		<attribute key="script" value="moveevent;weapon">
@@ -74873,11 +74873,14 @@ Granted by TibiaGoals.com"/>
 		<attribute key="weight" value="280"/>
 	</item>
 	<item id="43740" article="a" name="scarab ocarina">
-		<attribute key="primarytype" value="light sources"/>
+		<attribute key="primarytype" value="quest items"/>
 		<attribute key="showAttributes" value="1"/>
 		<attribute key="description" value="It has a turquoise shimmer and was made from a real scarab shell."/>
 		<attribute key="absorbpercentearth" value="2"/>
 		<attribute key="weight" value="120"/>
+		<attribute key="script" value="moveevent">
+			<attribute key="slot" value="ammo"/>
+		</attribute>
 	</item>
 	<item id="43665" article="a" name="dead elder bloodjaw">
 		<attribute key="decayTo" value="0"/>
@@ -74994,6 +74997,15 @@ Granted by TibiaGoals.com"/>
 		<attribute key="duration" value="10"/>
 		<attribute key="fluidSource" value="blood"/>
 	</item>
+	<item id="43863" article="a" name="conch shell horn">
+		<attribute key="primarytype" value="quest items"/>
+		<attribute key="showAttributes" value="1"/>
+		<attribute key="absorbpercentice" value="5"/>
+		<attribute key="weight" value="150"/>
+		<attribute key="script" value="moveevent">
+			<attribute key="slot" value="ammo"/>
+		</attribute>
+	</item>
 	<item id="43864" article="a" name="sanguine blade">
 		<attribute key="primarytype" value="sword weapons"/>
 		<attribute key="weaponType" value="sword"/>