diff --git a/HEADS b/HEADS
index cea0c20..4121341 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "a76316c0f06ef63f9b818d1ee8fd8771f73e4f3f"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "61cb76bc4ad720ebac994caf8cf7cf2f9dab6b59"}}
\ No newline at end of file
+{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "a76316c0f06ef63f9b818d1ee8fd8771f73e4f3f"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "54643bc1fc76248bc03d5ecdaaaa4c10616a2f61"}}
\ No newline at end of file
diff --git a/game/scenes/DungeonLevel.gd b/game/scenes/DungeonLevel.gd
index 38730c3..b42f460 100644
--- a/game/scenes/DungeonLevel.gd
+++ b/game/scenes/DungeonLevel.gd
@@ -52,7 +52,7 @@ var entrance_position : Transform2D = Transform2D()
 var player_visibility_array : Array = Array()
 
 onready var tile_map : = $Terrarin
-onready var visibility_map : RTileMap = $VisibilityMap
+onready var visibility_map : TileMap = $VisibilityMap
 
 func _ready():
 	if Engine.editor_hint:
diff --git a/game/tilesets/Visibility_map/vis_16x16.tres b/game/tilesets/Visibility_map/vis_16x16.tres
index aa978c3..e91c5f7 100644
--- a/game/tilesets/Visibility_map/vis_16x16.tres
+++ b/game/tilesets/Visibility_map/vis_16x16.tres
@@ -1,4 +1,4 @@
-[gd_resource type="RTileSet" load_steps=2 format=2]
+[gd_resource type="TileSet" load_steps=2 format=2]
 
 [ext_resource path="res://tilesets/Visibility_map/16_16.png" type="Texture" id=1]
 
diff --git a/game/tilesets/Visibility_map/vis_32x32.tres b/game/tilesets/Visibility_map/vis_32x32.tres
index 4d5e168..cd90f59 100644
--- a/game/tilesets/Visibility_map/vis_32x32.tres
+++ b/game/tilesets/Visibility_map/vis_32x32.tres
@@ -1,4 +1,4 @@
-[gd_resource type="RTileSet" load_steps=2 format=2]
+[gd_resource type="TileSet" load_steps=2 format=2]
 
 [ext_resource path="res://tilesets/Visibility_map/32_32.png" type="Texture" id=1]
 
diff --git a/game/tilesets/Visibility_map/vis_8x8.tres b/game/tilesets/Visibility_map/vis_8x8.tres
index 0688315..ffc3a1d 100644
--- a/game/tilesets/Visibility_map/vis_8x8.tres
+++ b/game/tilesets/Visibility_map/vis_8x8.tres
@@ -1,4 +1,4 @@
-[gd_resource type="RTileSet" load_steps=2 format=2]
+[gd_resource type="TileSet" load_steps=2 format=2]
 
 [ext_resource path="res://tilesets/Visibility_map/8_8.png" type="Texture" id=1]
 
diff --git a/game/tilesets/dc_32x32/dc_32x32_world.tscn b/game/tilesets/dc_32x32/dc_32x32_world.tscn
index e2c14bc..db86d16 100644
--- a/game/tilesets/dc_32x32/dc_32x32_world.tscn
+++ b/game/tilesets/dc_32x32/dc_32x32_world.tscn
@@ -2,20 +2,20 @@
 
 [ext_resource path="res://scenes/DungeonLevel.gd" type="Script" id=1]
 [ext_resource path="res://world/WorldLayer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://tilesets/dc_32x32/tileset.tres" type="RTileSet" id=3]
-[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="RTileSet" id=4]
+[ext_resource path="res://tilesets/dc_32x32/tileset.tres" type="TileSet" id=3]
+[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="TileSet" id=4]
 
 [node name="World" type="Node2D"]
 script = ExtResource( 1 )
 world_layer = ExtResource( 2 )
 
-[node name="Terrarin" type="RTileMap" parent="."]
+[node name="Terrarin" type="TileMap" parent="."]
 z_index = -10
 tile_set = ExtResource( 3 )
 cell_size = Vector2( 32, 32 )
 format = 1
 
-[node name="VisibilityMap" type="RTileMap" parent="."]
+[node name="VisibilityMap" type="TileMap" parent="."]
 tile_set = ExtResource( 4 )
 cell_size = Vector2( 32, 32 )
 format = 1
diff --git a/game/tilesets/dc_32x32/tileset.tres b/game/tilesets/dc_32x32/tileset.tres
index 5963327..3f4e267 100644
--- a/game/tilesets/dc_32x32/tileset.tres
+++ b/game/tilesets/dc_32x32/tileset.tres
@@ -1,4 +1,4 @@
-[gd_resource type="RTileSet" load_steps=3 format=2]
+[gd_resource type="TileSet" load_steps=3 format=2]
 
 [ext_resource path="res://tilesets/dc_32x32/DungeonCrawl_ProjectUtumnoTileset.png" type="Texture" id=1]
 
diff --git a/game/tilesets/denzi_32x32_orthogonal/denzi_32x32_orthogonal_world.tscn b/game/tilesets/denzi_32x32_orthogonal/denzi_32x32_orthogonal_world.tscn
index 8896763..f522e5e 100644
--- a/game/tilesets/denzi_32x32_orthogonal/denzi_32x32_orthogonal_world.tscn
+++ b/game/tilesets/denzi_32x32_orthogonal/denzi_32x32_orthogonal_world.tscn
@@ -2,20 +2,20 @@
 
 [ext_resource path="res://scenes/DungeonLevel.gd" type="Script" id=1]
 [ext_resource path="res://world/WorldLayer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://tilesets/denzi_32x32_orthogonal/new_tileset.tres" type="RTileSet" id=3]
