diff --git a/maps/basic_setup.tscn b/maps/basic_setup.tscn
index 2d209cb..de40fa2 100644
--- a/maps/basic_setup.tscn
+++ b/maps/basic_setup.tscn
@@ -1,14 +1,14 @@
 [gd_scene load_steps=26 format=3 uid="uid://b8p2h0rmwy7qn"]
 
+[ext_resource type="Shader" path="res://maps/shaders/khanat_sky.gdshader" id="1_a4n7v"]
 [ext_resource type="Material" uid="uid://dpegsmygxcfmv" path="res://maps/materials/basic_ground.material" id="1_lodye"]
-[ext_resource type="Shader" path="res://maps/shaders/khanat_sky.gdshader" id="1_mheqi"]
-[ext_resource type="Texture2D" uid="uid://b5jer2nm17ld" path="res://maps/textures/samayun_tex_001.png" id="1_thm7k"]
 [ext_resource type="PackedScene" uid="uid://cveshwnu272vf" path="res://maps/objects/ramp-complex.tscn" id="2_4eueh"]
-[ext_resource type="Texture2D" uid="uid://y0ka7tysfp6b" path="res://maps/textures/zabr_tex_001.png" id="3_bgghj"]
+[ext_resource type="Texture2D" uid="uid://b5jer2nm17ld" path="res://maps/textures/samayun_tex_001.png" id="2_71cj5"]
 [ext_resource type="PackedScene" uid="uid://omess6wwwwcq" path="res://maps/objects/ramp-moving.tscn" id="3_bvbgo"]
-[ext_resource type="Texture2D" uid="uid://dlxp52r0wnwlq" path="res://maps/textures/stigi_tex_001.png" id="3_jqgsm"]
 [ext_resource type="PackedScene" uid="uid://dvsl8x3lb1h4e" path="res://maps/objects/moutain.tscn" id="3_rbp35"]
+[ext_resource type="Texture2D" uid="uid://dlxp52r0wnwlq" path="res://maps/textures/stigi_tex_001.png" id="3_sqlsl"]
 [ext_resource type="PackedScene" path="res://maps/objects/cave.tscn" id="4_pc85h"]
+[ext_resource type="Texture2D" uid="uid://y0ka7tysfp6b" path="res://maps/textures/zabr_tex_001.png" id="4_prrki"]
 [ext_resource type="PackedScene" uid="uid://b61edh0bre65c" path="res://maps/objects/ramp.tscn" id="5_dfm8h"]
 [ext_resource type="PackedScene" uid="uid://bl1widitqdugs" path="res://maps/objects/obstacles.tscn" id="5_mi3we"]
 [ext_resource type="PackedScene" uid="uid://clmlpy36ghsio" path="res://maps/water-zone.tscn" id="6_0o80c"]
@@ -21,8 +21,8 @@
 [ext_resource type="PackedScene" uid="uid://uyxppgx6n0ws" path="res://maps/objects/ashtarie-bench.tscn" id="15_k5x3t"]
 [ext_resource type="PackedScene" uid="uid://b68g7ddc1uaw4" path="res://maps/ryzom_matis_appartment.tscn" id="20_66hq8"]
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_s2q0l"]
-shader = ExtResource("1_mheqi")
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_xar75"]
+shader = ExtResource("1_a4n7v")
 shader_parameter/dither_strength = 1.0
 shader_parameter/exposure = 0.1
 shader_parameter/ground_color = Color(0.1, 0.07, 0.034, 1)
@@ -31,28 +31,31 @@ shader_parameter/mie_color = Color(0.69, 0.729, 0.812, 1)
 shader_parameter/mie_eccentricity = 0.8
 shader_parameter/rayleigh = 2.0
 shader_parameter/rayleigh_color = Color(0.3, 0.405, 0.6, 1)
