diff --git a/data-otservbr-global/scripts/actions/tools/crowbar.lua b/data-otservbr-global/scripts/actions/tools/crowbar.lua
index dbde40765e0..0981bd61d24 100644
--- a/data-otservbr-global/scripts/actions/tools/crowbar.lua
+++ b/data-otservbr-global/scripts/actions/tools/crowbar.lua
@@ -1,5 +1,5 @@
 local function the_ape_city(player, item, target, toPosition)
-	if target:getActionId() == 40040 and target:getId() == 4848 then
+	if target:getActionId() == 40041 and target:getId() == 4848 then
 		local storageValue = player:getStorageValue(Storage.Quest.U7_6.TheApeCity.Casks)
 		if storageValue < 0 then
 			storageValue = 0
diff --git a/data-otservbr-global/scripts/quests/the_ancient_tombs/actions_dipthrah_signs_doors.lua b/data-otservbr-global/scripts/quests/the_ancient_tombs/actions_dipthrah_signs_doors.lua
index 70e50a680d2..a2d626b8a9f 100644
--- a/data-otservbr-global/scripts/quests/the_ancient_tombs/actions_dipthrah_signs_doors.lua
+++ b/data-otservbr-global/scripts/quests/the_ancient_tombs/actions_dipthrah_signs_doors.lua
@@ -1,14 +1,14 @@
 local actions_dipthrah_signs_doors = Action()
 
 local questSteps = {
-	[40031] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign1,
-	[40032] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign2,
-	[40033] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign3,
-	[40034] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign4,
-	[40035] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign5,
-	[40036] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign6,
-	[40037] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign7,
-	[40038] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign8,
+	[40032] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign1,
+	[40033] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign2,
+	[40034] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign3,
+	[40035] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign4,
+	[40036] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign5,
+	[40037] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign6,
+	[40038] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign7,
+	[40039] = Storage.Quest.U7_4.TheAncientTombs.Diprath_sign8,
 }
 
 local function hasCompletedPreviousStep(player, currentStep)
diff --git a/data-otservbr-global/scripts/quests/the_ancient_tombs/movements_craft_helmet.lua b/data-otservbr-global/scripts/quests/the_ancient_tombs/movements_craft_helmet.lua
index ed8fafafb0a..407bbf04999 100644
--- a/data-otservbr-global/scripts/quests/the_ancient_tombs/movements_craft_helmet.lua
+++ b/data-otservbr-global/scripts/quests/the_ancient_tombs/movements_craft_helmet.lua
@@ -41,5 +41,5 @@ function craftHelmet.onAddItem(moveitem, tileitem, position)
 end
 
 craftHelmet:type("additem")
-craftHelmet:aid(40039)
+craftHelmet:aid(40040)
 craftHelmet:register()
diff --git a/data-otservbr-global/startup/tables/chest.lua b/data-otservbr-global/startup/tables/chest.lua
index 41a696af332..77b04e90237 100644
--- a/data-otservbr-global/startup/tables/chest.lua
+++ b/data-otservbr-global/startup/tables/chest.lua
@@ -170,7 +170,7 @@ ChestUnique = {
 		time = 24, -- hour
 	},
 	-- The Pits of Inferno - Key 3700
