diff --git a/game/modules/tome/data/rooms/big_cross.lua b/game/modules/tome/data/rooms/big_cross.lua
new file mode 100644
index 0000000000000000000000000000000000000000..fc4c3083af8199e586ba968068558e9a4d8edbbb
--- /dev/null
+++ b/game/modules/tome/data/rooms/big_cross.lua
@@ -0,0 +1,32 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!#!!!!!#]],
+[[!.....#.....!]],
+[[!.....#.....!]],
+[[!.....#.....!]],
+[[!.....#.....!]],
+[[######.######]],
+[[!.....#.....!]],
+[[!.....#.....!]],
+[[!.....#.....!]],
+[[!.....#.....!]],
+[[#!!!!!#!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/big_inner_circle.lua b/game/modules/tome/data/rooms/big_inner_circle.lua
new file mode 100644
index 0000000000000000000000000000000000000000..0c366772b99440d9c542867bc9f3f9a803a3132e
--- /dev/null
+++ b/game/modules/tome/data/rooms/big_inner_circle.lua
@@ -0,0 +1,32 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!!!#]],
+[[!.........!]],
+[[!..##.##..!]],
+[[!.#.#.#.#.!]],
+[[!.##...##.!]],
+[[!.........!]],
+[[!.##...##.!]],
+[[!.#.#.#.#.!]],
+[[!..##.##..!]],
+[[!.........!]],
+[[#!!!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/broken_infinity.lua b/game/modules/tome/data/rooms/broken_infinity.lua
new file mode 100644
index 0000000000000000000000000000000000000000..fc130ffd7be8e1058a541d21f936dbaea6db3a49
--- /dev/null
+++ b/game/modules/tome/data/rooms/broken_infinity.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!#!!!#!#]],
+[[!.#...#.!]],
+[[!..#.#..!]],
+[[!.#...#.!]],
+[[!..#.#..!]],
+[[!.#...#.!]],
+[[!..#.#..!]],
+[[!.#...#.!]],
+[[#!#!!!#!#]],
+}
diff --git a/game/modules/tome/data/rooms/broken_room.lua b/game/modules/tome/data/rooms/broken_room.lua
new file mode 100644
index 0000000000000000000000000000000000000000..0b172325c4ad77916537655f564d6447cd3bdec4
--- /dev/null
+++ b/game/modules/tome/data/rooms/broken_room.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!#!!#!!#]],
+[[!..#..#..!]],
+[[!..#..#..!]],
+[[!..###...!]],
+[[!........!]],
+[[!...###..!]],
+[[!..#..#..!]],
+[[!..#..#..!]],
+[[#!!#!!#!!#]],
+}
diff --git a/game/modules/tome/data/rooms/broken_x.lua b/game/modules/tome/data/rooms/broken_x.lua
new file mode 100644
index 0000000000000000000000000000000000000000..de953a583f11e51970c4a37437aae63f6ea46589
--- /dev/null
+++ b/game/modules/tome/data/rooms/broken_x.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!#]],
+[[!.......!]],
+[[!.#...#.!]],
+[[!.##.##.!]],
+[[!.......!]],
+[[!.##.##.!]],
+[[!.#...#.!]],
+[[!.......!]],
+[[#!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/cells10.lua b/game/modules/tome/data/rooms/cells10.lua
new file mode 100644
index 0000000000000000000000000000000000000000..e367bd6f15a613de7868f2ab7dfd3e32c2a6b4c8
--- /dev/null
+++ b/game/modules/tome/data/rooms/cells10.lua
@@ -0,0 +1,28 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!#!!#!!#!#]],
+[[!.#..#..#.!]],
+[[!.........!]],
+[[!.#..#..#.!]],
+[[!.........!]],
+[[!.#..#..#.!]],
+[[#!#!!#!!#!#]],
+}
diff --git a/game/modules/tome/data/rooms/cells9.lua b/game/modules/tome/data/rooms/cells9.lua
new file mode 100644
index 0000000000000000000000000000000000000000..7e76527955b91fe8dae981c0930522c6e58617a3
--- /dev/null
+++ b/game/modules/tome/data/rooms/cells9.lua
@@ -0,0 +1,26 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!#!!!!##!!!!#!!#]],
+[[!..#....##....#..!]],
+[[!.#.#..#..#..#.#.!]],
+[[!..#....##....#..!]],
+[[#!!#!!!!##!!!!#!!#]],
+}
diff --git a/game/modules/tome/data/rooms/circle_cross.lua b/game/modules/tome/data/rooms/circle_cross.lua
new file mode 100644
index 0000000000000000000000000000000000000000..ec5dc0f5eb67863561be7ae74a5cff14bf55caf7
--- /dev/null
+++ b/game/modules/tome/data/rooms/circle_cross.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!!!!!#]],
+[[!.#.......#.!]],
+[[!..#.###.#..!]],
+[[!...#...#...!]],
+[[!..#.###.#..!]],
+[[!...#...#...!]],
+[[!..#.###.#..!]],
+[[!.#.......#.!]],
+[[#!!!!!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/cross_circled.lua b/game/modules/tome/data/rooms/cross_circled.lua
new file mode 100644
index 0000000000000000000000000000000000000000..47ed1124e667a59cc359f98c8f62e174b22f51fd
--- /dev/null
+++ b/game/modules/tome/data/rooms/cross_circled.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[##!!!!!##]],
+[[##.....##]],
+[[!..###..!]],
+[[!.#.#.#.!]],
+[[!.##.##.!]],
+[[!.#.#.#.!]],
+[[!..###..!]],
+[[##.....##]],
+[[##!!!!!##]],
+}
diff --git a/game/modules/tome/data/rooms/double_helix.lua b/game/modules/tome/data/rooms/double_helix.lua
new file mode 100644
index 0000000000000000000000000000000000000000..57f673d03fa73de651f75ca45178d8fb5394435f
--- /dev/null
+++ b/game/modules/tome/data/rooms/double_helix.lua
@@ -0,0 +1,27 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!#!!!!#!!#]],
+[[!..#....#..!]],
+[[!.#.#..#.#.!]],
+[[!.#.#..#.#.!]],
+[[!..#....#..!]],
+[[#!!#!!!!#!!#]],
+}
diff --git a/game/modules/tome/data/rooms/inner_circle.lua b/game/modules/tome/data/rooms/inner_circle.lua
new file mode 100644
index 0000000000000000000000000000000000000000..00961bf157274f322a1b92fc849839499eeb3f38
--- /dev/null
+++ b/game/modules/tome/data/rooms/inner_circle.lua
@@ -0,0 +1,29 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!#]],
+[[!......!]],
+[[!..##..!]],
+[[!.#..#.!]],
+[[!.#..#.!]],
+[[!..##..!]],
+[[!......!]],
+[[#!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/inner_circle2.lua b/game/modules/tome/data/rooms/inner_circle2.lua
new file mode 100644
index 0000000000000000000000000000000000000000..9128ca5c21938f64e0ece355000bf77ab6289d9b
--- /dev/null
+++ b/game/modules/tome/data/rooms/inner_circle2.lua
@@ -0,0 +1,29 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!#]],
+[[!.......!]],
+[[!...###.!]],
+[[!..#..#.!]],
+[[!.#..#..!]],
+[[!.###...!]],
+[[!.......!]],
+[[#!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/inner_fort.lua b/game/modules/tome/data/rooms/inner_fort.lua
new file mode 100644
index 0000000000000000000000000000000000000000..0d61a399dbb4ed1e3b302d58a88d50c9f5134c91
--- /dev/null
+++ b/game/modules/tome/data/rooms/inner_fort.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!#!!!!#]],
+[[!....#....!]],
+[[!..#####..!]],
+[[!.###.###.!]],
+[[!.........!]],
+[[!.###.###.!]],
+[[!..#####..!]],
+[[!....#....!]],
+[[#!!!!#!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/inner_pillar.lua b/game/modules/tome/data/rooms/inner_pillar.lua
new file mode 100644
index 0000000000000000000000000000000000000000..4a7a6641e2750c4cb9ab672053cddd9266a2b2b5
--- /dev/null
+++ b/game/modules/tome/data/rooms/inner_pillar.lua
@@ -0,0 +1,40 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!#]],
+[[!.......!]],
+[[!..###..!]],
+[[!.#####.!]],
+[[!..###..!]],
+[[!.......!]],
+[[#!!!!!!!#]],
+}
+infinity
+return {
+[[#!!!!!!!!!!!!!!!#]],
+[[!...............!]],
+[[!..#####.#####..!]],
+[[!.##....#....##.!]],
+[[!...............!]],
+[[!.##....#....##.!]],
+[[!..#####.#####..!]],
+[[!...............!]],
+[[#!!!!!!!!!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/micro_pillar.lua b/game/modules/tome/data/rooms/micro_pillar.lua
new file mode 100644
index 0000000000000000000000000000000000000000..98393ee9f044a0cdb2c2843b4beffb02a335f648
--- /dev/null
+++ b/game/modules/tome/data/rooms/micro_pillar.lua
@@ -0,0 +1,29 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!!!!#]],
+[[!..........!]],
+[[!..........!]],
+[[!.##.##.##.!]],
+[[!.##.##.##.!]],
+[[!..........!]],
+[[!..........!]],
+[[#!!!!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/multi_pillar.lua b/game/modules/tome/data/rooms/multi_pillar.lua
new file mode 100644
index 0000000000000000000000000000000000000000..cae77f8c2c7ea98de9ca5a551538d29e253ebdb3
--- /dev/null
+++ b/game/modules/tome/data/rooms/multi_pillar.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!!!!#]],
+[[!..........!]],
+[[!.##.##.##.!]],
+[[!..........!]],
+[[!.##.##.##.!]],
+[[!..........!]],
+[[!.##.##.##.!]],
+[[!..........!]],
+[[#!!!!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/random_room.lua b/game/modules/tome/data/rooms/random_room.lua
index c61fb0700c5c427a07a7b68123e292fee5a88c6d..d7ce08c4d9be350add3208a0f366d4030c83003e 100644
--- a/game/modules/tome/data/rooms/random_room.lua
+++ b/game/modules/tome/data/rooms/random_room.lua
@@ -19,7 +19,8 @@
 
 local list = {
 	"simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple", "simple",
-	"pilar", "oval","s","cells","inner_checkerboard","y","inner","small_inner_cross","small_cross","big_cells","cells2","inner_cross","cells3","cells4","cells5","cells6","cross","equal2","pilar2","cells7","cells8","double_y","equal","center_arrows","h","pilar_big"
+	"pilar", "oval","s","cells","inner_checkerboard","y","inner","small_inner_cross","small_cross","big_cells","cells2","inner_cross","cells3","cells4","cells5","cells6","cross","equal2","pilar2","cells7","cells8","double_y","equal","center_arrows","h","pilar_big",
+	"big_cross", "broken_room", "cells9", "double_helix", "inner_fort", "multi_pillar", "split2", "womb", "big_inner_circle", "broken_x", "circle_cross", "inner_circle2", "inner_pillar", "small_x", "weird1", "xroads", "broken_infinity", "cells10", "cross_circled", "inner_circle", "micro_pillar", "split1", "weird2",
 }
 
 -- Load a random normal room file and use it
diff --git a/game/modules/tome/data/rooms/small_x.lua b/game/modules/tome/data/rooms/small_x.lua
new file mode 100644
index 0000000000000000000000000000000000000000..5f1d1b7b31765cffbe60fbf3ad7de740e5d84fe0
--- /dev/null
+++ b/game/modules/tome/data/rooms/small_x.lua
@@ -0,0 +1,26 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!#]],
+[[!#.#!]],
+[[!.#.!]],
+[[!#.#!]],
+[[#!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/split1.lua b/game/modules/tome/data/rooms/split1.lua
new file mode 100644
index 0000000000000000000000000000000000000000..d1b33ce9c27110dcea5d56c9df88e4e9bcb23204
--- /dev/null
+++ b/game/modules/tome/data/rooms/split1.lua
@@ -0,0 +1,28 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!##!!!!!!!!!!!!#]],
+[[!..##...........!]],
+[[!...##..........!]],
+[[!....##.#.##....!]],
+[[!..........##...!]],
+[[!...........##..!]],
+[[#!!!!!!!!!!!!##!#]],
+}
diff --git a/game/modules/tome/data/rooms/split2.lua b/game/modules/tome/data/rooms/split2.lua
new file mode 100644
index 0000000000000000000000000000000000000000..44698527fb588060be636d74f7be781dd5b8500f
--- /dev/null
+++ b/game/modules/tome/data/rooms/split2.lua
@@ -0,0 +1,26 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!!!!!!!#]],
+[[!.............!]],
+[[###.#.#.#.#.###]],
+[[!.............!]],
+[[#!!!!!!!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/weird1.lua b/game/modules/tome/data/rooms/weird1.lua
new file mode 100644
index 0000000000000000000000000000000000000000..36afbfe25b64d9fe89a85630fd98664a7f050d5a
--- /dev/null
+++ b/game/modules/tome/data/rooms/weird1.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!#]],
+[[!.......!]],
+[[!.#.#.#.!]],
+[[!...#...!]],
+[[!.#####.!]],
+[[!...#...!]],
+[[!.#.#.#.!]],
+[[!.......!]],
+[[#!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/weird2.lua b/game/modules/tome/data/rooms/weird2.lua
new file mode 100644
index 0000000000000000000000000000000000000000..8d237709269ee3623af294c3b6d8c31273847b67
--- /dev/null
+++ b/game/modules/tome/data/rooms/weird2.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!!!!!!!#]],
+[[!.......!]],
+[[!.###.#.!]],
+[[!.....#.!]],
+[[!.#...#.!]],
+[[!.#.....!]],
+[[!.#.###.!]],
+[[!.......!]],
+[[#!!!!!!!#]],
+}
diff --git a/game/modules/tome/data/rooms/womb.lua b/game/modules/tome/data/rooms/womb.lua
new file mode 100644
index 0000000000000000000000000000000000000000..9f311f2c8cadc4d51aa5e2dbf793b4f13d1bbb7d
--- /dev/null
+++ b/game/modules/tome/data/rooms/womb.lua
@@ -0,0 +1,27 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!#!!!#!#]],
+[[!.#...#.!]],
+[[!.#...#.!]],
+[[!..#.#..!]],
+[[!..#.#..!]],
+[[#!!#!#!!#]],
+}
diff --git a/game/modules/tome/data/rooms/xroads.lua b/game/modules/tome/data/rooms/xroads.lua
new file mode 100644
index 0000000000000000000000000000000000000000..13fdc1ea6c1f9f1cd3283d53bfc2b05080033c47
--- /dev/null
+++ b/game/modules/tome/data/rooms/xroads.lua
@@ -0,0 +1,28 @@
+-- ToME - Tales of Maj'Eyal
+-- 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
+
+return {
+[[#!#!#!#]],
+[[!.#.#.!]],
+[[##...##]],
+[[!.....!]],
+[[##...##]],
+[[!.#.#.!]],
+[[#!#!#!#]],
+}