-[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="RTileSet" id=4]
+[ext_resource path="res://tilesets/denzi_32x32_orthogonal/new_tileset.tres" type="TileSet" id=3]
+[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="TileSet" id=4]
 
 [node name="World" type="Node2D"]
 script = ExtResource( 1 )
 world_layer = ExtResource( 2 )
 
-[node name="Terrarin" type="RTileMap" parent="."]
+[node name="Terrarin" type="TileMap" parent="."]
 z_index = -10
 tile_set = ExtResource( 3 )
 cell_size = Vector2( 32, 32 )
 format = 1
 
-[node name="VisibilityMap" type="RTileMap" parent="."]
+[node name="VisibilityMap" type="TileMap" parent="."]
 tile_set = ExtResource( 4 )
 cell_size = Vector2( 32, 32 )
 format = 1
diff --git a/game/tilesets/denzi_32x32_orthogonal/new_tileset.tres b/game/tilesets/denzi_32x32_orthogonal/new_tileset.tres
index a05f92b..04c6352 100644
--- a/game/tilesets/denzi_32x32_orthogonal/new_tileset.tres
+++ b/game/tilesets/denzi_32x32_orthogonal/new_tileset.tres
@@ -1,4 +1,4 @@
-[gd_resource type="RTileSet" load_steps=3 format=2]
+[gd_resource type="TileSet" load_steps=3 format=2]
 
 [ext_resource path="res://tilesets/denzi_32x32_orthogonal/32x32_terrain_Denzi110115-4.png" type="Texture" id=1]
 
diff --git a/game/tilesets/denzi_public_domain/denzi_public_domain_world.tscn b/game/tilesets/denzi_public_domain/denzi_public_domain_world.tscn
index 0499672..fe4996d 100644
--- a/game/tilesets/denzi_public_domain/denzi_public_domain_world.tscn
+++ b/game/tilesets/denzi_public_domain/denzi_public_domain_world.tscn
@@ -2,21 +2,21 @@
 
 [ext_resource path="res://scenes/DungeonLevel.gd" type="Script" id=1]
 [ext_resource path="res://world/WorldLayer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://tilesets/denzi_public_domain/new_tilesetr.tres" type="RTileSet" id=3]
-[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="RTileSet" id=4]
+[ext_resource path="res://tilesets/denzi_public_domain/new_tilesetr.tres" type="TileSet" id=3]
+[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="TileSet" id=4]
 
 [node name="World" type="Node2D"]
 script = ExtResource( 1 )
 world_layer = ExtResource( 2 )
 
-[node name="Terrarin" type="RTileMap" parent="."]
+[node name="Terrarin" type="TileMap" parent="."]
 z_index = -10
 use_rao = false
 tile_set = ExtResource( 3 )
 cell_size = Vector2( 32, 32 )
 format = 1
 
-[node name="VisibilityMap" type="RTileMap" parent="."]
+[node name="VisibilityMap" type="TileMap" parent="."]
 tile_set = ExtResource( 4 )
 cell_size = Vector2( 32, 32 )
 format = 1
diff --git a/game/tilesets/denzi_public_domain/new_tileset.tres b/game/tilesets/denzi_public_domain/new_tileset.tres
index e77fb57..5445857 100644
--- a/game/tilesets/denzi_public_domain/new_tileset.tres
+++ b/game/tilesets/denzi_public_domain/new_tileset.tres
@@ -1,4 +1,4 @@
-[gd_resource type="RTileSet" load_steps=2 format=2]
+[gd_resource type="TileSet" load_steps=2 format=2]
 
 [ext_resource path="res://tilesets/denzi_public_domain/DENZI_CC0_32x32_tileset.png" type="Texture" id=1]
 
diff --git a/game/tilesets/denzi_public_domain/new_tilesetr.tres b/game/tilesets/denzi_public_domain/new_tilesetr.tres
index b447b6c..d327990 100644
--- a/game/tilesets/denzi_public_domain/new_tilesetr.tres
+++ b/game/tilesets/denzi_public_domain/new_tilesetr.tres
@@ -1,4 +1,4 @@
-[gd_resource type="RTileSet" load_steps=3 format=2]
+[gd_resource type="TileSet" load_steps=3 format=2]
 
 [ext_resource path="res://tilesets/denzi_public_domain/DENZI_CC0_32x32_tileset.png" type="Texture" id=1]
 
diff --git a/game/tilesets/tileset.tres b/game/tilesets/tileset.tres
index 386f072..6af0aba 100644
--- a/game/tilesets/tileset.tres
+++ b/game/tilesets/tileset.tres
@@ -1,4 +1,4 @@
-[gd_resource type="RTileSet" load_steps=5 format=2]
+[gd_resource type="TileSet" load_steps=5 format=2]
 
 [ext_resource path="res://tilesets/tiles.png" type="Texture" id=1]
 
diff --git a/game/world/WorldLayer.tscn b/game/world/WorldLayer.tscn
index 43ee39b..e83b876 100644
--- a/game/world/WorldLayer.tscn
+++ b/game/world/WorldLayer.tscn
@@ -1,12 +1,12 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://tilesets/tileset.tres" type="RTileSet" id=1]
+[ext_resource path="res://tilesets/tileset.tres" type="TileSet" id=1]
 [ext_resource path="res://world/WorldLayer.gd" type="Script" id=2]
 
 [node name="WorldLayer" type="Navigation2D"]
 script = ExtResource( 2 )
 
-[node name="Terrarin" type="RTileMap" parent="."]
+[node name="Terrarin" type="TileMap" parent="."]
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 32, 32 )
 format = 1