diff --git a/data/old_rooms/00.txt b/data/old_rooms/00.txt
new file mode 100644
index 0000000..b6554fb
--- /dev/null
+++ b/data/old_rooms/00.txt
@@ -0,0 +1,57 @@
+width: 2
+height: 1
+door-height-xp: 1
+door-height-xn: 1
+color: CYAN
+floor-texture: 0
+wall-texture: 2
+door-texture: 0
+under-door-texture: 0
+exit-xp: 5
+exit-xn: 1
+exit-zn: 2
+
+actor{
+    name: PLATFORM02
+    bmp: test.gif
+    bmp-rect: 64 0 32 24
+    bmp-offset: 0 24
+    pos: 16 20 0
+    size: 8 8 4
+}
+
+actor{
+    name: PLATFORM00
+    bmp: test.gif
+    bmp-rect: 64 0 32 24
+    bmp-offset: 0 24
+    pos: 8 28 0
+    size: 8 8 4
+}
+
+actor{
+    name: PLATFORM01
+    bmp: test.gif
+    bmp-rect: 64 0 32 24
+    bmp-offset: 0 24
+    pos: 16 28 0
+    size: 8 8 4
+}
+
+actor{
+    name: PLATFORM04
+    bmp: test.gif
+    bmp-rect: 64 0 32 24
+    bmp-offset: 0 24
+    pos: 40 28 0
+    size: 8 8 4
+}
+
+actor{
+    name: PLATFORM03
+    bmp: test.gif
+    bmp-rect: 64 0 32 24
+    bmp-offset: 0 24
+    pos: 48 28 0
+    size: 8 8 4
+}
diff --git a/data/old_rooms/01.txt b/data/old_rooms/01.txt
new file mode 100644
index 0000000..f0af2d3
--- /dev/null
+++ b/data/old_rooms/01.txt
@@ -0,0 +1,112 @@
+width: 2
+height: 2
+door-height-xp: 0
+door-height-yp: 0
+color: CYAN
+floor-texture: 9
+wall-texture: 3
+door-texture: 1
+under-door-texture: 0
+exit-xp: 0
+exit-yp: 3
+
+actor{
+    name: ARMARI01
+    bmp: caixes.gif
+    bmp-rect: 64 32 24 32
+    bmp-offset: -8 36
+    pos: 8 8 0
+    size: 8 4 5
+    movement: CW
+}
+
+actor{
+    name: TAULETA
+    bmp: caixes.gif
+    bmp-rect: 0 64 32 32
+    bmp-offset: 0 32
+    pos: 24 8 0
+    size: 8 8 5
+    movement: CW
+}
+
+actor{
+    name: S-SHOES
+    bmp: objectes.gif
+    bmp-rect: 162 0 28 22
+    bmp-offset: -3 24
+    pos: 48 8 0
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: SPECIAL 
+    movement: CW
+}
+
+actor{
+    name: TAULA01
+    bmp: caixes.gif
+    bmp-rect: 128 32 32 32
+    bmp-offset: 0 32
+    pos: 8 24 0
+    size: 8 8 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: TAULA02
+    bmp: caixes.gif
+    bmp-rect: 160 32 32 32
+    bmp-offset: 0 32
+    pos: 8 32 0
+    size: 8 8 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: ARMARI02
+    bmp: caixes.gif
+    bmp-rect: 96 32 24 32
+    bmp-offset: -8 36
+    pos: 8 8 8
+    size: 8 4 8
+    movement: CW
+}
+
+actor{
+    name: TV
+    bmp: caixes.gif
+    bmp-rect: 32 64 32 32
+    bmp-offset: 0 32
+    pos: 24 7 5
+    size: 8 5 8
+    orient: XP 
+    movement: CW
+}
+
+actor{
+    name: NES
+    bmp: caixes.gif
+    bmp-rect: 96 0 32 32
+    bmp-offset: 0 32
+    pos: 24 16 0
+    size: 8 8 6
+    flags: PICKABLE PUSHABLE GRAVITY 
+    movement: CW
+}
+
+actor{
+    name: ROOMBA
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 40 32 0
+    size: 8 8 4
+    orient: YP 
+    flags: MOVING DEADLY 
+    movement: Y
+}
diff --git a/data/rooms/02.txt b/data/old_rooms/02.txt
similarity index 100%
rename from data/rooms/02.txt
rename to data/old_rooms/02.txt
diff --git a/data/rooms/03.txt b/data/old_rooms/03.txt
similarity index 100%
rename from data/rooms/03.txt
rename to data/old_rooms/03.txt
diff --git a/data/rooms/04.txt b/data/old_rooms/04.txt
similarity index 100%
rename from data/rooms/04.txt
rename to data/old_rooms/04.txt
diff --git a/data/rooms/05.txt b/data/old_rooms/05.txt
similarity index 100%
rename from data/rooms/05.txt
rename to data/old_rooms/05.txt
diff --git a/data/rooms/06.txt b/data/old_rooms/06.txt
similarity index 100%
rename from data/rooms/06.txt
rename to data/old_rooms/06.txt
diff --git a/data/rooms/07.txt b/data/old_rooms/07.txt
similarity index 100%
rename from data/rooms/07.txt
rename to data/old_rooms/07.txt
diff --git a/data/rooms/08.txt b/data/old_rooms/08.txt
similarity index 100%
rename from data/rooms/08.txt
rename to data/old_rooms/08.txt
diff --git a/data/rooms/09.txt b/data/old_rooms/09.txt
similarity index 100%
rename from data/rooms/09.txt
rename to data/old_rooms/09.txt
diff --git a/data/rooms/10.txt b/data/old_rooms/10.txt
similarity index 100%
rename from data/rooms/10.txt
rename to data/old_rooms/10.txt
diff --git a/data/rooms/00.txt b/data/rooms/00.txt
index b6554fb..60400b2 100644
--- a/data/rooms/00.txt
+++ b/data/rooms/00.txt
@@ -1,57 +1,79 @@
-width: 2
+width: 3
 height: 1
