diff --git a/game/modules/tome/data/general/npcs/molds.lua b/game/modules/tome/data/general/npcs/molds.lua
index 65d3d0c087da9392a491932599bf674de42f175b..2b3dbb6560a5cc5f0055a7610fda0be02426c590 100644
--- a/game/modules/tome/data/general/npcs/molds.lua
+++ b/game/modules/tome/data/general/npcs/molds.lua
@@ -76,3 +76,35 @@ newEntity{ base = "BASE_NPC_MOLD",
 	combat = { dam=5, atk=15, apr=10 },
 	resolvers.talents{ [Talents.T_SPORE_POISON]=1 },
 }
+
+newEntity{ base = "BASE_NPC_MOLD",
+	unique = true,
+	type = "undead", subtype = "molds",
+	name = "Z'quikzshl the skeletal mold",
+	display = 'm', color=colors.PURPLE,
+	desc = [[Steeped in fungal malevolance, this mold refused to die.  How a mold becomes a skeleton, though, is beyond you.  Are those its own bones, or the bones of hapless adventurers?]],
+
+	level_range = {10, nil}, exp_worth = 5,
+	rarity = 1,
+	max_life = resolvers.rngavg(120,150),
+	combat = { dam=resolvers.mbonus(30, 20), atk=25, apr=15 },
+
+	rank = 4,
+	size_category = 2,
+
+	summon = {
+		{type="immovable", subtype="molds", number=4, hasxp=false},
+	},
+
+	resolvers.talents{
+		[Talents.T_SUMMON]=1,
+		[Talents.T_BONE_SPEAR]=4,
+		[Talents.T_BONE_GRAB]=3,
+		[Talents.T_SPORE_BLIND]=5,
+		[Talents.T_SPORE_POISON]=5,
+		[Talents.T_ROTTING_DISEASE]=5,
+		[Talents.T_DECREPITUDE_DISEASE]=5,
+		[Talents.T_WEAKNESS_DISEASE]=5,
+		[Talents.T_GRAB]=5,
+	}
+}
diff --git a/game/modules/tome/data/maps/vaults/old-forest-swamp.lua b/game/modules/tome/data/maps/vaults/old-forest-swamp.lua
new file mode 100644
index 0000000000000000000000000000000000000000..ec61fff4998fe6996206afc1aa02f90fba98a1ce
--- /dev/null
+++ b/game/modules/tome/data/maps/vaults/old-forest-swamp.lua
@@ -0,0 +1,59 @@
+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+setStatusAll{no_teleport=true}
+
+defineTile(',', "GRASS")
+defineTile(';', "GRASS_DARK1")
+defineTile('~', "SHALLOW_WATER")
+defineTile('%', "POISON_SHALLOW_WATER")
+
+defineTile('$', "GRASS_DARK1", {random_filter={add_levels=25, type="money"}})
+defineTile('*', "GRASS", {random_filter={add_levels=25, type="gem"}})
+defineTile('&', "TREE_DARK", {random_filter={add_levels=15, subtype="amulet"}})
+
+defineTile('^', "GRASS_DARK1", nil, nil, {random_filter={add_levels=15, name="poison vine"}})
+defineTile('+', "GRASS", nil, nil, {random_filter={add_levels=15, name="poison vine"}})
+
+defineTile('#', "GRASS_DARK1", nil, {random_filter={add_levels=30, subtype="plants", never_move=1}})
+
+rotates = {"default", "90", "180", "270", "flipx", "flipy"}
+
+return {
+[[,,,^,;,,,^;,,;++,,+,]],
+[[,#,,,,;;;,,;,;#,,,;,]],
+[[~~,,#,,#;;;;,;*;;,,;]],
+[[,;~$,,+,*#,,,#;+#,,,]],
+[[;,,#~,#,$,^,,^,$,,,;]],
+[[,#*,+~+,$,,#,;,#^,,#]],
+[[,,;,$~,;;%%*,+,;,;,,]],
+[[;,#,^~;,+,#%%;;;^#,;]],
+[[;,*,,;~~~%%,%%%,,;,;]],
+[[,#,^,;%#%~%%%#%,#;+,]],
+[[,,,%,;$%%$~$%,%,;$,#]],
+[[;+$%%%;#%,~,%^,%$#,,]],
+[[;,#%%;#%%%~%%%%,%,,^]],
+[[,,$%;%;%#+&~~~#;%,,,]],
+[[^$,%%%,%%+%%%%~%,+,;]],
+[[,,%%#%%%*%$%~$~;%,,,]],
+[[,%#,#$;#;#%~%~%%%$#;]],
+[[;,%$,$,$^*%,~%,#+,#,]],
+[[,#,,^,+$,#,%;;%;,;,;]],
+[[,;;,,#,,,^,++,,,;;,,]],
+}
diff --git a/game/modules/tome/data/maps/vaults/xorn-trap.lua b/game/modules/tome/data/maps/vaults/xorn-trap.lua
new file mode 100644
index 0000000000000000000000000000000000000000..5bf5efdd5389a8726d98864feea6806c9178cc00
--- /dev/null
+++ b/game/modules/tome/data/maps/vaults/xorn-trap.lua
@@ -0,0 +1,43 @@
+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+setStatusAll{no_teleport=true}
+
+defineTile(' ', "FLOOR")
+defineTile('#', "HARDWALL")
+defineTile(':', "WALL")
+defineTile('^', "FLOOR", {random_filter={add_levels=20, type='jewelry'}}, nil, {random_filter={add_levels=50, name='lethargy trap'}})
+defineTile('X', "FLOOR", {random_filter={add_levels=15, ego_chance=50}}, {random_filter={add_levels=15, subtype="xorn"}})
+
+startx = 4
+starty = 4
+
+rotates = {"default", "90", "180", "270", "flipx", "flipy"}
+
+return {
+[[#### ####]],
+[[#XX# #XX#]],
+[[#XX# #XX#]],
+[[##:: ::##]],
+[[    ^    ]],
+[[###: :###]],
+[[#XX: :XX#]],
+[[#XX# #XX#]],
+[[#### ####]],
+}
\ No newline at end of file