diff --git a/workspace/common/characters/directories.py b/workspace/common/characters/directories.py
index 9c1ab36..8285ac7 100644
--- a/workspace/common/characters/directories.py
+++ b/workspace/common/characters/directories.py
@@ -120,7 +120,7 @@ IgLookupDirectories = [ ]
 
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
-ShapeLookupDirectories += [ CommonPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ CommonPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ CommonPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories used by shape
@@ -164,6 +164,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 # Shape directories
 ShapeShadowSkinBuildDirectory = CommonPath + "/shape_shadow_skin_build"
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/common/construction/directories.py b/workspace/common/construction/directories.py
index e759988..27d7054 100644
--- a/workspace/common/construction/directories.py
+++ b/workspace/common/construction/directories.py
@@ -78,7 +78,7 @@ IgLookupDirectories += [ CommonPath + "/ig_other" ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 # ShapeLookupDirectories += [ CommonPath + "/ps" ]
-ShapeLookupDirectories += [ CommonPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ CommonPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ CommonPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -91,7 +91,7 @@ PropertiesExportBuildSearchPaths = [ ]
 PropertiesExportBuildSearchPaths += ShapeLookupDirectories
 PropertiesExportBuildSearchPaths += MapLookupDirectories
 PropertiesExportBuildSearchPaths += [ "common/sfx/ps" ]
-PropertiesExportBuildSearchPaths += [ "common/sfx/shape_clodtex_build" ]
+PropertiesExportBuildSearchPaths += [ "common/sfx/shape_optimized" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/shape_with_coarse_mesh" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/map_export" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/map_uncompressed" ]
@@ -136,6 +136,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/common/construction/process.py b/workspace/common/construction/process.py
index 29a5066..2b90f1e 100644
--- a/workspace/common/construction/process.py
+++ b/workspace/common/construction/process.py
@@ -94,10 +94,10 @@ LandscapeName = ""
 # *** LIGO OPTIONS ***
 LigoExportLand = ""
 LigoExportOnePass = 0
-LigoExportColormap = "colormap_invalid.png"
-LigoExportHeightmap1 = "big_invalid.png"
+LigoExportColormap = "colormap_invalid.tga"
+LigoExportHeightmap1 = "big_invalid.tga"
 LigoExportZFactor1 = "1.0"
-LigoExportHeightmap2 = "noise_invalid.png"
+LigoExportHeightmap2 = "noise_invalid.tga"
 LigoExportZFactor2 = "0.5"
 LigoTileBankFile = ""
 
diff --git a/workspace/common/exedll/directories.py b/workspace/common/exedll/directories.py
index 6adcf79..d6af410 100644
--- a/workspace/common/exedll/directories.py
+++ b/workspace/common/exedll/directories.py
@@ -105,11 +105,11 @@ CopyWindowsExeDllCfgSourceFiles += [ "wwwzip.dll" ]
 CopyWindowsExeDllCfgSourceFiles += [ "client_default.cfg" ]
 
 CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_direct3d_win_r.dll" ]
+CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_dsound_win_r.dll" ]
+CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_fmod_win_r.dll" ]
+CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_openal_win_r.dll" ]
 CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_opengl_win_r.dll" ]
 CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_opengl3_win_r.dll" ]
-CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_dsound_win_r.dll" ]
-CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_openal_win_r.dll" ]
-CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_fmod_win_r.dll" ]
 CopyWindowsExeDllCfgSourceFiles += [ "nel_drv_xaudio2_win_r.dll" ]
 
 CopyWindowsExeDllCfgSourceFiles += [ "client_ryzom_r.exe" ]
diff --git a/workspace/common/fauna/directories.py b/workspace/common/fauna/directories.py
index 5ffd467..7125650 100644
--- a/workspace/common/fauna/directories.py
+++ b/workspace/common/fauna/directories.py
@@ -223,7 +223,7 @@ IgLookupDirectories = [ ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 # ShapeLookupDirectories += [ CommonPath + "/ps" ]
-ShapeLookupDirectories += [ CommonPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ CommonPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ CommonPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -273,6 +273,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 # Shape directories
 ShapeShadowSkinBuildDirectory = CommonPath + "/shape_shadow_skin_build"
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/common/objects/directories.py b/workspace/common/objects/directories.py
index 109ba59..54d5a5f 100644
--- a/workspace/common/objects/directories.py
+++ b/workspace/common/objects/directories.py
@@ -64,7 +64,7 @@ IgLookupDirectories = [ ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 # ShapeLookupDirectories += [ CommonPath + "/ps" ]
-ShapeLookupDirectories += [ CommonPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ CommonPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ CommonPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -99,6 +99,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/common/outgame/directories.py b/workspace/common/outgame/directories.py
index 80ba381..74c2ebb 100644
--- a/workspace/common/outgame/directories.py
+++ b/workspace/common/outgame/directories.py
@@ -78,7 +78,7 @@ IgLookupDirectories += [ CommonPath + "/ig_other" ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 # ShapeLookupDirectories += [ CommonPath + "/ps" ]
-ShapeLookupDirectories += [ CommonPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ CommonPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ CommonPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -91,7 +91,7 @@ PropertiesExportBuildSearchPaths = [ ]
 PropertiesExportBuildSearchPaths += ShapeLookupDirectories
 PropertiesExportBuildSearchPaths += MapLookupDirectories
 PropertiesExportBuildSearchPaths += [ "common/sfx/ps" ]
-PropertiesExportBuildSearchPaths += [ "common/sfx/shape_clodtex_build" ]
+PropertiesExportBuildSearchPaths += [ "common/sfx/shape_optimized" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/shape_with_coarse_mesh" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/map_export" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/map_uncompressed" ]
@@ -136,6 +136,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/common/outgame/process.py b/workspace/common/outgame/process.py
index fcef5bd..d840108 100644
--- a/workspace/common/outgame/process.py
+++ b/workspace/common/outgame/process.py
@@ -94,10 +94,10 @@ LandscapeName = ""
 # *** LIGO OPTIONS ***
 LigoExportLand = ""
 LigoExportOnePass = 0
-LigoExportColormap = "colormap_invalid.png"
-LigoExportHeightmap1 = "big_invalid.png"
+LigoExportColormap = "colormap_invalid.tga"
+LigoExportHeightmap1 = "big_invalid.tga"
 LigoExportZFactor1 = "1.0"
-LigoExportHeightmap2 = "noise_invalid.png"
+LigoExportHeightmap2 = "noise_invalid.tga"
 LigoExportZFactor2 = "0.5"
 LigoTileBankFile = ""
 
diff --git a/workspace/common/sfx/directories.py b/workspace/common/sfx/directories.py
index d2397ce..133e18e 100644
--- a/workspace/common/sfx/directories.py
+++ b/workspace/common/sfx/directories.py
@@ -68,7 +68,7 @@ IgLookupDirectories = [ ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 ShapeLookupDirectories += [ CommonPath + "/ps" ]
-ShapeLookupDirectories += [ CommonPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ CommonPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ CommonPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -106,6 +106,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/common/sky/directories.py b/workspace/common/sky/directories.py
index 539bbf3..7858f0b 100644
--- a/workspace/common/sky/directories.py
+++ b/workspace/common/sky/directories.py
@@ -91,7 +91,7 @@ IgLookupDirectories += [ CommonPath + "/ig_other" ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 # ShapeLookupDirectories += [ CommonPath + "/ps" ]
-ShapeLookupDirectories += [ CommonPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ CommonPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ CommonPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -104,7 +104,7 @@ PropertiesExportBuildSearchPaths = [ ]
 PropertiesExportBuildSearchPaths += ShapeLookupDirectories
 PropertiesExportBuildSearchPaths += MapLookupDirectories
 PropertiesExportBuildSearchPaths += [ "common/sfx/ps" ]
-PropertiesExportBuildSearchPaths += [ "common/sfx/shape_clodtex_build" ]
+PropertiesExportBuildSearchPaths += [ "common/sfx/shape_optimized" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/shape_with_coarse_mesh" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/map_export" ]
 PropertiesExportBuildSearchPaths += [ "common/sfx/map_uncompressed" ]
@@ -153,6 +153,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/common/sky/process.py b/workspace/common/sky/process.py
index fcbf820..6ba715f 100644
--- a/workspace/common/sky/process.py
+++ b/workspace/common/sky/process.py
@@ -99,10 +99,10 @@ LandscapeName = ""
 # *** LIGO OPTIONS ***
 LigoExportLand = ""
 LigoExportOnePass = 0
-LigoExportColormap = "colormap_invalid.png"
-LigoExportHeightmap1 = "big_invalid.png"
+LigoExportColormap = "colormap_invalid.tga"
+LigoExportHeightmap1 = "big_invalid.tga"
 LigoExportZFactor1 = "1.0"
-LigoExportHeightmap2 = "noise_invalid.png"
+LigoExportHeightmap2 = "noise_invalid.tga"
 LigoExportZFactor2 = "0.5"
 LigoTileBankFile = ""
 
diff --git a/workspace/continents/fyros/directories.py b/workspace/continents/fyros/directories.py
index 7ca2c5e..5174c3e 100644
--- a/workspace/continents/fyros/directories.py
+++ b/workspace/continents/fyros/directories.py
@@ -46,17 +46,17 @@ ContinentLeveldesignWorldDirectory = ContinentName
 # Shape directories
 ShapeSourceDirectories = [ ]
 ShapeSourceDirectories += [ "stuff/fyros/decors/constructions" ]
+ShapeSourceDirectories += [ "stuff/" + ContinentName + "/sky" ]
+ShapeSourceDirectories += [ "landscape/water/meshes/" + EcosystemName ]
 ShapeSourceDirectories += [ "stuff/fyros/city" ]
-ShapeSourceDirectories += [ "stuff/fyros/sky" ]
-ShapeSourceDirectories += [ "landscape/water/meshes/desert" ]
 ShapeSourceDirectories += [ "stuff/fyros/decors/constructions/fy_cn_mairie" ]
 
 # Maps directories
 MapSourceDirectories = [ ]
 MapSourceDirectories += [ "stuff/fyros/decors/_textures/batiments" ]
+MapSourceDirectories += [ "stuff/" + ContinentName + "/sky" ]
+MapSourceDirectories += [ "landscape/water/meshes/" + EcosystemName ]
 MapSourceDirectories += [ "stuff/fyros/city/_textures" ]
-MapSourceDirectories += [ "stuff/fyros/sky" ]
-MapSourceDirectories += [ "landscape/water/meshes/desert" ]
 MapUncompressedSourceDirectories = [ ]
 
 
@@ -65,15 +65,17 @@ MapUncompressedSourceDirectories = [ ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 ShapeLookupDirectories += [ "common/sfx/ps" ]
-ShapeLookupDirectories += [ "common/sfx/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/sfx/shape_optimized" ]
 ShapeLookupDirectories += [ "common/sfx/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "common/construction/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/construction/shape_optimized" ]
 ShapeLookupDirectories += [ "common/construction/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ ContinentPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ ContinentPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ ContinentPath + "/shape_with_coarse_mesh" ]
 # ShapeLookupDirectories += [ ContinentName + "/zone_light/water_shapes_lighted" ] huh?
+ShapeLookupDirectories += [ "ecosystems/lacustre/shape_optimized" ] # additional
+ShapeLookupDirectories += [ "ecosystems/lacustre/shape_with_coarse_mesh" ] # additional
 
 # Map lookup directories used by shape
 MapLookupDirectories = [ ]
@@ -85,6 +87,8 @@ MapLookupDirectories += [ EcosystemPath + "/map_export" ]
 MapLookupDirectories += [ EcosystemPath + "/map_uncompressed" ]
 MapLookupDirectories += [ ContinentPath + "/map_export" ]
 MapLookupDirectories += [ ContinentPath + "/map_uncompressed" ]
+MapLookupDirectories += [ "ecosystems/lacustre/map_export" ] # additional
+MapLookupDirectories += [ "ecosystems/lacustre/map_uncompressed" ] # additional
 
 
 # *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE ***
@@ -113,6 +117,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/continents/indoors/directories.py b/workspace/continents/indoors/directories.py
index 569f889..a41a4d6 100644
--- a/workspace/continents/indoors/directories.py
+++ b/workspace/continents/indoors/directories.py
@@ -102,25 +102,25 @@ IgLookupDirectories += [ ContinentPath + "/ig_other" ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 ShapeLookupDirectories += [ "common/sfx/ps" ]
-ShapeLookupDirectories += [ "common/sfx/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/sfx/shape_optimized" ]
 ShapeLookupDirectories += [ "common/sfx/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "common/construction/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/construction/shape_optimized" ]
 ShapeLookupDirectories += [ "common/construction/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "ecosystems/desert/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "ecosystems/desert/shape_optimized" ]
 ShapeLookupDirectories += [ "ecosystems/desert/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "ecosystems/jungle/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "ecosystems/jungle/shape_optimized" ]
 ShapeLookupDirectories += [ "ecosystems/jungle/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "ecosystems/lacustre/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "ecosystems/lacustre/shape_optimized" ]
 ShapeLookupDirectories += [ "ecosystems/lacustre/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ ContinentPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ ContinentPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ ContinentPath + "/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "continents/fyros/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "continents/fyros/shape_optimized" ]
 ShapeLookupDirectories += [ "continents/fyros/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "continents/matis/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "continents/matis/shape_optimized" ]
 ShapeLookupDirectories += [ "continents/matis/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "continents/zorai/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "continents/zorai/shape_optimized" ]
 ShapeLookupDirectories += [ "continents/zorai/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "continents/tryker/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "continents/tryker/shape_optimized" ]
 ShapeLookupDirectories += [ "continents/tryker/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -203,6 +203,7 @@ PsExportDirectory = CommonPath + "/ps"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/continents/indoors/process.py b/workspace/continents/indoors/process.py
index c0f7856..1294c05 100644
--- a/workspace/continents/indoors/process.py
+++ b/workspace/continents/indoors/process.py
@@ -105,10 +105,10 @@ BankTileBankName = EcosystemName
 # *** LIGO OPTIONS ***
 LigoExportLand = ""
 LigoExportOnePass = 0
-LigoExportColormap = "colormap_" + ContinentName + ".png"
-LigoExportHeightmap1 = "big_" + ContinentName + ".png"
+LigoExportColormap = "colormap_" + ContinentName + ".tga"
+LigoExportHeightmap1 = "big_" + ContinentName + ".tga"
 LigoExportZFactor1 = "1.0"
-LigoExportHeightmap2 = "noise_" + ContinentName + ".png"
+LigoExportHeightmap2 = "noise_" + ContinentName + ".tga"
 LigoExportZFactor2 = "0.5"
 LigoTileBankFile = "landscape/_texture_tiles/" + EcosystemName + "/" + EcosystemName + ".bank"
 
diff --git a/workspace/continents/matis/directories.py b/workspace/continents/matis/directories.py
index d6acd91..92fd657 100644
--- a/workspace/continents/matis/directories.py
+++ b/workspace/continents/matis/directories.py
@@ -58,13 +58,13 @@ MapUncompressedSourceDirectories = [ ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 ShapeLookupDirectories += [ "common/sfx/ps" ]
-ShapeLookupDirectories += [ "common/sfx/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/sfx/shape_optimized" ]
 ShapeLookupDirectories += [ "common/sfx/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "common/construction/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/construction/shape_optimized" ]
 ShapeLookupDirectories += [ "common/construction/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ ContinentPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ ContinentPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ ContinentPath + "/shape_with_coarse_mesh" ]
 # ShapeLookupDirectories += [ ContinentName + "/zone_light/water_shapes_lighted" ] huh?
 
@@ -106,6 +106,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/continents/newbieland/directories.py b/workspace/continents/newbieland/directories.py
index 08ef309..e8aa83a 100644
--- a/workspace/continents/newbieland/directories.py
+++ b/workspace/continents/newbieland/directories.py
@@ -92,16 +92,16 @@ IgLookupDirectories += [ ContinentPath + "/ig_other" ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 ShapeLookupDirectories += [ "common/sfx/ps" ]
-ShapeLookupDirectories += [ "common/sfx/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/sfx/shape_optimized" ]
 ShapeLookupDirectories += [ "common/sfx/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "common/construction/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/construction/shape_optimized" ]
 ShapeLookupDirectories += [ "common/construction/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ ContinentPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ ContinentPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ ContinentPath + "/shape_with_coarse_mesh" ]
 # ShapeLookupDirectories += [ ContinentName + "/zone_light/water_shapes_lighted" ] huh?
-ShapeLookupDirectories += [ "ecosystems/lacustre/shape_clodtex_build" ] # additional
+ShapeLookupDirectories += [ "ecosystems/lacustre/shape_optimized" ] # additional
 ShapeLookupDirectories += [ "ecosystems/lacustre/shape_with_coarse_mesh" ] # additional
 
 # Map lookup directories used by shape
@@ -184,6 +184,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/continents/newbieland/process.py b/workspace/continents/newbieland/process.py
index e109f90..a707dc1 100644
--- a/workspace/continents/newbieland/process.py
+++ b/workspace/continents/newbieland/process.py
@@ -109,10 +109,10 @@ BankTileBankName = EcosystemName
 # *** LIGO OPTIONS ***
 LigoExportLand = ContinentName + ".land"
 LigoExportOnePass = 0
-LigoExportColormap = "colormap_" + ContinentName + ".png"
-LigoExportHeightmap1 = "big_" + ContinentName + ".png"
+LigoExportColormap = "colormap_" + ContinentName + ".tga"
+LigoExportHeightmap1 = "big_" + ContinentName + ".tga"
 LigoExportZFactor1 = "1.0"
-LigoExportHeightmap2 = "noise_" + ContinentName + ".png"
+LigoExportHeightmap2 = "noise_" + ContinentName + ".tga"
 LigoExportZFactor2 = "0.5"
 LigoTileBankFile = "landscape/_texture_tiles/" + EcosystemName + "/" + EcosystemName + ".bank"
 
@@ -140,20 +140,6 @@ RbankZoneDr = "77_CS"
 # Output names
 RbankRbankName = LandscapeName
 
-# Import ig pathes
-#RbankIgPaths = [ ] # ExportBuildDirectory/...
-#RbankIgPaths += [ "continents/" + ContinentName + "/ig_other" ]
-#RbankIgPaths += [ "continents/" + ContinentName + "/ig_land" ]
-
-# Import shape pathes
-#RbankShapePaths = [ ] # ExportBuildDirectory/...
-#RbankShapePaths += [ "continents/" + ContinentName + "/shape" ]
-#RbankShapePaths += [ "continents/" + ContinentName + "/shape_with_coarse_mesh_builded" ]
-#RbankShapePaths += [ "ecosystems/" + EcosystemName + "/shape" ]
-#RbankShapePaths += [ "ecosystems/" + EcosystemName + "/shape_with_coarse_mesh_builded" ]
-#RbankShapePaths += [ "common/sfx/ps" ]
-# RbankShapePaths += [ "l:/leveldesign/world_edit_files" ]
-
 # *** MAPS OPTIONS ***
 ReduceBitmapFactor = 0
 # list all panoply files
diff --git a/workspace/continents/r2_desert/directories.py b/workspace/continents/r2_desert/directories.py
new file mode 100644
index 0000000..0258ba7
--- /dev/null
+++ b/workspace/continents/r2_desert/directories.py
@@ -0,0 +1,283 @@
+#!/usr/bin/python
+# 
+# \file directories.py
+# \brief Directories configuration
+# \date 2010-05-24 06:34GMT
+# \author Jan Boon (Kaetemi)
+# \date 2001-2005
+# \author Nevrax
+# Python port of game data build pipeline.
+# Directories configuration.
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2010  Winch Gate Property Limited
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+
+# *** ECOSYSTEM AND CONTINENT NAMES ***
+
+EcosystemName = "desert"
+EcosystemPath = "ecosystems/" + EcosystemName
+ContinentName = "r2_desert"
+ContinentPath = "continents/" + ContinentName
+CommonName = ContinentName
+CommonPath = ContinentPath
+
+
+# *** SOURCE DIRECTORIES LEVELDESIGN/WORLD ***
+ContinentLeveldesignWorldDirectory = ContinentName
+
+
+# *** SOURCE DIRECTORIES IN THE DATABASE ***
+
+# Shape directories
+ShapeSourceDirectories = [ ]
+
+# Maps directories
+MapSourceDirectories = [ ]
+
+MapUncompressedSourceDirectories = [ ]
+
+# Ligo directories
+LigoBaseSourceDirectory = "landscape/ligo/" + EcosystemName
+LigoMaxSourceDirectory = LigoBaseSourceDirectory + "/max"
+
+# Zone directories
+ZoneSourceDirectory = [ "landscape/zones/" + ContinentName ] # For old snowballs style landscape when not using ligo
+
+# ZoneLight directories
+WaterMapSourceDirectories = [ ]
+WaterMapSourceDirectories += [ "landscape/water/meshes/" + EcosystemName ]
+
+# RBank directories
+RBankCmbSourceDirectories = [ ]
+
+# Ig directories
+IgLandSourceDirectories = [ ]
+# IgLandSourceDirectories += [ "landscape/zones/" + ContinentName ] # For old snowballs style landscape when not using ligo
+IgOtherSourceDirectories = [ ]
+IgPrimitiveSourceDirectories = [ ]
+IgPrimitiveSourceDirectories += [ "primitive/" + ContinentName ] # Contains plants (trees, etc) primitive made with world editor
+
+# Tiles root directory
+TileRootSourceDirectory = "landscape/_texture_tiles/" + EcosystemName
+
+# Displace directory
+DisplaceSourceDirectory = "landscape/_texture_tiles/" + EcosystemName + "/displace"
+
+# Ligo primitive directory used in the client
+PsSourceDirectories = [ ]
+PsSourceDirectories += [ "primitive_microlife/" + ContinentName ]
+
+
+# *** LOOKUP DIRECTORIES WITHIN THE BUILD PIPELINE *** (TODO: use these instead of search_pathes in properties(_base).cfg)
+
+# Ig lookup directories used by rbank
+IgLookupDirectories = [ ]
+IgLookupDirectories += [ ContinentPath + "/ig_land" ]
+IgLookupDirectories += [ ContinentPath + "/ig_other" ]
+
+# Shape lookup directories used by rbank
+ShapeLookupDirectories = [ ]
+ShapeLookupDirectories += [ "common/sfx/ps" ]
+ShapeLookupDirectories += [ "common/sfx/shape_optimized" ]
+ShapeLookupDirectories += [ "common/sfx/shape_with_coarse_mesh" ]
+ShapeLookupDirectories += [ "common/construction/shape_optimized" ]
+ShapeLookupDirectories += [ "common/construction/shape_with_coarse_mesh" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
+ShapeLookupDirectories += [ ContinentPath + "/shape_optimized" ]
+ShapeLookupDirectories += [ ContinentPath + "/shape_with_coarse_mesh" ]
+# ShapeLookupDirectories += [ ContinentName + "/zone_light/water_shapes_lighted" ] huh?
+ShapeLookupDirectories += [ "ecosystems/lacustre/shape_optimized" ] # additional
+ShapeLookupDirectories += [ "ecosystems/lacustre/shape_with_coarse_mesh" ] # additional
+ShapeLookupDirectories += [ "continents/fyros/shape_optimized" ] # additional
+ShapeLookupDirectories += [ "continents/fyros/shape_with_coarse_mesh" ] # additional
+
+# Map lookup directories used by shape
+MapLookupDirectories = [ ]
+MapLookupDirectories += [ "common/sfx/map_export" ]
+MapLookupDirectories += [ "common/sfx/map_uncompressed" ]
+MapLookupDirectories += [ "common/construction/map_export" ]
+MapLookupDirectories += [ "common/construction/map_uncompressed" ]
+MapLookupDirectories += [ EcosystemPath + "/map_export" ]
+MapLookupDirectories += [ EcosystemPath + "/map_uncompressed" ]
+# MapLookupDirectories += [ ContinentPath + "/map_export" ]
+# MapLookupDirectories += [ ContinentPath + "/map_uncompressed" ]
+MapLookupDirectories += [ "ecosystems/lacustre/map_export" ] # additional
+MapLookupDirectories += [ "ecosystems/lacustre/map_uncompressed" ] # additional
+MapLookupDirectories += [ "continents/fyros/map_export" ] # additional
+MapLookupDirectories += [ "continents/fyros/map_uncompressed" ] # additional
+
+# PacsPrim lookup directories used by ai_wmap
+PacsPrimLookupDirectories = [ ]
+PacsPrimLookupDirectories += [ EcosystemPath + "/pacs_prim" ]
+
+# Properties search paths
+PropertiesExportBuildSearchPaths = [ ]
+PropertiesExportBuildSearchPaths += IgLookupDirectories
+PropertiesExportBuildSearchPaths += ShapeLookupDirectories
+PropertiesExportBuildSearchPaths += MapLookupDirectories
+PropertiesExportBuildSearchPaths += PacsPrimLookupDirectories
+
+
+# *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE ***
+
+# Map directories
+MapExportDirectory = CommonPath + "/map_export"
+MapUncompressedExportDirectory = CommonPath + "/map_uncompressed"
+
+# Shape directories
+ShapeTagExportDirectory = CommonPath + "/shape_tag"
+ShapeNotOptimizedExportDirectory = CommonPath + "/shape_not_optimized"
+ShapeWithCoarseMeshExportDirectory = CommonPath + "/shape_with_coarse_mesh"
+ShapeLightmapNotOptimizedExportDirectory = CommonPath + "/shape_lightmap_not_optimized"
+ShapeAnimExportDirectory = CommonPath + "/shape_anim"
+
+# Ligo directories
+LigoEcosystemExportDirectory = EcosystemPath + "/ligo_es"
+LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
+LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
+LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
+LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
+LigoEcosystemTagExportDirectory = EcosystemPath + "/ligo_es_tag"
+
+# Zone directories
+ZoneExportDirectory = ContinentPath + "/zone"
+
+# RBank directories
+RBankCmbExportDirectory = CommonPath + "/rbank_cmb_export"
+RBankCmbTagExportDirectory = CommonPath + "/rbank_cmb_tag_export"
+
+# Smallbank directories
+SmallbankExportDirectory = EcosystemPath + "/smallbank"
+
+# Farbank directories
+FarbankBuildDirectory = EcosystemPath + "/farbank"
+
+# Tiles directories
+DisplaceExportDirectory = EcosystemPath + "/diplace"
+
+# Tiles directories
+TilesExportDirectory = EcosystemPath + "/tiles"
+
+# Ig directories
+IgStaticLandExportDirectory = ContinentPath + "/ig_static_land" # Landscape IG eported from 3dsmax not elevated by the heightmap
+IgStaticOtherExportDirectory = ContinentPath + "/ig_static_other" # Village or construction IGs exported from 3dsmax
+IgStaticTagExportDirectory = ContinentPath + "/ig_static_tag" # Tag for exported 3dsmax files
+
+# PS directories
+PsExportDirectory = CommonPath + "/ps"
+
+
+# *** BUILD DIRECTORIES FOR THE BUILD PIPELINE ***
+
+# Map directories
+MapBuildDirectory = CommonPath + "/map"
+MapPanoplyBuildDirectory = CommonPath + "/map_panoply"
+MapPanoplyHlsInfoBuildDirectory = CommonPath + "/map_panoply_hls_info"
+MapPanoplyHlsBankBuildDirectory = CommonPath + "/map_panoply_hls_bank"
+MapPanoplyCacheBuildDirectory = CommonPath + "/map_panoply_cache"
+MapTagBuildDirectory = CommonPath + "/map_tag"
+
+# Shape directories
+ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
+ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
+ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
+ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
+
+# Ligo directories
+LigoZoneBuildDirectory = CommonPath + "/ligo_zones"
+LigoIgLandBuildDirectory = CommonPath + "/ligo_ig_land" # Landscape IG found in ligo bricks not elevated by the heightmap
+LigoIgOtherBuildDirectory = CommonPath + "/ligo_ig_other" # Village or construction IGs exported from ligo landscape
+
+# Zone directories
+ZoneWeldBuildDirectory = CommonPath + "/zone_weld"
+ZoneDependBuildDirectory = CommonPath + "/zone_depend"
+ZoneLightWaterShapesLightedExportDirectory = CommonPath + "/zone_lwsl_temp" #fixme
+ZoneLightBuildDirectory = CommonPath + "/zone_lighted" #fixme
+ZoneLightDependBuildDirectory = CommonPath + "/zone_lighted_depend" #fixme
+ZoneLightIgLandBuildDirectory = CommonPath + "/zone_lighted_ig_land" #fixme
+
+# Farbank directories
+FarbankBuildDirectory = EcosystemPath + "/farbank"
+
+# Ig directories 
+IgElevLandPrimBuildDirectory = CommonPath + "/ig_elev_land_prim" # landscape IG generated by the prim exporter (already elevated by the land exporter)
+IgElevLandLigoBuildDirectory = CommonPath + "/ig_elev_land_ligo" # Landscape IG found in ligo bricks from 3dsmax elevated by the heightmap
+IgElevLandStaticBuildDirectory = CommonPath + "/ig_elev_land_static" # Landscape IG eported from 3dsmax elevated by the heightmap
+IgTempLandMergeBuildDirectory = CommonPath + "/ig_temp_land_merge"
+IgTempLandCompareBuildDirectory = CommonPath + "/ig_temp_land_compare" # Tmp final IG directory for landscape IGs before comparison
+IgLandBuildDirectory = CommonPath + "/ig_land" # Final IG directory for landscape IGs
+IgOtherBuildDirectory = CommonPath + "/ig_other" # Final IG directory for village or construction IGs
+IgOtherLightedBuildDirectory = CommonPath + "/ig_other_lighted"
+
+# Rbank directories
+RbankBboxBuildDirectory = CommonPath + "/rbank_bbox"
+RbankTessellationBuildDirectory = CommonPath + "/rbank_tessellation"
+RbankSmoothBuildDirectory = CommonPath + "/rbank_smooth"
+RbankRawBuildDirectory = CommonPath + "/rbank_raw"
+RbankPreprocBuildDirectory = CommonPath + "/rbank_preproc"
+RbankRetrieversBuildDirectory = CommonPath + "/rbank_retrievers"
+RbankOutputBuildDirectory = CommonPath + "/rbank_output"
+
+# AI Wmap directories
+AiWmapBuildDirectory = CommonPath + "/ai_wmap"
+AiWmapBuildTagDirectory = CommonPath + "/ai_wmap_tag"
+
+# Packed zone directories
+PackedZoneCacheBuildDirectory = CommonPath + "/pz_cache_zone"
+PackedZoneCWMapCacheBuildDirectory = CommonPath + "/pz_cache_cwmap"
+PackedZoneBuildDirectory = CommonPath + "/pz_col_meshes"
+
+# Cartographer directories
+CartographerBuildDirectory = CommonPath + "/cartographer"
+
+
+# *** INSTALL DIRECTORIES IN THE CLIENT DATA ***
+
+# Map directory
+MapInstallDirectory = CommonName + "_maps"
+BitmapInstallDirectory = MapInstallDirectory
+
+# Shape directory
+ShapeInstallDirectory = CommonName + "_shapes"
+
+# Shape lightmaps directory
+LightmapInstallDirectory = ShapeInstallDirectory
+
+# Ig directory
+IgInstallDirectory = CommonName + "_ig"
+
+# Zone directory
+ZoneInstallDirectory = CommonName + "_zones"
+WaterMapsInstallDirectory = ZoneInstallDirectory
+
+# PACS directory
+PacsInstallDirectory = CommonName + "_pacs"
+
+# PS directory
+PsInstallDirectory = CommonName + "_ig"
+
+# AI Wmap directory
+AiWmapInstallDirectory = CommonName + "_ai"
+
+# PZ directory
+PackedZoneInstallDirectory = CommonName + "_pz"
+
+# Cartographer directory
+CartographerInstallDirectory = MapInstallDirectory
diff --git a/workspace/continents/r2_desert/process.py b/workspace/continents/r2_desert/process.py
new file mode 100644
index 0000000..fc5d278
--- /dev/null
+++ b/workspace/continents/r2_desert/process.py
@@ -0,0 +1,173 @@
+#!/usr/bin/python
+# 
+# \file config.py
+# \brief Process configuration
+# \date 2010-05-24 06:30GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Process configuration.
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2010  Winch Gate Property Limited
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+# *** PROCESS CONFIGURATION ***
+
+
+# *** PROCESS CONFIG ***
+ProcessToComplete = [ ]
+ProcessToComplete += [ "properties" ]
+ProcessToComplete += [ "ligo" ]
+ProcessToComplete += [ "zone" ]
+ProcessToComplete += [ "ig" ]
+ProcessToComplete += [ "zone_light" ]
+ProcessToComplete += [ "rbank" ]
+ProcessToComplete += [ "ig_light" ]
+ProcessToComplete += [ "ps" ]
+ProcessToComplete += [ "ai_wmap" ]
+ProcessToComplete += [ "pz" ]
+ProcessToComplete += [ "cartographer" ]
+
+
+# *** ECOSYSTEM AND CONTINENT NAMES ***
+
+EcosystemName = "desert"
+EcosystemPath = "ecosystems/" + EcosystemName
+ContinentName = "r2_desert"
+ContinentPath = "continents/" + ContinentName
+CommonName = ContinentName
+CommonPath = ContinentPath
+
+
+# *** LANDSCAPE NAME ***
+LandscapeName = ContinentName
+
+# *** CONTINENT FILE ***
+ContinentFile = ContinentName + "/" + ContinentName + ".continent"
+
+
+
+# *** SHAPE EXPORT OPTIONS ***
+
+# Compute lightmaps ?
+ShapeExportOptExportLighting = "true"
+
+# Cast shadow in lightmap ?
+ShapeExportOptShadow = "true"
+
+# Lighting limits. 0 : normal, 1 : soft shadows
+ShapeExportOptLightingLimit = 0
+
+# Lightmap lumel size
+ShapeExportOptLumelSize = "0.25"
+
+# Oversampling value. Can be 1, 2, 4 or 8
+ShapeExportOptOversampling = 1
+
+# Does the lightmap must be generated in 8 bits format ?
+ShapeExportOpt8BitsLightmap = "false"
+
+# Does the lightmaps export must generate logs ?
+ShapeExportOptLightmapLog = "true"
+
+# Coarse mesh texture mul size
+TextureMulSizeValue = "1.5"
+
+BuildShadowSkinEnabled = False
+
+ClodConfigFile = ""
+
+# *** COARSE MESH TEXTURE NAME ***
+CoarseMeshTextureNames = [ ]
+
+# *** BANK EXPORT OPTIONS ***
+
+# *** POSTFIX USED BY THE MULTIPLE TILES SYSTEM ***
+MultipleTilesPostfix = [ ]
+MultipleTilesPostfix += [ "_sp" ]
+MultipleTilesPostfix += [ "_su" ]
+MultipleTilesPostfix += [ "_au" ]
+MultipleTilesPostfix += [ "_wi" ]
+
+# Name of the tilebank to use
+BankTileBankName = EcosystemName
+
+
+# *** LIGO OPTIONS ***
+LigoExportLand = ContinentName + ".land"
+LigoExportOnePass = 0
+LigoExportColormap = "colormap_" + ContinentName + ".tga"
+LigoExportHeightmap1 = "big_" + ContinentName + ".tga"
+LigoExportZFactor1 = "1.0"
+LigoExportHeightmap2 = "noise_" + ContinentName + ".tga"
+LigoExportZFactor2 = "0.5"
+LigoTileBankFile = "landscape/_texture_tiles/" + EcosystemName + "/" + EcosystemName + ".bank"
+
+# *** ZONE REGIONS ( up-left, down-right ) ***
+ZoneRegions = [ ] 
+ZoneRegions += [ [ "6_fb" ] + [ "67_hk" ] ]
+
+# *** RBANK OPTIONS ***
+
+# Options
+RBankVerbose = 1
+RBankConsistencyCheck = 0
+RbankReduceSurfaces = 1
+RbankSmoothBorders = 1
+RbankComputeElevation = 0
+RbankComputeLevels = 1
+RbankLinkElements = 1
+RbankCutEdges = 1
+RbankUseZoneSquare = 0
+
+# Region to compute ( ALPHA UPPER CASE! )
+RbankZoneUl = "6_FB"
+RbankZoneDr = "67_HK"
+
+# Output names
+RbankRbankName = LandscapeName
+
+# *** MAPS OPTIONS ***
+ReduceBitmapFactor = 0
+# list all panoply files
+MapPanoplyFileList = None
+# name of the .hlsbank to build.
+MapHlsBankFileName = None
+
+# *** AI WMAP OPTIONS ***
+AiWmapContinentName = ContinentName
+AiWmapVerbose = 0
+AiWmapStartPoints = [ ]
+# AiWmapStartPoints += [ ContinentName + " 21508 -1332" ]
+# AiWmapStartPoints += [ ContinentName + " 22043 -1083" ]
+AiWmapStartPoints += [ ContinentName + " 22996 -1253" ]
+AiWmapStartPoints += [ ContinentName + " 23605 -1206" ]
+# AiWmapStartPoints += [ ContinentName + " 24545 -1245" ] # CRASH
+# AiWmapStartPoints += [ ContinentName + " 25396 -1319" ]
+# AiWmapStartPoints += [ ContinentName + " 25930 -1250" ]
+# AiWmapStartPoints += [ ContinentName + " 26804 -1283" ] # CRASH
+# AiWmapStartPoints += [ ContinentName + " 27645 -1237" ]
+AiWmapStartPoints += [ ContinentName + " 28935 -1353" ]
+AiWmapStartPoints += [ ContinentName + " 29736 -1234" ]
+AiWmapStartPoints += [ ContinentName + " 30596 -1353" ]
+AiWmapStartPoints += [ ContinentName + " 30574 -2090" ]
+# AiWmapStartPoints += [ ContinentName + " 28992 -2053" ]
+
+# *** PZ OPTIONS ***
+PackedZoneCWMap = ContinentName + "_0.cwmap2"
+
+# *** CARTOGRAPHER OPTIONS ***
+CartographerContinent = ContinentName
diff --git a/workspace/continents/r2_desert/properties_base.cfg b/workspace/continents/r2_desert/properties_base.cfg
new file mode 100644
index 0000000..094c8f6
--- /dev/null
+++ b/workspace/continents/r2_desert/properties_base.cfg
@@ -0,0 +1,50 @@
+
+// Continent name
+continent_name = "%ContinentName%";
+
+// Level design directory
+level_design_directory = "%LeveldesignDirectory%";
+
+// World directory
+level_design_world_directory = "%LeveldesignWorldDirectory%";
+
+// DFN directory
+level_design_dfn_directory = "%LeveldesignDfnDirectory%";
+
+// Bank file name
+bank_name = "%ExportBuildDirectory%/%SmallbankExportDirectory%/%EcosystemName%.smallbank";
+bankfar_name = "%ExportBuildDirectory%/%FarbankBuildDirectory%/%EcosystemName%.farbank";
+
+// Additional ig file name
+additionnal_ig = 
+{
+	
+};
+
+// Sun direction.
+sun_direction = { -0.5, +0.0, -0.85 };
+
+// Center of the landscape pointed by the sun
+sun_center = { 26000, -6000, 0 };
+
+// Distance of the sun
+sun_distance = 50000;
+
+// FOV of the sun in radian
+sun_fov = 0.52359877; // Pi / 6
+
+// Sun radius, (for softshadow sampling)
+sun_radius = 5000;
+
+// GlobalRetriever bank file.gr. Empty string to disable SurfaceLighting
+grbank= "%ExportBuildDirectory%/%RbankOutputBuildDirectory%/%RbankRbankName%.gr";
+
+// LocalRetriever bank file .rbank. Empty string to disable SurfaceLighting
+rbank= "%ExportBuildDirectory%/%RbankOutputBuildDirectory%/%RbankRbankName%.rbank";
+
+// The lighter search in rbank any retriever with identifier ---igname*** as substring
+// where --- is col_identifier_prefix and *** is col_identifier_suffix
+// eg: if igname= "street", col_identifier_prefix= "col_", col_identifier_suffix= "_",
+// then "col_street_1" and "col_street_2" are valid and are used to build LightSurface infos in the Ig.
+col_identifier_prefix= "";
+col_identifier_suffix= "";
diff --git a/workspace/continents/r2_desert/properties_draft.cfg b/workspace/continents/r2_desert/properties_draft.cfg
new file mode 100644
index 0000000..07fad2f
--- /dev/null
+++ b/workspace/continents/r2_desert/properties_draft.cfg
@@ -0,0 +1,93 @@
+
+// Load instance group. 0 disable, 1 enable
+load_ig = 0;
+
+// Use ig to compute dependencies 0 disable, 1 enable
+compute_dependencies_with_igs = 0;
+
+// Enable shadows. 0 disable, 1 enable
+shadow = 0;
+
+// Landscape ZBuffers size for all the landscape. There is one zbuffer like this one per softshadow sample.
+zbuffer_landscape_size = 32768;
+
+// Object ZBuffers size for all the landscape. This zbuffer is typically finer. There is only one zbuffer like this.
+zbuffer_object_size = 98304;
+
+// Square root of the number of soft shadow samples
+soft_shadow_samples_sqrt = 4;
+
+// Soft shadow jitter (0 ~ 1) to smooth softshadow aliasing when sampling number is small
+soft_shadow_jitter = 0.4;
+
+// Enable the sun contribution. 0 disable, 1 enable
+sun_contribution = 1;
+
+// Enable the sky global illumaniation. 0 disable, 1 enable
+sky_contribution = 0;
+
+// The sky global illumaniation intensity . [0 ~ 1]
+sky_intensity = 0.20;
+
+// Accuracy of the sky global illumaniation algorithm in meter
+global_illumination_cell_size = 5;
+
+// shadow bias for water surfaces
+water_shadow_bias = 0.8;
+
+// ambient lighting for water. [0 ~ 1]
+water_ambient = 0.3;
+
+// diffuse lighting for water. [0 ~ 1]
+water_diffuse = 1.0;
+
+// true if the water color should be modulated with the source diffuse map
+modulate_water_color = 0;
+
+// 1 if the water should receive sky lighting contribution
+sky_contribution_for_water = 0;
+
+// Side length of landscape used to compute the sky global illumaniation  in meter
+global_illumination_length = 600;
+
+// Size of the quad grid side in meter. Should be a power of 2. (optimisation)
+quad_grid_size = 512;
+
+// Size of a cell of the quad grid in meter. (optimisation)
+quad_grid_cell_size = 1;
+
+// Number of CPU used to calculate the lightmaps. 0 for automatic detection.
+cpu_num = 0;
+
+/// Evaluation the max vegetable height in meters. This is used to decide wether vegetable of a tile
+/// are above, below, or intersect a water surface (rough approximation).
+/// As a matter of fact, these flags are processed during hte lighting as well.
+vegetable_height = 2;
+
+
+
+
+// ***************************
+// Ig Lighting.
+// ***************************
+// Ig lighting shares also above parameters: sun_direction, shadow, quad_grid_size, quad_grid_cell_size, shapes_path
+
+
+// Oversampling value, must be 0 (disable), 2, 4, 8, 16
+// This apply to surface cells and instances.
+ig_oversampling = 16;
+
+
+// IG Surface Lighting (for ig_light process only)
+
+// If SurfaceLighting enabled, define size of a cell (in meters) in a surface.
+cell_surface_light_size = 1.5;
+
+// If SurfaceLighting enabled, define a deltaZ before raytracing cellPos against lights. Usefull to skip shadow errors like stairs
+cell_raytrace_delta_z = 0.2;
+
+
+// Build debug surface shapes (slows the process)
+build_debug_surface_shape= 0;
+
+
diff --git a/workspace/continents/r2_desert/properties_final.cfg b/workspace/continents/r2_desert/properties_final.cfg
new file mode 100644
index 0000000..58ff2d7
--- /dev/null
+++ b/workspace/continents/r2_desert/properties_final.cfg
@@ -0,0 +1,93 @@
+
+// Load instance group. 0 disable, 1 enable
+load_ig = 1;
+
+// Use ig to compute dependencies 0 disable, 1 enable
+compute_dependencies_with_igs = 1;
+
+// Enable shadows. 0 disable, 1 enable
+shadow = 1;
+
+// Landscape ZBuffers size for all the landscape. There is one zbuffer like this one per softshadow sample.
+zbuffer_landscape_size = 32768;
+
+// Object ZBuffers size for all the landscape. This zbuffer is typically finer. There is only one zbuffer like this.
+zbuffer_object_size = 98304;
+
+// Square root of the number of soft shadow samples
+soft_shadow_samples_sqrt = 4;
+
+// Soft shadow jitter (0 ~ 1) to smooth softshadow aliasing when sampling number is small
+soft_shadow_jitter = 0.4;
+
+// Enable the sun contribution. 0 disable, 1 enable
+sun_contribution = 1;
+
+// Enable the sky global illumaniation. 0 disable, 1 enable
+sky_contribution = 1;
+
+// The sky global illumaniation intensity . [0 ~ 1]
+sky_intensity = 0.20;
+
+// Accuracy of the sky global illumaniation algorithm in meter
+global_illumination_cell_size = 5;
+
+// shadow bias for water surfaces
+water_shadow_bias = 0.8;
+
+// ambient lighting for water. [0 ~ 1]
+water_ambient = 0.3;
+
+// diffuse lighting for water. [0 ~ 1]
+water_diffuse = 1.0;
+
+// true if the water color should be modulated with the source diffuse map
+modulate_water_color = 0;
+
+// 1 if the water should receive sky lighting contribution
+sky_contribution_for_water = 0;
+
+// Side length of landscape used to compute the sky global illumaniation  in meter
+global_illumination_length = 600;
+
+// Size of the quad grid side in meter. Should be a power of 2. (optimisation)
+quad_grid_size = 512;
+
+// Size of a cell of the quad grid in meter. (optimisation)
+quad_grid_cell_size = 1;
+
+// Number of CPU used to calculate the lightmaps. 0 for automatic detection.
+cpu_num = 0;
+
+/// Evaluation the max vegetable height in meters. This is used to decide wether vegetable of a tile
+/// are above, below, or intersect a water surface (rough approximation).
+/// As a matter of fact, these flags are processed during hte lighting as well.
+vegetable_height = 2;
+
+
+
+
+// ***************************
+// Ig Lighting.
+// ***************************
+// Ig lighting shares also above parameters: sun_direction, shadow, quad_grid_size, quad_grid_cell_size, shapes_path
+
+
+// Oversampling value, must be 0 (disable), 2, 4, 8, 16
+// This apply to surface cells and instances.
+ig_oversampling = 16;
+
+
+// IG Surface Lighting (for ig_light process only)
+
+// If SurfaceLighting enabled, define size of a cell (in meters) in a surface.
+cell_surface_light_size = 1.5;
+
+// If SurfaceLighting enabled, define a deltaZ before raytracing cellPos against lights. Usefull to skip shadow errors like stairs
+cell_raytrace_delta_z = 0.2;
+
+
+// Build debug surface shapes (slows the process)
+build_debug_surface_shape= 0;
+
+
diff --git a/workspace/continents/tryker/directories.py b/workspace/continents/tryker/directories.py
index 5a7ebfe..0034c27 100644
--- a/workspace/continents/tryker/directories.py
+++ b/workspace/continents/tryker/directories.py
@@ -60,13 +60,13 @@ MapUncompressedSourceDirectories = [ ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 ShapeLookupDirectories += [ "common/sfx/ps" ]
-ShapeLookupDirectories += [ "common/sfx/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/sfx/shape_optimized" ]
 ShapeLookupDirectories += [ "common/sfx/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "common/construction/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/construction/shape_optimized" ]
 ShapeLookupDirectories += [ "common/construction/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ ContinentPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ ContinentPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ ContinentPath + "/shape_with_coarse_mesh" ]
 # ShapeLookupDirectories += [ ContinentName + "/zone_light/water_shapes_lighted" ] huh?
 
@@ -108,6 +108,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/continents/zorai/directories.py b/workspace/continents/zorai/directories.py
index e8951ba..62e905f 100644
--- a/workspace/continents/zorai/directories.py
+++ b/workspace/continents/zorai/directories.py
@@ -58,13 +58,13 @@ MapUncompressedSourceDirectories = [ ]
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
 ShapeLookupDirectories += [ "common/sfx/ps" ]
-ShapeLookupDirectories += [ "common/sfx/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/sfx/shape_optimized" ]
 ShapeLookupDirectories += [ "common/sfx/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ "common/construction/shape_clodtex_build" ]
+ShapeLookupDirectories += [ "common/construction/shape_optimized" ]
 ShapeLookupDirectories += [ "common/construction/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
-ShapeLookupDirectories += [ ContinentPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ ContinentPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ ContinentPath + "/shape_with_coarse_mesh" ]
 # ShapeLookupDirectories += [ ContinentName + "/zone_light/water_shapes_lighted" ] huh?
 
@@ -106,6 +106,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/ecosystems/desert/directories.py b/workspace/ecosystems/desert/directories.py
index 9c1eb16..533c000 100644
--- a/workspace/ecosystems/desert/directories.py
+++ b/workspace/ecosystems/desert/directories.py
@@ -155,7 +155,7 @@ IgLookupDirectories = [ ]
 
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -221,6 +221,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/ecosystems/jungle/directories.py b/workspace/ecosystems/jungle/directories.py
index 4fb84f3..6f3b1c3 100644
--- a/workspace/ecosystems/jungle/directories.py
+++ b/workspace/ecosystems/jungle/directories.py
@@ -159,7 +159,7 @@ IgLookupDirectories = [ ]
 
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -225,6 +225,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/ecosystems/lacustre/directories.py b/workspace/ecosystems/lacustre/directories.py
index 377c2ee..2b3dcfb 100644
--- a/workspace/ecosystems/lacustre/directories.py
+++ b/workspace/ecosystems/lacustre/directories.py
@@ -167,7 +167,7 @@ IgLookupDirectories = [ ]
 
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -233,6 +233,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/ecosystems/primes_racines/directories.py b/workspace/ecosystems/primes_racines/directories.py
index 7a33ca2..baefb7a 100644
--- a/workspace/ecosystems/primes_racines/directories.py
+++ b/workspace/ecosystems/primes_racines/directories.py
@@ -152,7 +152,7 @@ IgLookupDirectories = [ ]
 
 # Shape lookup directories used by rbank
 ShapeLookupDirectories = [ ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_optimized" ]
 ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
 
 # Map lookup directories not yet used
@@ -218,6 +218,7 @@ MapTagBuildDirectory = CommonPath + "/map_tag"
 
 # Shape directories
 ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeOptimizedBuildDirectory = CommonPath + "/shape_optimized"
 ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
 ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
 ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
diff --git a/workspace/projects.py b/workspace/projects.py
index c04f665..8c9a006 100644
--- a/workspace/projects.py
+++ b/workspace/projects.py
@@ -69,6 +69,13 @@ ProjectsToProcess += [ "continents/fyros" ] # Note: dummy for shape and map expo
 ProjectsToProcess += [ "continents/matis" ] # Note: dummy for shape and map export
 ProjectsToProcess += [ "continents/zorai" ] # Note: dummy for shape and map export
 ProjectsToProcess += [ "continents/tryker" ] # Note: dummy for shape and map export
+# ProjectsToProcess += [ "continents/fyros_newbie" ] # Depends on continents/fyros
+# ProjectsToProcess += [ "continents/tryker_newbie" ] # Depends on continents/tryker
+ProjectsToProcess += [ "continents/r2_desert" ] # Depends on continents/fyros
+# ProjectsToProcess += [ "continents/r2_forest" ] # Depends on continents/tryker
+# ProjectsToProcess += [ "continents/r2_jungle" ] # Depends on continents/tryker
+# ProjectsToProcess += [ "continents/r2_lakes" ] # Depends on continents/tryker
+# ProjectsToProcess += [ "continents/r2_roots" ] # Depends on continents/tryker
 ProjectsToProcess += [ "continents/newbieland" ] # Note: must be after other continents due to dependencies on fy/ma/zo/tr
 ProjectsToProcess += [ "continents/indoors" ] # Note: must be after other continents due to dependencies on fy/ma/zo/tr
 
@@ -89,7 +96,7 @@ InstallShardDataMultiDirectories += [ [ "data_www", [ ] ] ]
 InstallShardDataMultiDirectories += [ [ "data_newbieland", [ "newbieland_ai", "newbieland_ig", "newbieland_pacs" ] ] ]
 InstallShardDataMultiDirectories += [ [ "data_indoors", [ "indoors_ai", "indoors_ig", "indoors_pacs" ] ] ]
 InstallShardDataMultiDirectories += [ [ "data_pacs_prim", [ "desert_pacs_prim", "jungle_pacs_prim", "lacustre_pacs_prim", "primes_racines_pacs_prim" ] ] ]
-InstallShardDataMultiDirectories += [ [ "data_r2_desert", [ ] ] ] # TODO
+InstallShardDataMultiDirectories += [ [ "data_r2_desert", [ "r2_desert_ai", "r2_desert_ig", "r2_desert_pacs" ] ] ]
 InstallShardDataMultiDirectories += [ [ "data_r2_forest", [ ] ] ] # TODO
 InstallShardDataMultiDirectories += [ [ "data_r2_jungle", [ ] ] ] # TODO
 InstallShardDataMultiDirectories += [ [ "data_r2_lakes", [ ] ] ] # TODO
@@ -125,8 +132,12 @@ InstallShardDataExecutables = [ ]
 InstallShardDataExecutables += [ [ "service_ryzom_admin_service", [ "ryzom_admin_service", "ryzom_admin_service" ], [ "ryzom_as.cfg" ], [ ] ] ]
 InstallShardDataExecutables += [ [ "service_shard_unifier_service", [ "shard_unifier_service", "ryzom_shard_unifier_service" ], [ "shard_unifier_service.cfg" ], [ "data_shard/reserved_names.xml", "data_shard/dev_gm_names.xml", "data_shard/invalid_entity_names.txt" ] ] ]
 InstallShardDataExecutables += [ [ "service_mail_forum_service", [ "mail_forum_service", "ryzom_mail_forum_service" ], [ "mail_forum_service.cfg" ], [ ] ] ]
+# Backup
 InstallShardDataExecutables += [ [ "service_logger_service", [ "logger_service", "ryzom_logger_service" ], [ "logger_service.cfg" ], [ ] ] ]
 InstallShardDataExecutables += [ [ "service_backup_service", [ "backup_service", "ryzom_backup_service" ], [ "backup_service.cfg" ], [ ] ] ]
+InstallShardDataExecutables += [ [ "service_pd_support_service", [ "pd_support_service", "ryzom_pd_support_service" ], [ ], [ ] ] ]
+# LAS
+# InstallShardDataExecutables += [ [ "service_log_analyser_service", [ "log_analyser_service", "ryzom_log_analyser_service" ], [ "log_analyser_service.cfg" ], [ ] ] ]
 # Mainland
 InstallShardDataExecutables += [ [ "service_ryzom_naming_service", [ "ryzom_naming_service", "ryzom_naming_service" ], [ "naming_service.cfg" ], [ ] ] ]
 InstallShardDataExecutables += [ [ "service_ryzom_welcome_service", [ "ryzom_welcome_service", "ryzom_welcome_service" ], [ "welcome_service.cfg" ], [ ] ] ]
@@ -136,8 +147,17 @@ InstallShardDataExecutables += [ [ "service_input_output_service", [ "input_outp
 InstallShardDataExecutables += [ [ "service_gpm_service", [ "gpm_service", "ryzom_gpm_service" ], [ "gpm_service.cfg" ], [ ] + psDatasets + psGPMS + psContinents ] ]
 InstallShardDataExecutables += [ [ "service_session_browser_server", [ "session_browser_server", "ryzom_session_browser_service" ], [ ], [ ] ] ]
 InstallShardDataExecutables += [ [ "service_entities_game_service", [ "entities_game_service", "ryzom_entities_game_service" ], [ "entities_game_service.cfg" ], [ "data_shard/shop_category.cfg", "data_shard/client_commands_privileges.txt", "data_shard/named_items.txt", "data_shard/mission_queues.txt", "data_shard/game_event.txt" ] + psEGS + psDatasets + psLightCycles ] ]
-InstallShardDataExecutables += [ [ "service_ai_service", [ "ai_service", "ryzom_ai_service" ], [ "ai_service.cfg" ], [ "data_shard/shop_category.cfg" ] + psAIS + psDatasets + psLightCycles ] ]
+InstallShardDataExecutables += [ [ "service_ai_service", [ "ai_service", "ryzom_ai_service" ], [ "ai_service.cfg" ], [ ] + psAIS + psDatasets + psLightCycles ] ]
 InstallShardDataExecutables += [ [ "service_frontend_service", [ "frontend_service", "ryzom_frontend_service" ], [ "frontend_service.cfg" ], [ ] + psDatasets ] ]
+# Ring
+InstallShardDataExecutables += [ [ "service_dynamic_scenario_service", [ "dynamic_scenario_service", "ryzom_dynamic_scenario_service" ], [ "dynamic_scenario_service.cfg" ], [ ] ] ]
+
+
+WorldEditEcosystems = [ ]
+WorldEditEcosystems += [ [ "desert", [ "r2_desert" ] ] ]
+WorldEditEcosystems += [ [ "jungle", [ "indoors", "newbieland" ] ] ]
+WorldEditEcosystems += [ [ "primes_racines", [ ] ] ]
+WorldEditEcosystems += [ [ "lacustre", [ ] ] ]
 
 
 InstallClientData = [ ]