-door-height-xp: 1
-door-height-xn: 1
+door-height-xp: 0
 color: CYAN
 floor-texture: 0
 wall-texture: 2
 door-texture: 0
 under-door-texture: 0
-exit-xp: 5
-exit-xn: 1
-exit-zn: 2
+exit-xp: 1
 
 actor{
-    name: PLATFORM02
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 16 20 0
+    name: MESITA
+    bmp: caixes.gif
+    bmp-rect: 0 64 32 32
+    bmp-offset: 0 32
+    pos: 0 16 0
     size: 8 8 4
+    movement: CW
 }
 
 actor{
-    name: PLATFORM00
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 8 28 0
-    size: 8 8 4
+    name: FINESTRA01
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 39
+    pos: 0 23 6
+    size: 1 1 9
+    movement: CW
 }
 
 actor{
-    name: PLATFORM01
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 16 28 0
-    size: 8 8 4
+    name: FINESTRA
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 39
+    pos: 0 30 6
+    size: 1 1 9
+    movement: CW
 }
 
 actor{
-    name: PLATFORM04
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 40 28 0
-    size: 8 8 4
+    name: LAMPARA
+    bmp: altres.gif
+    bmp-rect: 128 0 20 41
+    bmp-offset: -6 45
+    pos: 1 41 0
+    size: 6 6 16
+    movement: CW
 }
 
 actor{
-    name: PLATFORM03
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 48 28 0
-    size: 8 8 4
+    name: LLIT
+    bmp: altres.gif
+    bmp-rect: 48 0 57 47
+    bmp-offset: 11 32
+    pos: 8 16 0
+    size: 16 16 4
+    movement: CW
+}
+
+actor{
+    name: MESITA01
+    bmp: caixes.gif
+    bmp-rect: 0 64 32 32
+    bmp-offset: 0 32
+    pos: 24 16 0
+    size: 8 8 4
+    movement: CW
+}
+
+actor{
+    name: MANCUERNA
+    bmp: altres.gif
+    bmp-rect: 106 33 17 14
+    bmp-offset: -6 20
+    pos: 24 25 0
+    size: 6 4 2
+    movement: CW
 }
diff --git a/data/rooms/01.txt b/data/rooms/01.txt
index f0af2d3..0a72736 100644
--- a/data/rooms/01.txt
+++ b/data/rooms/01.txt
@@ -1,112 +1,35 @@
-width: 2
-height: 2
+width: 3
+height: 0
 door-height-xp: 0