-shader_parameter/samayun = ExtResource("1_thm7k")
-shader_parameter/samayun_arc = 45.681
-shader_parameter/samayun_position = Vector3(2.038, 0.695, -0.237)
-shader_parameter/stigi = ExtResource("3_jqgsm")
-shader_parameter/stigi_arc = 8.381
-shader_parameter/stigi_position = Vector3(1.209, 0.444, 0.332)
+shader_parameter/samayun = ExtResource("2_71cj5")
+shader_parameter/samayun_arc = 45.0
+shader_parameter/samayun_position = Vector3(0.163, 0.066, -0.014)
+shader_parameter/stigi = ExtResource("3_sqlsl")
+shader_parameter/stigi_arc = 8.0
+shader_parameter/stigi_position = Vector3(0.025, 0.004, 0.007)
 shader_parameter/sun_disk_scale = 1.0
 shader_parameter/turbidity = 10.0
-shader_parameter/zabr = ExtResource("3_bgghj")
-shader_parameter/zabr_arc = 8.0
-shader_parameter/zabr_position = Vector3(1.755, 0.599, 0.613)
+shader_parameter/zabr = ExtResource("4_prrki")
+shader_parameter/zabr_arc = 15.0
+shader_parameter/zabr_position = Vector3(0.368, 0.239, 0.174)
 
-[sub_resource type="Sky" id="Sky_fa16p"]
-sky_material = SubResource("ShaderMaterial_s2q0l")
+[sub_resource type="Sky" id="Sky_dnn6c"]
+sky_material = SubResource("ShaderMaterial_xar75")
 
-[sub_resource type="Environment" id="Environment_n5kgx"]
+[sub_resource type="Environment" id="Environment_n1e0i"]
 background_mode = 2
-sky = SubResource("Sky_fa16p")
-volumetric_fog_enabled = true
-volumetric_fog_density = 0.0
-volumetric_fog_emission = Color(0.407843, 0.415686, 0.439216, 1)
-volumetric_fog_detail_spread = 1.60766
+sky = SubResource("Sky_dnn6c")
+ambient_light_source = 1
+ambient_light_color = Color(1, 1, 1, 1)
+ssr_enabled = true
+ssao_enabled = true
+ssil_enabled = true
+sdfgi_enabled = true
+glow_enabled = true
 
 [sub_resource type="BoxMesh" id="BoxMesh_k23th"]
 material = ExtResource("1_lodye")
@@ -62,14 +65,8 @@ data = PackedVector3Array(-0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0
 
 [node name="basic_setup" type="Node3D"]
 
-[node name="sunlight" type="DirectionalLight3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 0.278991, 0.960294, 0, -0.960294, 0.278991, -1.75049, 15.9707, 4.39927)
-light_color = Color(0.988235, 0.960784, 1, 1)
-light_energy = 0.75
-shadow_enabled = true
-
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("Environment_n5kgx")
+environment = SubResource("Environment_n1e0i")
 
 [node name="floor" type="MeshInstance3D" parent="."]
 transform = Transform3D(80, 0, 0, 0, 0.1, 0, 0, 0, 80, 0, 0, 0)
@@ -190,3 +187,7 @@ transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, -17.8, 0,
 
 [node name="ryzom_matis_appartment" parent="." instance=ExtResource("20_66hq8")]
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 52, 0, 25)
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -1.36603, 20.049, 5.37917)
+shadow_enabled = true
diff --git a/maps/ryzom_matis_appartment.tscn b/maps/ryzom_matis_appartment.tscn
index cf46c1d..f4538ea 100644
--- a/maps/ryzom_matis_appartment.tscn
+++ b/maps/ryzom_matis_appartment.tscn
@@ -1,14 +1,109 @@
-[gd_scene load_steps=2 format=3 uid="uid://b68g7ddc1uaw4"]
+[gd_scene load_steps=5 format=3 uid="uid://b68g7ddc1uaw4"]
 
 [ext_resource type="PackedScene" uid="uid://dkykwxrhvnl2o" path="res://maps/imports/ryzom_matis_appartment.gltf" id="1_01gqk"]
 
