diff --git a/data/rooms/02.txt b/data/rooms/02.txt
index 52c0631..deebfc1 100644
--- a/data/rooms/02.txt
+++ b/data/rooms/02.txt
@@ -4,22 +4,12 @@ door-height-xn: 0
 door-height-yn: 0
 color: GREEN
 floor-texture: 0
-wall-texture: 0
+wall-texture: 2
 door-texture: 0
 under-door-texture: 0
 exit-xn: 1
 exit-yn: 3
 
-actor{
-    name: KALLAX-01
-    bmp: altres.gif
-    bmp-rect: 48 48 24 27
-    bmp-offset: 0 31
-    pos: 0 12 0
-    size: 4 8 8
-    movement: CW
-}
-
 actor{
     name: ARMARI-B1
     bmp: caixes.gif
@@ -40,6 +30,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: KALLAX-01
+    bmp: altres.gif
+    bmp-rect: 48 48 24 27
+    bmp-offset: 0 31
+    pos: 0 12 0
+    size: 4 8 8
+    movement: CW
+}
+
 actor{
     name: BOX01
     bmp: caixes.gif
@@ -51,6 +51,59 @@ actor{
     movement: CW
 }
 
+actor{
+    name: LLIT
+    bmp: altres.gif
+    bmp-rect: 48 0 57 47
+    bmp-offset: 11 32
+    pos: 40 8 0
+    size: 16 16 8
+    movement: CW
+}
+
+actor{
+    name: MESITA
+    bmp: caixes.gif
+    bmp-rect: 0 64 32 32
+    bmp-offset: 0 32
+    pos: 56 8 0
+    size: 8 8 4
+    movement: CW
+}
+
+actor{
+    name: ARMARI-B2
+    bmp: caixes.gif
+    bmp-rect: 96 32 24 32
+    bmp-offset: -8 36
+    pos: 4 8 8
+    size: 8 4 8
+    movement: CW
+}
+
+actor{
+    name: ARMARI-A2
+    bmp: caixes.gif
+    bmp-rect: 96 32 24 32
+    bmp-offset: -8 36
+    pos: 16 8 8
+    size: 8 4 8
+    movement: CW
+}
+
+actor{
+    name: BOOSTER
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 56 8 6
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
 actor{
     name: BOX
     bmp: caixes.gif
@@ -62,6 +115,19 @@ actor{
     movement: CW
 }
 
+actor{
+    name: ROOMBA-02
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 56 24 0
+    size: 8 8 2
+    orient: YP 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: CCW
+}
+
 actor{
     name: ROOMBA-01
     bmp: caixes.gif
@@ -85,26 +151,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: ARMARI-B2
-    bmp: caixes.gif
-    bmp-rect: 96 32 24 32
-    bmp-offset: -8 36
-    pos: 4 8 8
-    size: 8 4 8
-    movement: CW
-}
-
-actor{
-    name: ARMARI-A2
-    bmp: caixes.gif
-    bmp-rect: 96 32 24 32
-    bmp-offset: -8 36
-    pos: 16 8 8
-    size: 8 4 8
-    movement: CW
-}
-
 actor{
     name: PILOTA
     bmp: altres.gif
@@ -116,49 +162,3 @@ actor{
     flags: PUSHABLE INERTIA 
     movement: CCW
 }
-
-actor{
-    name: LLIT
-    bmp: altres.gif
-    bmp-rect: 48 0 57 47
-    bmp-offset: 11 32
-    pos: 40 8 0
-    size: 16 16 8
-    movement: CW
-}
-
-actor{
-    name: MESITA
-    bmp: caixes.gif
-    bmp-rect: 0 64 32 32
-    bmp-offset: 0 32
-    pos: 56 8 0
-    size: 8 8 4
-    movement: CW
-}
-
-actor{
-    name: ROOMBA-02
-    bmp: caixes.gif
-    bmp-rect: 160 0 32 32
-    bmp-offset: 0 34
-    pos: 56 24 0
-    size: 8 8 2
-    orient: YP 
-    flags: REACTIVE MOVING DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
-    movement: CCW
-}
-
-actor{
-    name: BOOSTER
-    bmp: objectes.gif
-    bmp-rect: 114 78 15 18
-    bmp-offset: -8 22
-    pos: 56 8 6
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
diff --git a/data/rooms/03.txt b/data/rooms/03.txt
index aeb17d2..7c76cac 100644
--- a/data/rooms/03.txt
+++ b/data/rooms/03.txt
@@ -3,7 +3,7 @@ height: 2
 door-height-xn: 0
 door-height-yp: 0
 color: CYAN
-floor-texture: 0
+floor-texture: 4
 wall-texture: 0
 door-texture: 0
 under-door-texture: 0
@@ -36,6 +36,18 @@ actor{
     movement: CW
 }
 
+actor{
+    name: KALLAX-A
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: -8 31
+    pos: 13 8 8
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
 actor{
     name: BOX
     bmp: test.gif
@@ -106,18 +118,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: KALLAX-A
-    bmp: altres.gif
-    bmp-rect: 0 48 24 27
-    bmp-offset: -8 31
-    pos: 13 8 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
 actor{
     name: KALLAX-A01
     bmp: altres.gif
diff --git a/data/rooms/05.txt b/data/rooms/05.txt
index 0a8c9c7..800423e 100644
--- a/data/rooms/05.txt
+++ b/data/rooms/05.txt
@@ -1,21 +1,106 @@
 width: 2
 height: 2
 door-height-xp: 0
-color: CYAN
-floor-texture: 0
+color: YELLOW
+floor-texture: 4
 wall-texture: 0
 door-texture: 0
 under-door-texture: 0
 exit-xp: 4
 
+actor{
+    name: KALLAX-A
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: 0 31
+    pos: 8 8 0
+    size: 8 4 8
+    movement: CW
+}
+
+actor{
+    name: FINESTRA
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 39
+    pos: 7 19 6
+    size: 1 1 9
+    movement: CW
+}
+
+actor{
+    name: FINESTRA01
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 39
+    pos: 7 26 6
+    size: 1 1 9
+    movement: CW
+}
+
+actor{
+    name: S-GLOVES
+    bmp: objectes.gif
+    bmp-rect: 165 45 28 22
+    bmp-offset: -3 24
+    pos: 8 20 0
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: SPECIAL 
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A02
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: 0 31
+    pos: 8 36 0
+    size: 8 4 8
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A01
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: 0 31
+    pos: 8 8 8
+    size: 8 4 8
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A03
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: 0 31
+    pos: 8 36 8
+    size: 8 4 8
+    movement: CW
+}
+
+actor{
+    name: WC
+    bmp: altres.gif
+    bmp-rect: 105 0 21 33
+    bmp-offset: -4 36
+    pos: 8 48 0
+    size: 8 8 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CCW
+}
+
 actor{
     name: ROOMBA
     bmp: caixes.gif
     bmp-rect: 160 0 32 32
     bmp-offset: 0 34
-    pos: 32 32 0
+    pos: 16 48 0
     size: 8 8 2
-    orient: XN 
+    orient: XP 
     flags: REACTIVE MOVING DEADLY 
     react-mask: XP XN YP YN ZP ZN 
     movement: CCW
@@ -26,7 +111,7 @@ actor{
     bmp: gat.gif
     bmp-rect: 0 0 24 28
     bmp-offset: -4 32
-    pos: 32 32 2
+    pos: 16 48 2
     size: 8 8 8
     orient: XP 
     anim-wait: 2
@@ -34,3 +119,141 @@ actor{
     react-mask: XP XN YP YN ZP ZN 
     movement: CCW
 }
+
+actor{
+    name: FINESTRA02
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 45
+    pos: 32 6 4
+    size: 0 1 9
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: FINESTRA03
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 45
+    pos: 39 6 4
+    size: 1 1 9
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: NEVERA104
+    bmp: caixes.gif
+    bmp-rect: 160 96 32 32
+    bmp-offset: 0 32
+    pos: 24 16 0
+    size: 8 8 8
+    orient: YP 
+    movement: CW
+}
+
+actor{
+    name: NEVERA103
+    bmp: caixes.gif
+    bmp-rect: 160 96 32 32
+    bmp-offset: 0 32
+    pos: 40 16 0
+    size: 8 8 8
+    orient: YP 
+    movement: CW
+}
+
+actor{
+    name: NEVERA105
+    bmp: caixes.gif
+    bmp-rect: 160 96 32 32
+    bmp-offset: 0 32
+    pos: 24 24 0
+    size: 8 8 8
+    orient: YP 
+    movement: CW
+}
+
+actor{
+    name: NEVERA1
+    bmp: caixes.gif
+    bmp-rect: 160 96 32 32
+    bmp-offset: 0 32
+    pos: 40 24 0
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: NEVERA106
+    bmp: caixes.gif
+    bmp-rect: 160 96 32 32
+    bmp-offset: 0 32
+    pos: 24 32 0
+    size: 8 8 8
+    orient: YP 
+    movement: CW
+}
+
+actor{
+    name: NEVERA101
+    bmp: caixes.gif
+    bmp-rect: 160 96 32 32
+    bmp-offset: 0 32
+    pos: 40 32 0
+    size: 8 8 8
+    orient: YP 
+    movement: CW
+}
+
+actor{
+    name: NEVERA107
+    bmp: caixes.gif
+    bmp-rect: 160 96 32 32
+    bmp-offset: 0 32
+    pos: 24 40 0
+    size: 8 8 8
+    orient: YP 
+    movement: CW
+}
+
+actor{
+    name: NEVERA102
+    bmp: caixes.gif
+    bmp-rect: 160 96 32 32
+    bmp-offset: 0 32
+    pos: 40 40 0
+    size: 8 8 8
+    orient: YP 
+    movement: CW
+}
+
+actor{
+    name: ROOMBA01
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 32 48 0
+    size: 8 8 2
+    orient: YN 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: Y
+}
+
+actor{
+    name: GAT-NEGRE01
+    bmp: gat2.gif
+    bmp-rect: 0 0 24 28
+    bmp-offset: -4 32
+    pos: 32 48 2
+    size: 8 8 8
+    orient: YP 
+    anim-wait: 2
+    flags: PUSHABLE REACTIVE ORIENTABLE DEADLY GRAVITY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: Y
+}