+door-height-xn: 0
 door-height-yp: 0
-color: CYAN
-floor-texture: 9
-wall-texture: 3
-door-texture: 1
+color: WHITE
+floor-texture: 0
+wall-texture: 2
+door-texture: 0
 under-door-texture: 0
-exit-xp: 0
-exit-yp: 3
+exit-xn: 0
 
 actor{
-    name: ARMARI01
-    bmp: caixes.gif
-    bmp-rect: 64 32 24 32
-    bmp-offset: -8 36
-    pos: 8 8 0
-    size: 8 4 5
-    movement: CW
-}
-
-actor{
-    name: TAULETA
-    bmp: caixes.gif
-    bmp-rect: 0 64 32 32
-    bmp-offset: 0 32
-    pos: 24 8 0
-    size: 8 8 5
-    movement: CW
-}
-
-actor{
-    name: S-SHOES
-    bmp: objectes.gif
-    bmp-rect: 162 0 28 22
-    bmp-offset: -3 24
-    pos: 48 8 0
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: TAULA01
-    bmp: caixes.gif
-    bmp-rect: 128 32 32 32
-    bmp-offset: 0 32
-    pos: 8 24 0
-    size: 8 8 8
+    name: CUADRO
+    bmp: altres.gif
+    bmp-rect: 102 75 18 32
+    bmp-offset: 0 39
+    pos: 18 23 6
+    size: 1 1 9
     orient: YP 
     flags: ORIENTABLE 
     movement: CW
 }
 
 actor{
-    name: TAULA02
-    bmp: caixes.gif
-    bmp-rect: 160 32 32 32
-    bmp-offset: 0 32
-    pos: 8 32 0
-    size: 8 8 8
+    name: CUADRO01
+    bmp: altres.gif
+    bmp-rect: 66 75 18 32
+    bmp-offset: 0 39
+    pos: 42 23 6
+    size: 1 1 9
     orient: YP 
     flags: ORIENTABLE 
     movement: CW
 }
-
-actor{
-    name: ARMARI02
-    bmp: caixes.gif
-    bmp-rect: 96 32 24 32
-    bmp-offset: -8 36
-    pos: 8 8 8
-    size: 8 4 8
-    movement: CW
-}
-
-actor{
-    name: TV
-    bmp: caixes.gif
-    bmp-rect: 32 64 32 32
-    bmp-offset: 0 32
-    pos: 24 7 5
-    size: 8 5 8
-    orient: XP 
-    movement: CW
-}
-
-actor{
-    name: NES
-    bmp: caixes.gif
-    bmp-rect: 96 0 32 32
-    bmp-offset: 0 32
-    pos: 24 16 0
-    size: 8 8 6
-    flags: PICKABLE PUSHABLE GRAVITY 
-    movement: CW
-}
-
-actor{
-    name: ROOMBA
-    bmp: caixes.gif
-    bmp-rect: 160 0 32 32
-    bmp-offset: 0 34
-    pos: 40 32 0
-    size: 8 8 4
-    orient: YP 
-    flags: MOVING DEADLY 
-    movement: Y
-}
diff --git a/data/templates.txt b/data/templates.txt
index 2bcb5ab..b7e295d 100644
--- a/data/templates.txt
+++ b/data/templates.txt
@@ -172,9 +172,9 @@ actor{
     name: LLIT
     bmp: altres.gif
     bmp-rect: 48 0 57 47
-    bmp-offset: 12 33
-    pos: 16 0 0
-    size: 16 16 6
+    bmp-offset: 11 32
+    pos: 8 8 0
+    size: 16 16 8
     movement: CW
 }
 
@@ -221,3 +221,15 @@ actor{
     flags: ANIMATED 
     movement: CW
 }
+
+actor{
+    name: CUADRO
+    bmp: altres.gif
+    bmp-rect: 66 75 18 32
+    bmp-offset: 0 39
+    pos: 14 23 6
+    size: 1 1 9
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
diff --git a/source/room.cpp b/source/room.cpp
index 1857db7..ea942d6 100644
--- a/source/room.cpp
+++ b/source/room.cpp
@@ -7,7 +7,7 @@
 
 namespace room
 {
-    static int current_room = 1;
+    static int current_room = 0;
 
     static int inner_w = 2;
     static int inner_h = 2;