-	[5013] = {
+	[5024] = {
 		isKey = true,
 		itemId = 2472,
 		itemPos = { x = 32842, y = 32225, z = 8 },
@@ -1007,7 +1007,7 @@ ChestUnique = {
 		time = 24, -- hour
 	},
 	-- The Medusa Quest
-	[6111] = {
+	[6186] = {
 		itemId = 1983,
 		itemPos = { x = 33049, y = 32399, z = 10 },
 		container = 2853,
@@ -1016,7 +1016,7 @@ ChestUnique = {
 		storage = Storage.Quest.U7_3.TheMedusaQuest,
 	},
 	-- Serpentine Tower Quest
-	[6112] = {
+	[6187] = {
 		itemId = 2472,
 		itemPos = { x = 33150, y = 32862, z = 7 },
 		weight = 0.20,
@@ -1024,7 +1024,7 @@ ChestUnique = {
 		storage = Storage.Quest.U7_3.SerpentineTower.WhitePearl,
 	},
 	-- Elephant Tusk Quest
-	[6113] = {
+	[6188] = {
 		itemId = 2472,
 		itemPos = { x = 32922, y = 32755, z = 7 },
 		weight = 0.20,
@@ -1032,14 +1032,14 @@ ChestUnique = {
 		storage = Storage.Quest.U7_5.ElephantTusk,
 	},
 	-- The Explorer Society - Books
-	[6114] = {
+	[6189] = {
 		itemId = 2434,
 		itemPos = { x = 32770, y = 32245, z = 8 },
 		weight = 13,
 		reward = { { 2821, 1 } },
 		storage = Storage.Quest.U7_6.ExplorerSociety.Books.Cyclops,
 	},
-	[6115] = {
+	[6190] = {
 		itemId = 2523,
 		itemPos = { x = 32786, y = 32254, z = 8 },
 		weight = 13.00,
@@ -1047,7 +1047,7 @@ ChestUnique = {
 		storage = Storage.Quest.U7_6.ExplorerSociety.Books.Hengis,
 	},
 	-- Witch House Quest
-	[6116] = {
+	[6191] = {
 		itemId = 2472,
 		itemPos = { x = 32867, y = 31909, z = 8 },
 		weight = 23.30,
@@ -1056,7 +1056,7 @@ ChestUnique = {
 		storage = Storage.QuestChests.WitchHouseQuest,
 	},
 	-- Simon The Beggar's Favorite Staff
-	[6117] = {
+	[6192] = {
 		itemId = 2482,
 		itemPos = { x = 33167, y = 31600, z = 15 },
 		weight = 38.00,
@@ -1064,7 +1064,7 @@ ChestUnique = {
 		storage = Storage.QuestChests.SimonTheBeggarsFavoriteStaff,
 	},
 	-- Druid Outfit Quest - Wolf Tooth Chain
-	[6118] = {
+	[6193] = {
 		itemId = 2480,
 		itemPos = { x = 32939, y = 31776, z = 9 },
 		weight = 3.30,
@@ -1072,7 +1072,7 @@ ChestUnique = {
 		storage = Storage.Quest.U7_8.DruidOutfits.WolfToothChain,
 	},
 	-- Hunter Outfits Quest - Elane Crossbow
-	[6118] = {
+	[6194] = {
 		itemId = 2472,
 		itemPos = { x = 32369, y = 32795, z = 10 },
 		weight = 40.00,
@@ -1080,7 +1080,7 @@ ChestUnique = {
 		storage = Storage.Quest.U7_8.HunterOutfits.ElaneCrossbow,
 	},
 	-- Knight Outfits Quest - Ramsay the Reckless Helmet
-	[6119] = {
+	[6195] = {
 		itemId = 2472,
 		itemPos = { x = 32860, y = 32516, z = 11 },
 		weight = 46.00,
@@ -1088,7 +1088,7 @@ ChestUnique = {
 		storage = Storage.Quest.U7_8.KnightOutfits.RamsaysHelmetChest,
 	},
 	-- Oriental Outfits Quest - Chest
-	[6120] = {
+	[6196] = {
 		itemId = 2472,
 		itemPos = { x = 32088, y = 32780, z = 11 },
 		weight = 4.50,
@@ -1096,7 +1096,7 @@ ChestUnique = {
 		storage = Storage.Quest.U7_8.OrientalOutfits.CoralComb,
 	},
 	-- The Shattered Isles Quest - Dragahs Spellbook
-	[6121] = {
+	[6197] = {
 		itemId = 4240,
 		itemPos = { x = 32093, y = 32574, z = 8 },
 		weight = 58.00,
@@ -1104,7 +1104,7 @@ ChestUnique = {
 		storage = Storage.Quest.U7_8.TheShatteredIsles.DragahsSpellbook,
 	},
 	-- Dreamer's Challenge Quest
-	[6122] = {
+	[6198] = {
 		itemId = 4240,
 		itemPos = { x = 32860, y = 32249, z = 9 },
 		weight = 150.00,
@@ -1112,14 +1112,14 @@ ChestUnique = {
 		reward = { { 2816, 1 }, { 3285, 1 }, { 3352, 1 }, { 3558, 1 } },
 		storage = Storage.Quest.U7_9.DreamersChallenge.BPLongSword,
 	},
-	[6123] = {
+	[6199] = {
 		itemId = 2472,
 		itemPos = { x = 32850, y = 32285, z = 14 },
 		weight = 13.00,
 		reward = { { 2821, 1 } },
 		storage = Storage.Quest.U7_9.DreamersChallenge.ChestBook,
 	},
-	[6124] = {
+	[6200] = {
 		itemId = 2469,
 		itemPos = { x = 32749, y = 32341, z = 14 },
 		weight = 15.30,
@@ -1127,7 +1127,7 @@ ChestUnique = {
 		reward = { { 6498, 1 }, { 2874, 1 }, { 3602, 1 } },
 		storage = Storage.Quest.U7_9.DreamersChallenge.ChestsWine,
 	},
-	[6125] = {
+	[6201] = {
 		itemId = 2469,
 		itemPos = { x = 32751, y = 32341, z = 14 },
 		weight = 15.30,
@@ -1135,7 +1135,7 @@ ChestUnique = {
 		reward = { { 6498, 1 }, { 2874, 1 }, { 3602, 1 } },
 		storage = Storage.Quest.U7_9.DreamersChallenge.ChestsWine,
 	},
-	[6126] = {
+	[6202] = {
 		itemId = 2469,
 		itemPos = { x = 32753, y = 32341, z = 14 },
 		weight = 15.30,
@@ -1143,7 +1143,7 @@ ChestUnique = {
 		reward = { { 6498, 1 }, { 2874, 1 }, { 3602, 1 } },
 		storage = Storage.Quest.U7_9.DreamersChallenge.ChestsWine,
 	},
-	[6127] = {
+	[6203] = {
 		itemId = 2469,
 		itemPos = { x = 32755, y = 32341, z = 14 },
 		weight = 15.30,
@@ -1151,7 +1151,7 @@ ChestUnique = {
 		reward = { { 6498, 1 }, { 2874, 1 }, { 3602, 1 } },
 		storage = Storage.Quest.U7_9.DreamersChallenge.ChestsWine,
 	},
-	[6128] = {
+	[6204] = {
 		itemId = 2469,
 		itemPos = { x = 32835, y = 32223, z = 14 },
 		weight = 0.30,
@@ -1159,21 +1159,21 @@ ChestUnique = {
 		storage = Storage.Quest.U7_9.DreamersChallenge.Chests3SmallDiamond,
 	},
 	-- The Pits of Inferno
-	[6129] = {
+	[6205] = {
 		itemId = 2472,
 		itemPos = { x = 32828, y = 32340, z = 7 },
 		weight = 13.00,
 		reward = { { 2836, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.ChestTible,
 	},
-	[6130] = {
+	[6206] = {
 		itemId = 5972,
 		itemPos = { x = 32854, y = 32325, z = 11 },
 		weight = 13.00,
 		reward = { { 2816, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.CorpseBook,
 	},
-	[6131] = {
+	[6207] = {
 		itemId = 5972,
 		itemPos = { x = 32832, y = 32277, z = 10 },
 		weight = 40.90,
@@ -1181,7 +1181,7 @@ ChestUnique = {
 		reward = { { 6561, 1 }, { 6299, 1 }, { 3052, 1 }, { 5021, 3 }, { 3026, 5 }, { 3035, 11 }, { 5944, 2 }, { 3160, 3 }, { 3155, 2 }, { 3147, 1 }, { 238, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.CorpsePirateBP,
 	},
-	[6132] = {
+	[6208] = {
 		itemId = 2472,
 		itemPos = { x = 32826, y = 32232, z = 11 },
 		weight = 20.70,
@@ -1189,49 +1189,49 @@ ChestUnique = {
 		reward = { { 11605, 1 }, { 11607, 1 }, { 11609, 1 }, { 11603, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.RewardChestBP,
 	},
-	[6133] = {
+	[6209] = {
 		itemId = 2472,
 		itemPos = { x = 32824, y = 32232, z = 11 },
 		weight = 10.00,
 		reward = { { 3035, 100 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.RewardChestPlatinumCoins,
 	},
-	[6134] = {
+	[6210] = {
 		itemId = 2472,
 		itemPos = { x = 32819, y = 32232, z = 11 },
 		weight = 10.00,
 		reward = { { 3249, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.RewardChestFrozenStarlight,
 	},
-	[6135] = {
+	[6211] = {
 		itemId = 2472,
 		itemPos = { x = 32814, y = 32232, z = 11 },
 		weight = 8.50,
 		reward = { { 5791, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.RewardChestStuffed,
 	},
-	[6136] = {
+	[6212] = {
 		itemId = 2472,
 		itemPos = { x = 32812, y = 32232, z = 11 },
 		weight = 8.00,
 		reward = { { 6529, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.RewardChestSoftBoots,
 	},
-	[6137] = {
+	[6213] = {
 		itemId = 2472,
 		itemPos = { x = 32804, y = 32229, z = 11 },
 		weight = 40.00,
 		reward = { { 3341, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.RewardChestStaffAvengerArbalest,
 	},
-	[6138] = {
+	[6214] = {
 		itemId = 2472,
 		itemPos = { x = 32806, y = 32229, z = 11 },
 		weight = 64.00,
 		reward = { { 6527, 1 } },
 		storage = Storage.Quest.U7_9.ThePitsOfInferno.RewardChestStaffAvengerArbalest,
 	},
-	[6139] = {
+	[6215] = {
 		itemId = 2472,
 		itemPos = { x = 32808, y = 32229, z = 11 },
 		weight = 95.00,
diff --git a/data-otservbr-global/startup/tables/item.lua b/data-otservbr-global/startup/tables/item.lua
index 9b56c134bb2..2ffa1c9dfa1 100644
--- a/data-otservbr-global/startup/tables/item.lua
+++ b/data-otservbr-global/startup/tables/item.lua
@@ -585,62 +585,62 @@ ItemAction = {
 		},
 	},
 	-- The Ancient Tombs Quest
-	[40031] = {
+	[40032] = {
 		itemId = 2023,
 		itemPos = {
 			{ x = 33071, y = 32637, z = 15 },
 		},
 	},
-	[40032] = {
+	[40033] = {
 		itemId = 2023,
 		itemPos = {
 			{ x = 33074, y = 32633, z = 15 },
 		},
 	},
-	[40033] = {
+	[40034] = {
 		itemId = 2023,
 		itemPos = {
 			{ x = 33071, y = 32629, z = 15 },
 		},
 	},
-	[40034] = {
+	[40035] = {
 		itemId = 2023,
 		itemPos = {
 			{ x = 33077, y = 32625, z = 15 },
 		},
 	},
-	[40035] = {
+	[40036] = {
 		itemId = 2023,
 		itemPos = {
 			{ x = 33077, y = 32621, z = 15 },
 		},
 	},
-	[40036] = {
+	[40037] = {
 		itemId = 2023,
 		itemPos = {
 			{ x = 33071, y = 32617, z = 15 },
 		},
 	},
-	[40037] = {
+	[40038] = {
 		itemId = 2023,
 		itemPos = {
 			{ x = 33077, y = 32613, z = 15 },
 		},
 	},
-	[40038] = {
+	[40039] = {
 		itemId = 2023,
 		itemPos = {
 			{ x = 33071, y = 32609, z = 15 },
 		},
 	},
-	[40039] = {
+	[40040] = {
 		itemId = 2344,
 		itemPos = {
 			{ x = 33198, y = 32876, z = 11 },
 		},
 	},
 	-- The Ape City Quest - Casks
-	[40040] = {
+	[40041] = {
 		itemId = 4848,
 		itemPos = {
 			{ x = 32862, y = 32507, z = 9 },