+[sub_resource type="Environment" id="Environment_lo4f7"]
+ambient_light_source = 1
+ambient_light_energy = 0.0
+ssao_enabled = true
+sdfgi_enabled = true
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ao8f0"]
+
+[sub_resource type="QuadMesh" id="QuadMesh_2egg3"]
+material = SubResource("StandardMaterial3D_ao8f0")
+
 [node name="ryzom_matis_appartment" instance=ExtResource("1_01gqk")]
 
-[node name="StaticBody3D" parent="ma_asc_porte_right_" index="0"]
-visible = false
+[node name="WorldEnvironment" type="WorldEnvironment" parent="." index="0"]
+environment = SubResource("Environment_lo4f7")
 
-[node name="StaticBody3D" parent="ma_asc_porte_left_" index="0"]
-visible = false
+[node name="roof" type="MeshInstance3D" parent="." index="1"]
+transform = Transform3D(-28, -7.00962e-06, -2.44784e-06, -2.44784e-06, 1.22392e-06, 28, -7.00962e-06, 28, -1.22392e-06, 8.81891e-07, 11.681, 5.10593e-07)
+mesh = SubResource("QuadMesh_2egg3")
 
-[node name="StaticBody3D" parent="ma_asc_porte_bas_" index="0"]
-visible = false
+[node name="OmniLight3D" type="OmniLight3D" parent="." index="2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.03403, 1.08759, 10.2635)
+light_color = Color(1, 0.917647, 0.560784, 1)
+shadow_enabled = true
+shadow_reverse_cull_face = true
+shadow_blur = 3.374
+omni_range = 5.149
+omni_attenuation = 0.287174
+
+[node name="SpotLight3D" type="SpotLight3D" parent="." index="3"]
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7.2776, 9.17543, -5.03814)
+shadow_enabled = true
+shadow_reverse_cull_face = true
+shadow_blur = 2.579
+spot_range = 12.001
+spot_attenuation = 0.203063
+
+[node name="ma_room" parent="." index="4"]
+layers = 1024
+
+[node name="ma_room_lance_" parent="." index="5"]
+layers = 1024
+
+[node name="ma_room_banniere_03_" parent="." index="6"]
+layers = 1024
+
+[node name="ma_room_banniere_04_" parent="." index="7"]
+layers = 1024
+
+[node name="ma_room_plantes_" parent="." index="8"]
+layers = 1024
+
+[node name="ma_room_plant_Lass01_" parent="." index="9"]
+layers = 1024
+
+[node name="ma_room_plant_Lass_" parent="." index="10"]
+layers = 1024
+
+[node name="ma_room_palm_" parent="." index="11"]
+layers = 1024
+
+[node name="ma_room_banniere_02_" parent="." index="12"]
+layers = 1024
+
+[node name="ma_room_chest_" parent="." index="13"]
+layers = 1024
+
+[node name="ma_room_bed_" parent="." index="14"]
+layers = 1024
+
+[node name="ma_room_banniere_00_" parent="." index="15"]
+layers = 1024
+
+[node name="ma_room_banniere_01_" parent="." index="16"]
+layers = 1024
+
+[node name="ma_room_flower_" parent="." index="17"]
+layers = 1024
+
+[node name="ma_room_table_00_" parent="." index="18"]
+layers = 1024
+
+[node name="ma_room_chair_02_" parent="." index="19"]
+layers = 1024
+
+[node name="ma_room_chair_01_" parent="." index="20"]
+layers = 1024
+
+[node name="ma_room_chair_00_" parent="." index="21"]
+layers = 1024
+
+[node name="ma_room_table_01_" parent="." index="22"]
+layers = 1024
+
+[node name="ma_room_armoire_" parent="." index="23"]
+layers = 1024
+
+[node name="ma_asc_porte_right_" parent="." index="24"]
+layers = 1025
+
+[node name="ma_asc_porte_left_" parent="." index="25"]
+layers = 1025
+
+[node name="ma_asc_porte_bas_" parent="." index="26"]
+layers = 1025