diff --git a/.hgtags b/.hgtags
index c6af6b011..80061a2ee 100644
--- a/.hgtags
+++ b/.hgtags
@@ -3,3 +3,6 @@
 00d9b6e29e95f56785fbf85abe60afd34674f402 ryzomcore/v0.9.0
 79776c337176dd5b02e1a74fe5dfb703b91747aa ryzomcore/v0.9.1
 fedf2aa443d09707beed814b0f499c6a5519cc84 ryzomcore/v0.10.0
+edaa3624a56420b02ccc64c26059801a389927ee ryzomcore/v0.11.0
+e3fe4855f22c3e75722e015dc33c091c340b3ad7 ryzomcore/v0.11.1
+9e583b717fd63be0be9fd60b99087abf1691ea49 ryzomcore/v0.11.2
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 09b2811ed..446a0d19c 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1,8 +1,8 @@
 #-----------------------------------------------------------------------------
 #
-# NeL
-#  Authors: Nevrax and the NeL Community
-#  Version: 0.10.0
+# Ryzom Core
+#  Authors: Nevrax and the Ryzom Core Community
+#  Version: 0.11.2
 #
 # Notes:
 #   * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path
@@ -47,8 +47,8 @@ CHECK_OUT_OF_SOURCE()
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
 SET(NL_VERSION_MAJOR 0)
-SET(NL_VERSION_MINOR 10)
-SET(NL_VERSION_PATCH 0)
+SET(NL_VERSION_MINOR 11)
+SET(NL_VERSION_PATCH 2)
 SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
 
 #-----------------------------------------------------------------------------
@@ -112,16 +112,20 @@ IF(WITH_STATIC_LIBXML2)
   SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
 ENDIF(WITH_STATIC_LIBXML2)
 
+IF(WITH_LIBXML2_ICONV)
+  FIND_PACKAGE(Iconv REQUIRED)
+  INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
+  SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICONV_LIBRARIES})
+ENDIF(WITH_LIBXML2_ICONV)
+
 IF(WITH_STATIC)
   # libxml2 could need winsock2 library
   SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${WINSOCK2_LIB})
 
   # on Mac OS X libxml2 requires iconv and liblzma
   IF(APPLE)
-    FIND_PACKAGE(Iconv REQUIRED)
     FIND_PACKAGE(LibLZMA REQUIRED)
-    SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICONV_LIBRARIES} ${LIBLZMA_LIBRARIES})
-    INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
+    SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
   ENDIF(APPLE)
 ENDIF(WITH_STATIC)
 
@@ -160,9 +164,11 @@ IF(WITH_NEL)
     FIND_PACKAGE(Luabind REQUIRED)
     FIND_PACKAGE(CURL REQUIRED)
 
-    IF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
+    IF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
       SET(CURL_STATIC ON)
-    ENDIF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
+    ELSE((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
+      SET(CURL_STATIC OFF)
+    ENDIF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
 
     IF(CURL_STATIC)
       SET(CURL_DEFINITIONS -DCURL_STATICLIB)
@@ -236,30 +242,31 @@ IF(WITH_NEL_TESTS)
 ENDIF(WITH_NEL_TESTS)
 
 # packaging information
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "NeL MMORPG Framework")
-SET(CPACK_PACKAGE_VENDOR "NeL")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ryzom Core MMORPG Framework")
+SET(CPACK_PACKAGE_VENDOR "Ryzom Core")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
 SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING)
 SET(CPACK_PACKAGE_VERSION_MAJOR "${NL_VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${NL_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${NL_VERSION_PATCH}")
 SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};NeL;ALL;/")
-SET(CPACK_PACKAGE_EXECUTABLES "nel${NL_VERSION}" "nel")
+SET(CPACK_PACKAGE_EXECUTABLES "ryzomcore${NL_VERSION}" "ryzomcore")
+SET(CPACK_SET_DESTDIR TRUE)
 
 # NSIS Specific Packing Setup
-SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "NeL")
+SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "RyzomCore")
 SET(CPACK_NSIS_MODIFY_PATH "ON")
 SET(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/resources/nevraxpill.ico)
 SET(CPACK_NSIS_MUI_UNIICON ${CMAKE_SOURCE_DIR}/resources/nevraxpill.ico)
 SET(CPACK_PACKAGE_ICON ${CMAKE_SOURCE_DIR}/resources\\\\nel.bmp)
-SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} NeL")
+SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} RyzomCore")
 SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\dev.ryzom.com")
 SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\dev.ryzom.com\\\\projects\\\\nel\\\\wiki")
 SET(CPACK_NSIS_CONTACT "matt.raykowski@gmail.com")
 
 ## Source Packages
-SET(CPACK_PACKAGE_FILE_NAME "nel-${NL_VERSION}")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "nel-${NL_VERSION}")
+SET(CPACK_PACKAGE_FILE_NAME "ryzomcore-${NL_VERSION}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "ryzomcore-${NL_VERSION}")
 IF(WIN32)
   #SET(CPACK_GENERATOR "NSIS")
   SET(CPACK_GENERATOR "NSIS;ZIP")
diff --git a/code/CMakeModules/AndroidToolChain.cmake b/code/CMakeModules/AndroidToolChain.cmake
index 049c39adf..6690497d4 100644
--- a/code/CMakeModules/AndroidToolChain.cmake
+++ b/code/CMakeModules/AndroidToolChain.cmake
@@ -26,63 +26,46 @@ IF(TARGET_CPU STREQUAL "armv7")
   SET(LIBRARY_ARCHITECTURE "armeabi-v7a")
   SET(CMAKE_SYSTEM_PROCESSOR "armv7")
   SET(TOOLCHAIN_ARCH "arm")
-  SET(TOOLCHAIN_PREFIX "arm-linux-androideabi")
+  SET(GCC_TOOLCHAIN_PREFIX "arm-linux-androideabi")
   SET(TOOLCHAIN_BIN_PREFIX "arm")
   SET(MINIMUM_NDK_TARGET 4)
 ELSEIF(TARGET_CPU STREQUAL "armv5")
   SET(LIBRARY_ARCHITECTURE "armeabi")
   SET(CMAKE_SYSTEM_PROCESSOR "armv5")
   SET(TOOLCHAIN_ARCH "arm")
-  SET(TOOLCHAIN_PREFIX "arm-linux-androideabi")
+  SET(GCC_TOOLCHAIN_PREFIX "arm-linux-androideabi")
   SET(TOOLCHAIN_BIN_PREFIX "arm")
   SET(MINIMUM_NDK_TARGET 4)
 ELSEIF(TARGET_CPU STREQUAL "x86")
   SET(LIBRARY_ARCHITECTURE "x86")
   SET(CMAKE_SYSTEM_PROCESSOR "x86")
   SET(TOOLCHAIN_ARCH "x86")
-  SET(TOOLCHAIN_PREFIX "x86")
+  SET(GCC_TOOLCHAIN_PREFIX "x86")
   SET(TOOLCHAIN_BIN_PREFIX "i686")
   SET(MINIMUM_NDK_TARGET 9)
 ELSEIF(TARGET_CPU STREQUAL "mips")
   SET(LIBRARY_ARCHITECTURE "mips")
   SET(CMAKE_SYSTEM_PROCESSOR "mips")
   SET(TOOLCHAIN_ARCH "mips")
-  SET(TOOLCHAIN_PREFIX "mipsel-linux-android")
+  SET(GCC_TOOLCHAIN_PREFIX "mipsel-linux-android")
   SET(TOOLCHAIN_BIN_PREFIX "mipsel")
   SET(MINIMUM_NDK_TARGET 9)
 ENDIF(TARGET_CPU STREQUAL "armv7")
 
+SET(ANDROID_COMPILER "GCC")
+
+IF(NDK_TOOLCHAIN_VERSION STREQUAL "clang")
+  SET(ANDROID_COMPILER "clang")
+  SET(CLANG_TOOLCHAIN_PREFIX "llvm")
+  SET(CLANG ON)
+ELSE()
+  SET(GCC_TOOLCHAIN_VERSION ${NDK_TOOLCHAIN_VERSION})
+ENDIF()
+
 IF(NOT NDK_TARGET)
   SET(NDK_TARGET ${MINIMUM_NDK_TARGET})
 ENDIF(NOT NDK_TARGET)
 
-FILE(GLOB _TOOLCHAIN_VERSIONS "${NDK_ROOT}/toolchains/${TOOLCHAIN_PREFIX}-*")
-IF(_TOOLCHAIN_VERSIONS)
-  LIST(SORT _TOOLCHAIN_VERSIONS)
-  LIST(REVERSE _TOOLCHAIN_VERSIONS)
-  FOREACH(_TOOLCHAIN_VERSION ${_TOOLCHAIN_VERSIONS})
-    STRING(REGEX REPLACE ".+${TOOLCHAIN_PREFIX}-([0-9.]+)" "\\1" _TOOLCHAIN_VERSION "${_TOOLCHAIN_VERSION}")
-    IF(_TOOLCHAIN_VERSION MATCHES "^([0-9.]+)$")
-      LIST(APPEND NDK_TOOLCHAIN_VERSIONS ${_TOOLCHAIN_VERSION})
-    ENDIF(_TOOLCHAIN_VERSION MATCHES "^([0-9.]+)$")
-  ENDFOREACH(_TOOLCHAIN_VERSION)
-ENDIF(_TOOLCHAIN_VERSIONS)
-
-IF(NOT NDK_TOOLCHAIN_VERSIONS)
-  MESSAGE(FATAL_ERROR "No Android toolchain found in default search path ${NDK_ROOT}/toolchains")
-ENDIF(NOT NDK_TOOLCHAIN_VERSIONS)
-
-IF(NDK_TOOLCHAIN_VERSION)
-  LIST(FIND NDK_TOOLCHAIN_VERSIONS "${NDK_TOOLCHAIN_VERSION}" _INDEX)
-  IF(_INDEX EQUAL -1)
-    LIST(GET NDK_TOOLCHAIN_VERSIONS 0 NDK_TOOLCHAIN_VERSION)
-  ENDIF(_INDEX EQUAL -1)
-ELSE(NDK_TOOLCHAIN_VERSION)
-  LIST(GET NDK_TOOLCHAIN_VERSIONS 0 NDK_TOOLCHAIN_VERSION)
-ENDIF(NDK_TOOLCHAIN_VERSION)
-
-MESSAGE(STATUS "Target Android NDK ${NDK_TARGET} and use GCC ${NDK_TOOLCHAIN_VERSION}")
-
 IF(CMAKE_HOST_WIN32)
   SET(TOOLCHAIN_HOST "windows")
   SET(TOOLCHAIN_BIN_SUFFIX ".exe")
@@ -94,33 +77,73 @@ ELSEIF(CMAKE_HOST_UNIX)
   SET(TOOLCHAIN_BIN_SUFFIX "")
 ENDIF(CMAKE_HOST_WIN32)
 
-SET(TOOLCHAIN_ROOT "${NDK_ROOT}/toolchains/${TOOLCHAIN_PREFIX}-${NDK_TOOLCHAIN_VERSION}/prebuilt/${TOOLCHAIN_HOST}")
-SET(PLATFORM_ROOT "${NDK_ROOT}/platforms/android-${NDK_TARGET}/arch-${TOOLCHAIN_ARCH}")
+MACRO(SEARCH_TOOLCHAIN _COMPILER)
+  SET(${_COMPILER}_TOOLCHAIN_VERSIONS)
+  FILE(GLOB _TOOLCHAIN_VERSIONS "${NDK_ROOT}/toolchains/${${_COMPILER}_TOOLCHAIN_PREFIX}-*")
+  IF(_TOOLCHAIN_VERSIONS)
+    LIST(SORT _TOOLCHAIN_VERSIONS)
+    LIST(REVERSE _TOOLCHAIN_VERSIONS)
+    FOREACH(_TOOLCHAIN_VERSION ${_TOOLCHAIN_VERSIONS})
+      STRING(REGEX REPLACE ".+${_PREFIX}-([0-9.]+)" "\\1" _TOOLCHAIN_VERSION "${_TOOLCHAIN_VERSION}")
+      IF(_TOOLCHAIN_VERSION MATCHES "^([0-9.]+)$")
+        LIST(APPEND ${_COMPILER}_TOOLCHAIN_VERSIONS ${_TOOLCHAIN_VERSION})
+      ENDIF()
+    ENDFOREACH()
+  ENDIF()
+
+  IF(NOT ${_COMPILER}_TOOLCHAIN_VERSIONS)
+    MESSAGE(FATAL_ERROR "No Android ${_COMPILER} toolchain found in default search path ${NDK_ROOT}/toolchains")
+  ENDIF()
+
+  IF(${_COMPILER}_TOOLCHAIN_VERSIONS)
+    LIST(FIND ${_COMPILER}_TOOLCHAIN_VERSIONS "${${_COMPILER}_TOOLCHAIN_VERSION}" _INDEX)
+    IF(_INDEX EQUAL -1)
+      LIST(GET ${_COMPILER}_TOOLCHAIN_VERSIONS 0 ${_COMPILER}_TOOLCHAIN_VERSION)
+    ENDIF()
+  ELSE()
+    LIST(GET ${_COMPILER}_TOOLCHAIN_VERSIONS 0 ${_COMPILER}_TOOLCHAIN_VERSION)
+  ENDIF()
+
+  SET(${_COMPILER}_TOOLCHAIN_ROOT "${NDK_ROOT}/toolchains/${${_COMPILER}_TOOLCHAIN_PREFIX}-${${_COMPILER}_TOOLCHAIN_VERSION}/prebuilt/${TOOLCHAIN_HOST}")
+
+  IF(NOT EXISTS "${${_COMPILER}_TOOLCHAIN_ROOT}")
+    FILE(GLOB _TOOLCHAIN_PREFIXES "${${_COMPILER}_TOOLCHAIN_ROOT}*")
+    IF(_TOOLCHAIN_PREFIXES)
+      LIST(GET _TOOLCHAIN_PREFIXES 0 ${_COMPILER}_TOOLCHAIN_ROOT)
+    ENDIF(_TOOLCHAIN_PREFIXES)
+  ENDIF()
+ENDMACRO()
+
+IF(CLANG)
+  SEARCH_TOOLCHAIN(CLANG)
+
+  MESSAGE(STATUS "Target Android NDK ${NDK_TARGET} and use clang ${CLANG_TOOLCHAIN_VERSION}")
+ENDIF()
+
+SEARCH_TOOLCHAIN(GCC)
 
-IF(NOT EXISTS "${TOOLCHAIN_ROOT}")
-  FILE(GLOB _TOOLCHAIN_PREFIXES "${TOOLCHAIN_ROOT}*")
-  IF(_TOOLCHAIN_PREFIXES)
-    LIST(GET _TOOLCHAIN_PREFIXES 0 TOOLCHAIN_ROOT)
-  ENDIF(_TOOLCHAIN_PREFIXES)
-ENDIF(NOT EXISTS "${TOOLCHAIN_ROOT}")
+MESSAGE(STATUS "Target Android NDK ${NDK_TARGET} and use GCC ${GCC_TOOLCHAIN_VERSION}")
+MESSAGE(STATUS "Found Android LLVM toolchain in ${CLANG_TOOLCHAIN_ROOT}")
+MESSAGE(STATUS "Found Android GCC toolchain in ${GCC_TOOLCHAIN_ROOT}")
+
+SET(PLATFORM_ROOT "${NDK_ROOT}/platforms/android-${NDK_TARGET}/arch-${TOOLCHAIN_ARCH}")
 
-MESSAGE(STATUS "Found Android toolchain in ${TOOLCHAIN_ROOT}")
 MESSAGE(STATUS "Found Android platform in ${PLATFORM_ROOT}")
 
 # include dirs
 SET(PLATFORM_INCLUDE_DIR "${PLATFORM_ROOT}/usr/include")
 SET(STL_DIR "${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++")
 
-IF(EXISTS "${STL_DIR}/${NDK_TOOLCHAIN_VERSION}")
+IF(EXISTS "${STL_DIR}/${GCC_TOOLCHAIN_VERSION}")
   # NDK version >= 8b
-  SET(STL_DIR "${STL_DIR}/${NDK_TOOLCHAIN_VERSION}")
-ENDIF(EXISTS "${STL_DIR}/${NDK_TOOLCHAIN_VERSION}")
+  SET(STL_DIR "${STL_DIR}/${GCC_TOOLCHAIN_VERSION}")
+ENDIF(EXISTS "${STL_DIR}/${GCC_TOOLCHAIN_VERSION}")
 
 # Determine bin prefix for toolchain
-FILE(GLOB _TOOLCHAIN_BIN_PREFIXES "${TOOLCHAIN_ROOT}/bin/${TOOLCHAIN_BIN_PREFIX}-*-gcc${TOOLCHAIN_BIN_SUFFIX}")
+FILE(GLOB _TOOLCHAIN_BIN_PREFIXES "${GCC_TOOLCHAIN_ROOT}/bin/${TOOLCHAIN_BIN_PREFIX}-*-gcc${TOOLCHAIN_BIN_SUFFIX}")
 IF(_TOOLCHAIN_BIN_PREFIXES)
   LIST(GET _TOOLCHAIN_BIN_PREFIXES 0 _TOOLCHAIN_BIN_PREFIX)
-  STRING(REGEX REPLACE "${TOOLCHAIN_ROOT}/bin/([a-z0-9-]+)-gcc${TOOLCHAIN_BIN_SUFFIX}" "\\1" TOOLCHAIN_BIN_PREFIX "${_TOOLCHAIN_BIN_PREFIX}")
+  STRING(REGEX REPLACE "${GCC_TOOLCHAIN_ROOT}/bin/([a-z0-9-]+)-gcc${TOOLCHAIN_BIN_SUFFIX}" "\\1" TOOLCHAIN_BIN_PREFIX "${_TOOLCHAIN_BIN_PREFIX}")
 ENDIF(_TOOLCHAIN_BIN_PREFIXES)
 
 SET(STL_INCLUDE_DIR "${STL_DIR}/include")
@@ -128,22 +151,48 @@ SET(STL_LIBRARY_DIR "${STL_DIR}/libs/${LIBRARY_ARCHITECTURE}")
 SET(STL_INCLUDE_CPU_DIR "${STL_LIBRARY_DIR}/include")
 SET(STL_LIBRARY "${STL_LIBRARY_DIR}/libgnustl_static.a")
 
-SET(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN_ROOT} ${PLATFORM_ROOT}/usr ${CMAKE_PREFIX_PATH} ${CMAKE_INSTALL_PREFIX} $ENV{EXTERNAL_ANDROID_PATH} CACHE string  "Android find search path root")
+MESSAGE(STATUS "STL include dir: ${STL_INCLUDE_DIR}")
+MESSAGE(STATUS "STL library dir: ${STL_LIBRARY_DIR}")
+
+SET(CMAKE_FIND_ROOT_PATH ${CLANG_TOOLCHAIN_ROOT} ${GCC_TOOLCHAIN_ROOT} ${PLATFORM_ROOT}/usr ${CMAKE_PREFIX_PATH} ${CMAKE_INSTALL_PREFIX} $ENV{EXTERNAL_ANDROID_PATH} CACHE string  "Android find search path root")
 
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
-INCLUDE_DIRECTORIES(${STL_INCLUDE_DIR} ${STL_INCLUDE_CPU_DIR})
-
 MACRO(SET_TOOLCHAIN_BINARY _NAME _BINARY)
-  SET(${_NAME} ${TOOLCHAIN_ROOT}/bin/${TOOLCHAIN_BIN_PREFIX}-${_BINARY}${TOOLCHAIN_BIN_SUFFIX})
+  IF("${_BINARY}" MATCHES "clang")
+    SET(${_NAME} ${CLANG_TOOLCHAIN_ROOT}/bin/${_BINARY}${TOOLCHAIN_BIN_SUFFIX} CACHE PATH "" FORCE )
+  ELSE()
+    SET(${_NAME} ${GCC_TOOLCHAIN_ROOT}/bin/${TOOLCHAIN_BIN_PREFIX}-${_BINARY}${TOOLCHAIN_BIN_SUFFIX} CACHE PATH "" FORCE)
+  ENDIF()
 ENDMACRO(SET_TOOLCHAIN_BINARY)
 
-SET_TOOLCHAIN_BINARY(CMAKE_C_COMPILER gcc)
-SET_TOOLCHAIN_BINARY(CMAKE_CXX_COMPILER g++)
-
 # Force the compilers to GCC for Android
 include (CMakeForceCompiler)
-CMAKE_FORCE_C_COMPILER(${CMAKE_C_COMPILER} GNU)
-CMAKE_FORCE_CXX_COMPILER(${CMAKE_CXX_COMPILER} GNU)
+
+IF(CLANG)
+  SET_TOOLCHAIN_BINARY(CMAKE_C_COMPILER clang)
+  SET_TOOLCHAIN_BINARY(CMAKE_CXX_COMPILER clang++)
+
+  CMAKE_FORCE_C_COMPILER(${CMAKE_C_COMPILER} clang)
+  CMAKE_FORCE_CXX_COMPILER(${CMAKE_CXX_COMPILER} clang)
+
+  MESSAGE(STATUS "Using clang compiler")
+ELSE()
+  SET_TOOLCHAIN_BINARY(CMAKE_C_COMPILER gcc)
+  SET_TOOLCHAIN_BINARY(CMAKE_CXX_COMPILER g++)
+
+  CMAKE_FORCE_C_COMPILER(${CMAKE_C_COMPILER} GNU)
+  CMAKE_FORCE_CXX_COMPILER(${CMAKE_CXX_COMPILER} GNU)
+
+  MESSAGE(STATUS "Using GCC compiler")
+ENDIF()
+
+SET_TOOLCHAIN_BINARY(CMAKE_STRIP strip)
+SET_TOOLCHAIN_BINARY(CMAKE_AR ar)
+SET_TOOLCHAIN_BINARY(CMAKE_LINKER ld)
+SET_TOOLCHAIN_BINARY(CMAKE_NM nm)
+SET_TOOLCHAIN_BINARY(CMAKE_OBJCOPY objcopy)
+SET_TOOLCHAIN_BINARY(CMAKE_OBJDUMP objdump)
+SET_TOOLCHAIN_BINARY(CMAKE_RANLIB ranlib)
diff --git a/code/CMakeModules/FindDirectXSDK.cmake b/code/CMakeModules/FindDirectXSDK.cmake
index 3cf91ec3c..b64fca6ea 100644
--- a/code/CMakeModules/FindDirectXSDK.cmake
+++ b/code/CMakeModules/FindDirectXSDK.cmake
@@ -52,12 +52,6 @@ IF(DXSDK_DIR)
   FIND_DXSDK_LIBRARY(DXSDK_XAUDIO_LIBRARY x3daudio)
   FIND_DXSDK_LIBRARY(DXSDK_D3DX9_LIBRARY d3dx9)
   FIND_DXSDK_LIBRARY(DXSDK_D3D9_LIBRARY d3d9)
-
-  #FIND_DXSDK_LIBRARY(DXSDK_MESH_LIBRARY mesh)
-  #FIND_DXSDK_LIBRARY(DXSDK_MAXUTIL_LIBRARY maxutil)
-  #FIND_DXSDK_LIBRARY(DXSDK_MAXSCRIPT_LIBRARY maxscrpt)
-  #FIND_DXSDK_LIBRARY(DXSDK_PARAMBLK2_LIBRARY paramblk2)
-  #FIND_DXSDK_LIBRARY(DXSDK_BMM_LIBRARY bmm)
 ENDIF(DXSDK_DIR)
 
 # Handle the QUIETLY and REQUIRED arguments and set DXSDK_FOUND to TRUE if
diff --git a/code/CMakeModules/FindIconv.cmake b/code/CMakeModules/FindIconv.cmake
index 5e9e48250..092b35702 100644
--- a/code/CMakeModules/FindIconv.cmake
+++ b/code/CMakeModules/FindIconv.cmake
@@ -1,4 +1,4 @@
-# - Try to find Iconv on Mac OS X
+# - Try to find Iconv 
 # Once done this will define 
 # 
 #  ICONV_FOUND - system has Iconv 
@@ -6,78 +6,59 @@
 #  ICONV_LIBRARIES - Link these to use Iconv 
 #  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
 # 
+include(CheckCCompilerFlag)
+include(CheckCSourceCompiles)
 
-IF(APPLE)
-  include(CheckCCompilerFlag)
-  include(CheckCSourceCompiles)
-  
-  IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-    # Already in cache, be silent
-    SET(ICONV_FIND_QUIETLY TRUE)
-  ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-  
-  IF(APPLE)
-      FIND_PATH(ICONV_INCLUDE_DIR iconv.h
-               PATHS
-               /opt/local/include/
-               NO_CMAKE_SYSTEM_PATH
-      )
-  
-      FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c
-               PATHS
-               /opt/local/lib/
-               NO_CMAKE_SYSTEM_PATH
-      )
-  ENDIF(APPLE)
-  
-  FIND_PATH(ICONV_INCLUDE_DIR iconv.h PATHS /opt/local/include /sw/include)
-  
-  string(REGEX REPLACE "(.*)/include/?" "\\1" ICONV_INCLUDE_BASE_DIR "${ICONV_INCLUDE_DIR}")
-  
-  FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c HINTS "${ICONV_INCLUDE_BASE_DIR}/lib" PATHS /opt/local/lib)
-   
-  IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-     SET(ICONV_FOUND TRUE) 
-  ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-  
-  set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-  set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-  IF(ICONV_FOUND)
-    check_c_compiler_flag("-Werror" ICONV_HAVE_WERROR)
-    set (CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
-    if(ICONV_HAVE_WERROR)
-      set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-    endif(ICONV_HAVE_WERROR)
-    check_c_source_compiles("
-    #include <iconv.h>
-    int main(){
-      iconv_t conv = 0;
-      const char* in = 0;
-      size_t ilen = 0;
-      char* out = 0;
-      size_t olen = 0;
-      iconv(conv, &in, &ilen, &out, &olen);
-      return 0;
-    }
-  " ICONV_SECOND_ARGUMENT_IS_CONST )
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
-  ENDIF(ICONV_FOUND)
-  set(CMAKE_REQUIRED_INCLUDES)
-  set(CMAKE_REQUIRED_LIBRARIES)
-  
-  IF(ICONV_FOUND) 
-    IF(NOT ICONV_FIND_QUIETLY) 
-      MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
-    ENDIF(NOT ICONV_FIND_QUIETLY) 
-  ELSE(ICONV_FOUND) 
-    IF(Iconv_FIND_REQUIRED) 
-      MESSAGE(FATAL_ERROR "Could not find Iconv") 
-    ENDIF(Iconv_FIND_REQUIRED) 
-  ENDIF(ICONV_FOUND) 
-  
-  MARK_AS_ADVANCED(
-    ICONV_INCLUDE_DIR
-    ICONV_LIBRARIES
-    ICONV_SECOND_ARGUMENT_IS_CONST
-  )
-ENDIF(APPLE)
+IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+  # Already in cache, be silent
+  SET(ICONV_FIND_QUIETLY TRUE)
+ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+
+FIND_PATH(ICONV_INCLUDE_DIR iconv.h HINTS /sw/include/ PATHS /opt/local) 
+ 
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c PATHS /opt/local)
+ 
+IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+   SET(ICONV_FOUND TRUE) 
+ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
+IF(ICONV_FOUND)
+  check_c_compiler_flag("-Werror" ICONV_HAVE_WERROR)
+  set (CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
+  if(ICONV_HAVE_WERROR)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+  endif(ICONV_HAVE_WERROR)
+  check_c_source_compiles("
+  #include <iconv.h>
+  int main(){
+    iconv_t conv = 0;
+    const char* in = 0;
+    size_t ilen = 0;
+    char* out = 0;
+    size_t olen = 0;
+    iconv(conv, &in, &ilen, &out, &olen);
+    return 0;
+  }
+" ICONV_SECOND_ARGUMENT_IS_CONST )
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
+ENDIF(ICONV_FOUND)
+set(CMAKE_REQUIRED_INCLUDES)
+set(CMAKE_REQUIRED_LIBRARIES)
+
+IF(ICONV_FOUND) 
+  IF(NOT ICONV_FIND_QUIETLY) 
+    MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
+  ENDIF(NOT ICONV_FIND_QUIETLY) 
+ELSE(ICONV_FOUND) 
+  IF(Iconv_FIND_REQUIRED) 
+    MESSAGE(FATAL_ERROR "Could not find Iconv") 
+  ENDIF(Iconv_FIND_REQUIRED) 
+ENDIF(ICONV_FOUND) 
+
+MARK_AS_ADVANCED(
+  ICONV_INCLUDE_DIR
+  ICONV_LIBRARIES
+  ICONV_SECOND_ARGUMENT_IS_CONST
+)
diff --git a/code/CMakeModules/FindLibOVR.cmake b/code/CMakeModules/FindLibOVR.cmake
index 1403a4b2c..707949613 100644
--- a/code/CMakeModules/FindLibOVR.cmake
+++ b/code/CMakeModules/FindLibOVR.cmake
@@ -38,7 +38,7 @@ ELSEIF(WIN32)
 ENDIF(UNIX)
 
 FIND_LIBRARY(LIBOVR_LIBRARY
-  NAMES ovr
+  NAMES ovr libovr
   PATHS
   $ENV{LIBOVR_DIR}/${LIBOVR_LIBRARY_BUILD_PATH}
   /usr/local/lib
diff --git a/code/CMakeModules/FindLuabind.cmake b/code/CMakeModules/FindLuabind.cmake
index f61885be8..73255077a 100644
--- a/code/CMakeModules/FindLuabind.cmake
+++ b/code/CMakeModules/FindLuabind.cmake
@@ -11,6 +11,12 @@ MACRO(FIND_CORRECT_LUA_VERSION)
 
     SET(LUA52_LIBRARY "liblua5.2")
     CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
+    
+    IF(NOT LUALIB_FOUND)
+      # fedora (v20)
+      SET(LUA52_LIBRARY "liblua-5.2")
+      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
+    ENDIF(NOT LUALIB_FOUND)
 
     IF(LUALIB_FOUND)
       MESSAGE(STATUS "Luabind is using Lua 5.2")
@@ -63,14 +69,48 @@ FIND_PATH(LUABIND_INCLUDE_DIR
   /opt/include
 )
 
-SET(LIBRARY_NAME_RELEASE luabind libluabind)
-SET(LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+SET(LIBRARY_NAME_RELEASE)
+SET(LIBRARY_NAME_DEBUG)
+
+IF(WITH_LUA52)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua52)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua52d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua52)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua52d)
+ENDIF()
+
+IF(WITH_LUA51)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua51)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua51d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua51)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua51d)
+ENDIF()
+
+IF(WITH_LUA50)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua50)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua50d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua50)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua50d)
+ENDIF()
 
 IF(WITH_STLPORT)
-  SET(LIBRARY_NAME_RELEASE luabind_stlport ${LIBRARY_NAME_RELEASE})
-  SET(LIBRARY_NAME_DEBUG luabind_stlportd ${LIBRARY_NAME_DEBUG})
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlportd)
 ENDIF(WITH_STLPORT)
 
+# generic libraries names
+LIST(APPEND LIBRARY_NAME_RELEASE luabind libluabind)
+LIST(APPEND LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+
 FIND_LIBRARY(LUABIND_LIBRARY_RELEASE
   NAMES ${LIBRARY_NAME_RELEASE}
   PATHS
diff --git a/code/CMakeModules/FindMSVC.cmake b/code/CMakeModules/FindMSVC.cmake
index 16455b02d..94146775d 100644
--- a/code/CMakeModules/FindMSVC.cmake
+++ b/code/CMakeModules/FindMSVC.cmake
@@ -57,13 +57,15 @@ ENDMACRO(DETECT_EXPRESS_VERSION)
 
 IF(MSVC12)
   DETECT_VC_VERSION("12.0")
+  SET(MSVC_TOOLSET "120")
 
   IF(NOT MSVC12_REDIST_DIR)
     # If you have VC++ 2013 Express, put x64/Microsoft.VC120.CRT/*.dll in ${EXTERNAL_PATH}/redist
     SET(MSVC12_REDIST_DIR "${EXTERNAL_PATH}/redist")
-  ENDIF(NOT MSVC11_REDIST_DIR)
+  ENDIF(NOT MSVC12_REDIST_DIR)
 ELSEIF(MSVC11)
   DETECT_VC_VERSION("11.0")
+  SET(MSVC_TOOLSET "110")
 
   IF(NOT MSVC11_REDIST_DIR)
     # If you have VC++ 2012 Express, put x64/Microsoft.VC110.CRT/*.dll in ${EXTERNAL_PATH}/redist
@@ -71,6 +73,7 @@ ELSEIF(MSVC11)
   ENDIF(NOT MSVC11_REDIST_DIR)
 ELSEIF(MSVC10)
   DETECT_VC_VERSION("10.0")
+  SET(MSVC_TOOLSET "100")
 
   IF(NOT MSVC10_REDIST_DIR)
     # If you have VC++ 2010 Express, put x64/Microsoft.VC100.CRT/*.dll in ${EXTERNAL_PATH}/redist
@@ -78,8 +81,10 @@ ELSEIF(MSVC10)
   ENDIF(NOT MSVC10_REDIST_DIR)
 ELSEIF(MSVC90)
   DETECT_VC_VERSION("9.0")
+  SET(MSVC_TOOLSET "90")
 ELSEIF(MSVC80)
   DETECT_VC_VERSION("8.0")
+  SET(MSVC_TOOLSET "80")
 ENDIF(MSVC12)
 
 # If you plan to use VC++ compilers with WINE, set VC_DIR environment variable
diff --git a/code/CMakeModules/FindMySQL.cmake b/code/CMakeModules/FindMySQL.cmake
index eb2102c8d..0e0ebfd48 100644
--- a/code/CMakeModules/FindMySQL.cmake
+++ b/code/CMakeModules/FindMySQL.cmake
@@ -13,7 +13,7 @@
 IF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
    SET(MYSQL_FOUND TRUE)
 
-ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+ELSE()
 
   FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
       PATH_SUFFIXES mysql
@@ -33,7 +33,7 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
       PATHS
       $ENV{ProgramFiles}/MySQL/*/lib/opt
       $ENV{SystemDrive}/MySQL/*/lib/opt)
-  ELSE(WIN32 AND MSVC)
+  ELSE()
     FIND_LIBRARY(MYSQL_LIBRARY_RELEASE NAMES mysqlclient
       PATHS
       /usr/lib
@@ -51,31 +51,30 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
       /usr/local/lib/mysql
       /opt/local/lib/mysql5/mysql
       )
-  ENDIF(WIN32 AND MSVC)
+  ENDIF()
 
   IF(MYSQL_INCLUDE_DIR)
     IF(MYSQL_LIBRARY_RELEASE)
-      SET(MYSQL_LIBRARIES optimized ${MYSQL_LIBRARY_RELEASE})
       IF(MYSQL_LIBRARY_DEBUG)
-        SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} debug ${MYSQL_LIBRARY_DEBUG})
-      ELSE(MYSQL_LIBRARY_DEBUG)
-	    SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} debug ${MYSQL_LIBRARY_RELEASE})
-      ENDIF(MYSQL_LIBRARY_DEBUG)
+        SET(MYSQL_LIBRARIES optimized ${MYSQL_LIBRARY_RELEASE} debug ${MYSQL_LIBRARY_DEBUG})
+      ELSE()
+	    SET(MYSQL_LIBRARIES ${MYSQL_LIBRARY_RELEASE})
+      ENDIF()
       FIND_PACKAGE(OpenSSL)
       IF(OPENSSL_FOUND)
         SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} ${OPENSSL_LIBRARIES})
-      ENDIF(OPENSSL_FOUND)
-    ENDIF(MYSQL_LIBRARY_RELEASE)
-  ENDIF(MYSQL_INCLUDE_DIR)
+      ENDIF()
+    ENDIF()
+  ENDIF()
 
   IF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
     SET(MYSQL_FOUND TRUE)
     MESSAGE(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}")
-  ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+  ELSE()
     SET(MYSQL_FOUND FALSE)
     MESSAGE(STATUS "MySQL not found.")
-  ENDIF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+  ENDIF()
 
   MARK_AS_ADVANCED(MYSQL_LIBRARY_RELEASE MYSQL_LIBRARY_DEBUG)
 
-ENDIF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+ENDIF()
diff --git a/code/CMakeModules/FindSquish.cmake b/code/CMakeModules/FindSquish.cmake
index ad0f7ce80..61250fec1 100644
--- a/code/CMakeModules/FindSquish.cmake
+++ b/code/CMakeModules/FindSquish.cmake
@@ -55,10 +55,12 @@ FIND_LIBRARY(SQUISH_LIBRARY_DEBUG
 IF(SQUISH_INCLUDE_DIR)
   IF(SQUISH_LIBRARY_RELEASE)
     SET(SQUISH_FOUND "YES")
-
     SET(SQUISH_LIBRARIES "optimized;${SQUISH_LIBRARY_RELEASE}")
     IF(SQUISH_LIBRARY_DEBUG)
       SET(SQUISH_LIBRARIES "${SQUISH_LIBRARIES};debug;${SQUISH_LIBRARY_DEBUG}")
+    ELSE(SQUISH_LIBRARY_DEBUG)
+      SET(SQUISH_LIBRARIES "${SQUISH_LIBRARIES};debug;${SQUISH_LIBRARY_RELEASE}")
+      MESSAGE("Debug Squish NOT found, using the release version!")
     ENDIF(SQUISH_LIBRARY_DEBUG)
   ENDIF(SQUISH_LIBRARY_RELEASE)
 ENDIF(SQUISH_INCLUDE_DIR)
diff --git a/code/CMakeModules/FindWindowsSDK.cmake b/code/CMakeModules/FindWindowsSDK.cmake
index 2e72af9e5..31288eb03 100644
--- a/code/CMakeModules/FindWindowsSDK.cmake
+++ b/code/CMakeModules/FindWindowsSDK.cmake
@@ -68,6 +68,10 @@ ENDIF(WINSDKCURRENT_VERSION_INCLUDE)
 
 SET(WINSDKENV_DIR $ENV{WINSDK_DIR})
 
+IF(NOT WINSDKENV_DIR)
+  SET(WINSDKENV_DIR $ENV{WindowsSDKDir})
+ENDIF(NOT WINSDKENV_DIR)
+
 MACRO(FIND_WINSDK_VERSION_HEADERS)
   IF(WINSDK_DIR AND NOT WINSDK_VERSION)
     # Search version in headers
@@ -78,7 +82,6 @@ MACRO(FIND_WINSDK_VERSION_HEADERS)
     )
 
     IF(_MSI_FILE)
-
       # Look for Windows SDK 8.0
       FILE(STRINGS ${_MSI_FILE} _CONTENT REGEX "^#ifndef NTDDI_WIN8")
 
@@ -181,7 +184,7 @@ MACRO(USE_CURRENT_WINSDK)
       # Look for Windows.h because there are several paths
       IF(EXISTS ${_INCLUDE}/Windows.h)
         STRING(REGEX REPLACE "/(include|INCLUDE|Include)(.*)" "" WINSDK_DIR ${_INCLUDE})
-        MESSAGE(STATUS "Found Windows SDK from include environment variable in ${WINSDK_DIR}")
+        MESSAGE(STATUS "Found Windows SDK in INCLUDE environment variable: ${WINSDK_DIR}")
         BREAK()
       ENDIF(EXISTS ${_INCLUDE}/Windows.h)
     ENDFOREACH(_INCLUDE)
@@ -280,6 +283,13 @@ FIND_PATH(WINSDK_SHARED_INCLUDE_DIR d3d9.h
   ${WINSDK_DIR}/Include
 )
 
+# directory where OpenGL headers are found
+FIND_PATH(WINSDK_OPENGL_INCLUDE_DIR GL.h
+  HINTS
+  ${WINSDK_DIR}/Include/gl
+  ${WINSDK_DIR}/Include
+)
+
 # directory where all libraries are found
 FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib
   HINTS
@@ -303,7 +313,7 @@ FIND_PROGRAM(WINSDK_MIDL midl
 
 IF(WINSDK_INCLUDE_DIR)
   SET(WINSDK_FOUND ON)
-  SET(WINSDK_INCLUDE_DIRS ${WINSDK_INCLUDE_DIR} ${WINSDK_SHARED_INCLUDE_DIR})
+  SET(WINSDK_INCLUDE_DIRS ${WINSDK_INCLUDE_DIR} ${WINSDK_SHARED_INCLUDE_DIR} ${WINSDK_OPENGL_INCLUDE_DIR})
   SET(CMAKE_LIBRARY_PATH ${WINSDK_LIBRARY_DIR} ${CMAKE_LIBRARY_PATH})
   INCLUDE_DIRECTORIES(${WINSDK_INCLUDE_DIRS})
 
diff --git a/code/CMakeModules/GetRevision.cmake b/code/CMakeModules/GetRevision.cmake
index 21b234f74..7f0a4e5f1 100644
--- a/code/CMakeModules/GetRevision.cmake
+++ b/code/CMakeModules/GetRevision.cmake
@@ -13,38 +13,44 @@ IF(SOURCE_DIR)
 
   IF(NOT ROOT_DIR AND SOURCE_DIR)
     SET(ROOT_DIR ${SOURCE_DIR})
-  ENDIF(NOT ROOT_DIR AND SOURCE_DIR)
+  ENDIF()
 
   IF(NOT SOURCE_DIR AND ROOT_DIR)
     SET(SOURCE_DIR ${ROOT_DIR})
-  ENDIF(NOT SOURCE_DIR AND ROOT_DIR)
-ELSE(SOURCE_DIR)
+  ENDIF()
+ELSE()
   SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
   SET(ROOT_DIR ${CMAKE_SOURCE_DIR})
-ENDIF(SOURCE_DIR)
+ENDIF()
 
 MACRO(NOW RESULT)
   IF (WIN32)
     EXECUTE_PROCESS(COMMAND "wmic" "os" "get" "localdatetime" OUTPUT_VARIABLE DATETIME)
     IF(NOT DATETIME MATCHES "ERROR")
       STRING(REGEX REPLACE ".*\n([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9]).*" "\\1-\\2-\\3 \\4:\\5:\\6" ${RESULT} "${DATETIME}")
-    ENDIF(NOT DATETIME MATCHES "ERROR")
+    ENDIF()
   ELSEIF(UNIX)
     EXECUTE_PROCESS(COMMAND "date" "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE DATETIME)
     STRING(REGEX REPLACE "([0-9: -]+).*" "\\1" ${RESULT} "${DATETIME}")
-  ELSE (WIN32)
+  ELSE()
     MESSAGE(SEND_ERROR "date not implemented")
     SET(${RESULT} "0000-00-00 00:00:00")
-  ENDIF (WIN32)
+  ENDIF()
 ENDMACRO(NOW)
 
 IF(EXISTS "${ROOT_DIR}/.svn/")
-  FIND_PACKAGE(Subversion)
+  FIND_PACKAGE(Subversion QUIET)
 
   IF(SUBVERSION_FOUND)
     Subversion_WC_INFO(${ROOT_DIR} ER)
     SET(REVISION ${ER_WC_REVISION})
   ENDIF(SUBVERSION_FOUND)
+
+  FIND_PACKAGE(TortoiseSVN QUIET)
+
+  IF(TORTOISESVN_FOUND)
+    TORTOISESVN_GET_REVISION(${ROOT_DIR} REVISION)
+  ENDIF(TORTOISESVN_FOUND)
 ENDIF(EXISTS "${ROOT_DIR}/.svn/")
 
 IF(EXISTS "${ROOT_DIR}/.hg/")
@@ -55,8 +61,8 @@ IF(EXISTS "${ROOT_DIR}/.hg/")
     SET(REVISION ${ER_WC_REVISION})
     SET(CHANGESET ${ER_WC_CHANGESET})
     SET(BRANCH ${ER_WC_BRANCH})
-  ENDIF(MERCURIAL_FOUND)
-ENDIF(EXISTS "${ROOT_DIR}/.hg/")
+  ENDIF()
+ENDIF()
 
 # if processing exported sources, use "revision" file if exists
 IF(SOURCE_DIR AND NOT DEFINED REVISION)
@@ -64,8 +70,8 @@ IF(SOURCE_DIR AND NOT DEFINED REVISION)
   IF(EXISTS ${REVISION_FILE})
     FILE(STRINGS ${REVISION_FILE} REVISION LIMIT_COUNT 1)
     MESSAGE(STATUS "Read revision ${REVISION} from file")
-  ENDIF(EXISTS ${REVISION_FILE})
-ENDIF(SOURCE_DIR AND NOT DEFINED REVISION)
+  ENDIF()
+ENDIF()
 
 IF(SOURCE_DIR AND DEFINED REVISION)
   IF(EXISTS ${SOURCE_DIR}/revision.h.in)
@@ -73,5 +79,5 @@ IF(SOURCE_DIR AND DEFINED REVISION)
     NOW(BUILD_DATE)
     CONFIGURE_FILE(${SOURCE_DIR}/revision.h.in revision.h.txt)
     EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy revision.h.txt revision.h) # copy_if_different
-  ENDIF(EXISTS ${SOURCE_DIR}/revision.h.in)
-ENDIF(SOURCE_DIR AND DEFINED REVISION)
+  ENDIF()
+ENDIF()
diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 95c0f6460..3862e0a70 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -6,6 +6,9 @@ IF(NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
+# Declare CMAKE_CONFIGURATION_TYPES before PROJECT
+SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
+
 ###
 # Helper macro that generates .pc and installs it.
 # Argument: name - the name of the .pc package, e.g. "nel-pacs.pc"
@@ -252,6 +255,16 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   ELSE(WITH_STATIC)
     OPTION(WITH_STATIC_LIBXML2    "With static libxml2"                           OFF)
   ENDIF(WITH_STATIC)
+  IF (WITH_STATIC)
+    OPTION(WITH_STATIC_CURL       "With static curl"                              ON )
+  ELSE(WITH_STATIC)
+    OPTION(WITH_STATIC_CURL       "With static curl"                              OFF)
+  ENDIF(WITH_STATIC)
+  IF(APPLE)
+    OPTION(WITH_LIBXML2_ICONV     "With libxml2 using iconv"                      ON )
+  ELSE(APPLE)
+    OPTION(WITH_LIBXML2_ICONV     "With libxml2 using iconv"                      OFF)
+  ENDIF(APPLE)
   OPTION(WITH_STATIC_DRIVERS      "With static drivers."                          OFF)
   IF(WIN32)
     OPTION(WITH_EXTERNAL          "With provided external."                       ON )
@@ -361,6 +374,7 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
   ###
   OPTION(WITH_LUA51               "Build Ryzom Core using Lua 5.1"                ON )
   OPTION(WITH_LUA52               "Build Ryzom Core using Lua 5.2"                OFF)
+  OPTION(WITH_RYZOM_CLIENT_UAC    "Ask to run as Administrator"                   OFF)
 ENDMACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
 
 MACRO(NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS)
@@ -385,8 +399,6 @@ MACRO(NL_SETUP_BUILD)
   # Debug                 = NL_DEBUG
   # Release               = NL_RELEASE
 
-  SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
-
   IF(CMAKE_BUILD_TYPE MATCHES "Debug")
     SET(NL_BUILD_MODE "NL_DEBUG")
   ELSE(CMAKE_BUILD_TYPE MATCHES "Debug")
@@ -557,9 +569,15 @@ MACRO(NL_SETUP_BUILD)
     # Ignore default include paths
     ADD_PLATFORM_FLAGS("/X")
 
-    IF(MSVC11)
+    IF(MSVC12)
       ADD_PLATFORM_FLAGS("/Gy- /MP")
-      # /Ox is working with VC++ 2010, but custom optimizations don't exist
+      # /Ox is working with VC++ 2013, but custom optimizations don't exist
+      SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
+      # without inlining it's unusable, use custom optimizations again
+      SET(DEBUG_CFLAGS "/Od /Ob1 /GF- ${DEBUG_CFLAGS}")
+    ELSEIF(MSVC11)
+      ADD_PLATFORM_FLAGS("/Gy- /MP")
+      # /Ox is working with VC++ 2012, but custom optimizations don't exist
       SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
       # without inlining it's unusable, use custom optimizations again
       SET(DEBUG_CFLAGS "/Od /Ob1 /GF- ${DEBUG_CFLAGS}")
@@ -581,9 +599,9 @@ MACRO(NL_SETUP_BUILD)
       SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
       # without inlining it's unusable, use custom optimizations again
       SET(DEBUG_CFLAGS "/Od /Ob1 ${DEBUG_CFLAGS}")
-    ELSE(MSVC11)
+    ELSE(MSVC12)
       MESSAGE(FATAL_ERROR "Can't determine compiler version ${MSVC_VERSION}")
-    ENDIF(MSVC11)
+    ENDIF(MSVC12)
 
     ADD_PLATFORM_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250")
 
diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt
index 53bf071e3..16a8166fe 100644
--- a/code/nel/CMakeLists.txt
+++ b/code/nel/CMakeLists.txt
@@ -83,4 +83,3 @@ IF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
   ENDIF(WITH_NEL_TOOLS)
   ADD_SUBDIRECTORY(tools)
 ENDIF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
-
diff --git a/code/nel/include/nel/3d/anim_detail_trav.h b/code/nel/include/nel/3d/anim_detail_trav.h
index 7b51afe84..0a94fe376 100644
--- a/code/nel/include/nel/3d/anim_detail_trav.h
+++ b/code/nel/include/nel/3d/anim_detail_trav.h
@@ -71,7 +71,7 @@ public:
 	// For clipTrav. cleared at beginning of CClipTrav::traverse
 	void				clearVisibleList();
 
-	// For ClipTrav only. NB: list is cleared at begininng of traverse(). NB: only CTransform are supported
+	// For ClipTrav only. NB: list is cleared at beginning of traverse(). NB: only CTransform are supported
 	void				addVisibleModel(CTransform *model)
 	{
 		_VisibleList[_CurrentNumVisibleModels]= model;
diff --git a/code/nel/include/nel/3d/driver.h b/code/nel/include/nel/3d/driver.h
index 8738a7dda..39cafc2de 100644
--- a/code/nel/include/nel/3d/driver.h
+++ b/code/nel/include/nel/3d/driver.h
@@ -493,7 +493,7 @@ public:
 	 *
 	 * NB: you must setupViewMatrix() BEFORE setupModelMatrix(), or else undefined results.
 	 */
-	virtual void			setupViewMatrix(const CMatrix &mtx)=0;
+	virtual void			setupViewMatrix(const CMatrix &mtx) = 0;
 
 	/** setup the view matrix (inverse of camera matrix).
 	 *	Extended: give a cameraPos (mtx.Pos() is not taken into account but for getViewMatrix()),
@@ -1422,7 +1422,6 @@ protected:
 
 private:
 	bool					_StaticMemoryToVRAM;
-
 };
 
 // --------------------------------------------------
diff --git a/code/nel/include/nel/3d/text_context.h b/code/nel/include/nel/3d/text_context.h
index 203e2b3c3..8cf7ad7f0 100644
--- a/code/nel/include/nel/3d/text_context.h
+++ b/code/nel/include/nel/3d/text_context.h
@@ -82,6 +82,8 @@ public:
 
 	void setShaded (bool b) { _Shaded = b; }
 
+	void setShadeOutline (bool b) { _ShadeOutline = b; }
+
 	void setShadeExtent (float shext) { _ShadeExtent = shext; }
 
 	/// The alpha of the shade is multiplied at each draw with the alpha of the color. Default: (0,0,0,255)
@@ -107,6 +109,8 @@ public:
 
 	bool						getShaded() const  { return _Shaded; }
 
+	bool						getShadeOutline() const  { return _ShadeOutline; }
+
 	bool						getKeep800x600Ratio() const {return _Keep800x600Ratio;}
 
 	NLMISC::CRGBA				getShadeColor () const { return _ShadeColor; }
@@ -138,15 +142,30 @@ public:
 	{
 		nlassert (index < _CacheStrings.size());
 		CComputedString &rCS = _CacheStrings[index];
-		if(_Shaded)
+		if (_Shaded)
 		{
-			CRGBA	bkup = rCS.Color;
+			CRGBA bkup = rCS.Color;
 			rCS.Color = _ShadeColor;
 			rCS.Color.A = (uint8)((uint(bkup.A) * uint(_ShadeColor.A)+1)>>8);
-			rCS.render2D (*_Driver, x+_ShadeExtent, z-_ShadeExtent, _HotSpot, _ScaleX, _ScaleZ);
+			if (_ShadeOutline)
+			{
+				float rext = _ShadeExtent * 0.7071f;
+				rCS.render2D(*_Driver, x+rext, z-rext, _HotSpot, _ScaleX, _ScaleZ);
+				rCS.render2D(*_Driver, x-rext, z-rext, _HotSpot, _ScaleX, _ScaleZ);
+				rCS.render2D(*_Driver, x-rext, z+rext, _HotSpot, _ScaleX, _ScaleZ);
+				rCS.render2D(*_Driver, x+rext, z+rext, _HotSpot, _ScaleX, _ScaleZ);
+				rCS.render2D(*_Driver, x+_ShadeExtent, z, _HotSpot, _ScaleX, _ScaleZ);
+				rCS.render2D(*_Driver, x-_ShadeExtent, z, _HotSpot, _ScaleX, _ScaleZ);
+				rCS.render2D(*_Driver, x, z-_ShadeExtent, _HotSpot, _ScaleX, _ScaleZ);
+				rCS.render2D(*_Driver, x, z-_ShadeExtent, _HotSpot, _ScaleX, _ScaleZ);
+			}
+			else
+			{
+				rCS.render2D(*_Driver, x+_ShadeExtent, z-_ShadeExtent, _HotSpot, _ScaleX, _ScaleZ);
+			}
 			rCS.Color= bkup;
 		}
-		rCS.render2D (*_Driver, x, z, _HotSpot, _ScaleX, _ScaleZ);
+		rCS.render2D(*_Driver, x, z, _HotSpot, _ScaleX, _ScaleZ);
 	}
 
 	/** Clip and print a string that is in the cache (it leaves the string in the cache)
@@ -161,7 +180,22 @@ public:
 			CRGBA	bkup = rCS.Color;
 			rCS.Color= _ShadeColor;
 			rCS.Color.A = (uint8)((uint(bkup.A) * uint(_ShadeColor.A)+1)>>8);
-			rCS.render2DClip(*_Driver, rdrBuffer, x+_ShadeExtent, z-_ShadeExtent, xmin, ymin, xmax, ymax);
+			if (_ShadeOutline)
+			{
+				float rext = _ShadeExtent * 0.7071f;
+				rCS.render2DClip(*_Driver, rdrBuffer, x+rext, z-rext, xmin, ymin, xmax, ymax);
+				rCS.render2DClip(*_Driver, rdrBuffer, x-rext, z-rext, xmin, ymin, xmax, ymax);
+				rCS.render2DClip(*_Driver, rdrBuffer, x-rext, z+rext, xmin, ymin, xmax, ymax);
+				rCS.render2DClip(*_Driver, rdrBuffer, x+rext, z+rext, xmin, ymin, xmax, ymax);
+				rCS.render2DClip(*_Driver, rdrBuffer, x+_ShadeExtent, z, xmin, ymin, xmax, ymax);
+				rCS.render2DClip(*_Driver, rdrBuffer, x-_ShadeExtent, z, xmin, ymin, xmax, ymax);
+				rCS.render2DClip(*_Driver, rdrBuffer, x, z+_ShadeExtent, xmin, ymin, xmax, ymax);
+				rCS.render2DClip(*_Driver, rdrBuffer, x, z-_ShadeExtent, xmin, ymin, xmax, ymax);
+			}
+			else
+			{
+				rCS.render2DClip(*_Driver, rdrBuffer, x+_ShadeExtent, z-_ShadeExtent, xmin, ymin, xmax, ymax);
+			}
 			rCS.Color= bkup;
 		}
 		rCS.render2DClip (*_Driver, rdrBuffer, x, z, xmin, ymin, xmax, ymax);
@@ -174,12 +208,27 @@ public:
 	{
 		nlassert (index < _CacheStrings.size());
 		CComputedString &rCS = _CacheStrings[index];
-		if(_Shaded)
+		if (_Shaded)
 		{
 			CRGBA	bkup = rCS.Color;
 			rCS.Color= _ShadeColor;
 			rCS.Color.A = (uint8)((uint(bkup.A) * uint(_ShadeColor.A)+1)>>8);
-			rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x+_ShadeExtent, y-_ShadeExtent, depth, xmin, ymin, xmax, ymax);
+			if (_ShadeOutline)
+			{
+				float rext = _ShadeExtent * 0.7071f;
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x+rext, y-rext, depth, xmin, ymin, xmax, ymax);
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x-rext, y-rext, depth, xmin, ymin, xmax, ymax);
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x-rext, y+rext, depth, xmin, ymin, xmax, ymax);
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x+rext, y+rext, depth, xmin, ymin, xmax, ymax);
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x+_ShadeExtent, y, depth, xmin, ymin, xmax, ymax);
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x-_ShadeExtent, y, depth, xmin, ymin, xmax, ymax);
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x, y+_ShadeExtent, depth, xmin, ymin, xmax, ymax);
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x, y-_ShadeExtent, depth, xmin, ymin, xmax, ymax);
+			}
+			else
+			{
+				rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x+_ShadeExtent, y-_ShadeExtent, depth, xmin, ymin, xmax, ymax);
+			}
 			rCS.Color= bkup;
 		}
 		rCS.render2DUnProjected (*_Driver, renderBuffer, frustum, scaleMatrix, x, y, depth, xmin, ymin, xmax, ymax);
@@ -194,17 +243,32 @@ public:
 		_FontManager->computeString (ucstr, _FontGen, _Color, _FontSize, _Driver, _TempString, _Keep800x600Ratio);
 
 		// draw shaded
-		if(_Shaded)
+		if (_Shaded)
 		{
 			CRGBA	bkup = _TempString.Color;
-			_TempString.Color= _ShadeColor;
+			_TempString.Color = _ShadeColor;
 			_TempString.Color.A = (uint8)((uint(bkup.A) * uint(_ShadeColor.A)+1)>>8);
-			_TempString.render2D (*_Driver,x+_ShadeExtent,z-_ShadeExtent,_HotSpot,_ScaleX,_ScaleZ);
-			_TempString.Color= bkup;
+			if (_ShadeOutline)
+			{
+				float rext = _ShadeExtent * 0.7071f;
+				_TempString.render2D(*_Driver,x+rext,z-rext,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x-rext,z-rext,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x-rext,z+rext,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x+rext,z+rext,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x+_ShadeExtent,z,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x-_ShadeExtent,z,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x,z+_ShadeExtent,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x,z-_ShadeExtent,_HotSpot,_ScaleX,_ScaleZ);
+			}
+			else
+			{
+				_TempString.render2D(*_Driver,x+_ShadeExtent,z-_ShadeExtent,_HotSpot,_ScaleX,_ScaleZ);
+			}
+			_TempString.Color = bkup;
 		}
 
 		// draw
-		_TempString.render2D (*_Driver, x, z, _HotSpot, _ScaleX, _ScaleZ);
+		_TempString.render2D(*_Driver, x, z, _HotSpot, _ScaleX, _ScaleZ);
 	}
 
 	/// Directly print a string
@@ -218,17 +282,32 @@ public:
 		_FontManager->computeString (str, _FontGen, _Color, _FontSize, _Driver, _TempString, _Keep800x600Ratio);
 
 		// draw shaded
-		if(_Shaded)
+		if (_Shaded)
 		{
 			CRGBA	bkup = _TempString.Color;
 			_TempString.Color = _ShadeColor;
 			_TempString.Color.A = (uint8)((uint(bkup.A) * uint(_ShadeColor.A)+1)>>8);
-			_TempString.render2D (*_Driver,x+_ShadeExtent,z-_ShadeExtent,_HotSpot,_ScaleX,_ScaleZ);
-			_TempString.Color= bkup;
+			if (_ShadeOutline)
+			{
+				float rext = _ShadeExtent * 0.7071f;
+				_TempString.render2D(*_Driver,x+rext,z-rext,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x-rext,z-rext,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x-rext,z+rext,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x+rext,z+rext,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x+_ShadeExtent,z,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x-_ShadeExtent,z,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x,z+_ShadeExtent,_HotSpot,_ScaleX,_ScaleZ);
+				_TempString.render2D(*_Driver,x,z-_ShadeExtent,_HotSpot,_ScaleX,_ScaleZ);
+			}
+			else
+			{
+				_TempString.render2D(*_Driver,x+_ShadeExtent,z-_ShadeExtent,_HotSpot,_ScaleX,_ScaleZ);
+			}
+			_TempString.Color = bkup;
 		}
 
 		// draw
-		_TempString.render2D (*_Driver, x, z, _HotSpot, _ScaleX, _ScaleZ);
+		_TempString.render2D(*_Driver, x, z, _HotSpot, _ScaleX, _ScaleZ);
 	}
 
 	/// Get computed string from index
@@ -317,6 +396,9 @@ private:
 	/// true if text is shaded
 	bool						_Shaded;
 
+	/// true if shade appears as an outline
+	bool						_ShadeOutline;
+
 	/// shade's extent (shadow size)
 	float						_ShadeExtent;
 
diff --git a/code/nel/include/nel/3d/text_context_user.h b/code/nel/include/nel/3d/text_context_user.h
index a95fb2ca1..8e14dc878 100644
--- a/code/nel/include/nel/3d/text_context_user.h
+++ b/code/nel/include/nel/3d/text_context_user.h
@@ -64,19 +64,21 @@ public:
 	/// \name Text look.
 	// @{
 	void setColor(NLMISC::CRGBA color);
-	void setFontSize(uint32 fontSize) ;
-	uint32 getFontSize() const  ;
-	void setHotSpot(THotSpot hotSpot)  ;
-	THotSpot getHotSpot() const ;
-	void setScaleX(float scaleX)  ;
-	void setScaleY(float scaleY)  ;
-	float getScaleX() const ;
-	float getScaleY() const ;
-	void setShaded(bool b) ;
-	bool			getShaded() const  ;
-	void			setShadeExtent(float shext) ;
-	void			setShadeColor (NLMISC::CRGBA sc);
-	NLMISC::CRGBA	getShadeColor () const;
+	void setFontSize(uint32 fontSize);
+	uint32 getFontSize() const;
+	void setHotSpot(THotSpot hotSpot);
+	THotSpot getHotSpot() const;
+	void setScaleX(float scaleX);
+	void setScaleY(float scaleY);
+	float getScaleX() const;
+	float getScaleY() const;
+	void setShaded(bool b);
+	bool getShaded() const;
+	void setShadeOutline(bool b);
+	bool getShadeOutline() const;
+	void setShadeExtent(float shext) ;
+	void setShadeColor (NLMISC::CRGBA sc);
+	NLMISC::CRGBA getShadeColor () const;
 	void setKeep800x600Ratio(bool keep);
 	bool getKeep800x600Ratio() const;
 	// @}
diff --git a/code/nel/include/nel/3d/track_tcb.h b/code/nel/include/nel/3d/track_tcb.h
index e91cfb397..153dcbc54 100644
--- a/code/nel/include/nel/3d/track_tcb.h
+++ b/code/nel/include/nel/3d/track_tcb.h
@@ -218,7 +218,7 @@ protected:
 			date*= previous->OODeltaTime;
 			NLMISC::clamp(date, 0,1);
 
-			date = this->ease(previous, date);
+			date = this->ease(previous, (float)date);
 
 			float hb[4];
 			this->computeHermiteBasis(date, hb);
diff --git a/code/nel/include/nel/3d/u_text_context.h b/code/nel/include/nel/3d/u_text_context.h
index dcaa1949a..1056d3839 100644
--- a/code/nel/include/nel/3d/u_text_context.h
+++ b/code/nel/include/nel/3d/u_text_context.h
@@ -174,6 +174,15 @@ public:
 	 * \return the shade state
 	 */
 	virtual	bool			getShaded () const = 0;
+	/**
+	 * set the shade states
+	 * \param the shade state
+	 */
+	virtual	void			setShadeOutline (bool b) = 0;
+	/**
+	 * \return the shade state
+	 */
+	virtual	bool			getShadeOutline () const = 0;
 	/**
 	 * set the shadow's size
 	 * \param the shade extent
diff --git a/code/nel/include/nel/gui/ctrl_base.h b/code/nel/include/nel/gui/ctrl_base.h
index 71e6cad56..3b522e114 100644
--- a/code/nel/include/nel/gui/ctrl_base.h
+++ b/code/nel/include/nel/gui/ctrl_base.h
@@ -50,6 +50,8 @@ namespace NLGUI
 			// see interface.txt for meaning of auto
 			_ToolTipParentPosRef= Hotspot_TTAuto;
 			_ToolTipPosRef= Hotspot_TTAuto;
+			_EventX = 0;
+			_EventY = 0;
 			resizer = false;
 		}
 
@@ -70,6 +72,9 @@ namespace NLGUI
 
 		bool handleEvent (const NLGUI::CEventDescriptor &event);
 
+		sint32 getEventX() { return _EventX; }
+		sint32 getEventY() { return _EventY; }
+
 		virtual CCtrlBase	*getSubCtrl (sint32 /* x */, sint32 /* y */) { return this; }
 
 		/// Debug
@@ -181,6 +186,9 @@ namespace NLGUI
 		static std::map< std::string, std::map< std::string, std::string > > AHCache;
 
 		bool resizer;
+
+		sint32 _EventX;
+		sint32 _EventY;
 	};
 
 }
diff --git a/code/nel/include/nel/gui/ctrl_text_button.h b/code/nel/include/nel/gui/ctrl_text_button.h
index 183b6a65e..4f5251a8b 100644
--- a/code/nel/include/nel/gui/ctrl_text_button.h
+++ b/code/nel/include/nel/gui/ctrl_text_button.h
@@ -51,6 +51,7 @@ namespace NLGUI
 		// Init part
 		virtual bool parse (xmlNodePtr cur,CInterfaceGroup * parentGroup);
 
+		virtual void checkCoords();
 		virtual void updateCoords();
 
 		virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); }
@@ -126,6 +127,7 @@ namespace NLGUI
 
 		void onRemoved();
 		void onWidgetDeleted( CInterfaceElement *e );
+		void moveBy( sint32 x, sint32 y );
 
 	protected:
 
diff --git a/code/nel/include/nel/gui/dbgroup_combo_box.h b/code/nel/include/nel/gui/dbgroup_combo_box.h
index 75208b1e3..e7be1de4b 100644
--- a/code/nel/include/nel/gui/dbgroup_combo_box.h
+++ b/code/nel/include/nel/gui/dbgroup_combo_box.h
@@ -60,7 +60,7 @@ namespace NLGUI
 		void			setText(uint i, const ucstring &text);
 		void			insertText(uint i, const ucstring &text);
 		const ucstring	&getText(uint i) const;
-		const uint		&getTextId(uint i) const;
+		uint			getTextId(uint i) const;
 		uint			getTextPos(uint nId) const;
 		const ucstring	&getTexture(uint i) const;
 		void			removeText(uint nPos);
diff --git a/code/nel/include/nel/gui/dbview_number.h b/code/nel/include/nel/gui/dbview_number.h
index 2c76a255d..bfa963fb6 100644
--- a/code/nel/include/nel/gui/dbview_number.h
+++ b/code/nel/include/nel/gui/dbview_number.h
@@ -55,9 +55,7 @@ namespace NLGUI
 		static void forceLink();
 
 	protected:
-
-		sint64 getVal() { if (_Modulo == 0) return (_Number.getSInt64() / _Divisor);
-									else	return (_Number.getSInt64() / _Divisor)%_Modulo; }
+		sint64 getVal();
 
 	protected:
 
diff --git a/code/nel/include/nel/gui/editor_selection_watcher.h b/code/nel/include/nel/gui/editor_selection_watcher.h
index 415f4f9db..7e262bdf1 100644
--- a/code/nel/include/nel/gui/editor_selection_watcher.h
+++ b/code/nel/include/nel/gui/editor_selection_watcher.h
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <string>
+#include <vector>
 
 namespace NLGUI
 {
@@ -24,7 +25,7 @@ namespace NLGUI
 	public:
 
 		/// Notifies the watcher about the change
-		virtual void selectionChanged( std::string &newSelection ) = 0;
+		virtual void selectionChanged() = 0;
 	};
 }
 
diff --git a/code/nel/include/nel/gui/group_editbox.h b/code/nel/include/nel/gui/group_editbox.h
index 7ea2ab529..771bdc482 100644
--- a/code/nel/include/nel/gui/group_editbox.h
+++ b/code/nel/include/nel/gui/group_editbox.h
@@ -283,6 +283,10 @@ namespace NLGUI
 
 		sint32	_ViewTextDeltaX;
 
+		CViewText* getVT() const{ return _ViewText; }
+
+		void createViewText();
+
 	private:
 		void setupDisplayText();
 		void makeTopWindow();
diff --git a/code/nel/include/nel/gui/group_editbox_decor.h b/code/nel/include/nel/gui/group_editbox_decor.h
new file mode 100644
index 000000000..975177612
--- /dev/null
+++ b/code/nel/include/nel/gui/group_editbox_decor.h
@@ -0,0 +1,53 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2014  Laszlo Kis-Adam
+// 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/>.
+
+#ifndef GROUP_EDITBOX_DECOR
+#define GROUP_EDITBOX_DECOR
+
+#include "nel/gui/group_editbox.h"
+
+namespace NLGUI
+{
+	/// Decorated CGroupEditBox
+	class CGroupEditBoxDecor : public CGroupEditBox
+	{
+	public:
+		DECLARE_UI_CLASS( CGroupEditBoxDecor )
+
+		CGroupEditBoxDecor( const TCtorParam &param );
+		~CGroupEditBoxDecor();
+
+		void moveBy( sint32 x, sint32 y );
+
+		void setIdRecurse( const std::string &newID );
+
+		std::string getProperty( const std::string &name ) const;
+		void setProperty( const std::string &name, const std::string &value );
+		xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
+		bool parse( xmlNodePtr cur, CInterfaceGroup *parent );
+		void draw();
+		void updateCoords();
+
+		static void forceLink();
+
+	private:
+		class EBDPrivate *_Pvt;
+	};
+}
+
+#endif
+
diff --git a/code/nel/include/nel/gui/group_html.h b/code/nel/include/nel/gui/group_html.h
index 3f5526197..4f9bee46c 100644
--- a/code/nel/include/nel/gui/group_html.h
+++ b/code/nel/include/nel/gui/group_html.h
@@ -17,7 +17,6 @@
 #ifndef CL_GROUP_HTML_H
 #define CL_GROUP_HTML_H
 
-#define CURL_STATICLIB 1
 #include <curl/curl.h>
 
 #include "nel/misc/types_nl.h"
@@ -107,7 +106,7 @@ namespace NLGUI
 		void refresh();
 
 		// submit form
-		void submitForm (uint formId, const char *submitButtonName);
+		void submitForm (uint formId, const char *submitButtonType, const char *submitButtonName, const char *submitButtonValue, sint32 x, sint32 y);
 
 		// Browse error
 		void browseError (const char *msg);
@@ -285,7 +284,7 @@ namespace NLGUI
 		void addImage(const char *image, bool globalColor, bool reloadImg=false);
 
 		// Add a text area in the current paragraph
-		CInterfaceGroup *addTextArea (const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const ucstring &content);
+		CInterfaceGroup *addTextArea (const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const ucstring &content, uint maxlength);
 
 		// Add a combo box in the current paragraph
 		CDBGroupComboBox *addComboBox(const std::string &templateName, const char *name);
@@ -328,7 +327,11 @@ namespace NLGUI
 		bool			_BrowseNextTime;
 		bool			_PostNextTime;
 		uint			_PostFormId;
+		std::string		_PostFormSubmitType;
 		std::string		_PostFormSubmitButton;
+		std::string		_PostFormSubmitValue;
+		sint32			_PostFormSubmitX;
+		sint32			_PostFormSubmitY;
 
 		// Browsing..
 		bool			_Browsing;
@@ -528,7 +531,7 @@ namespace NLGUI
 			CCellParams () : BgColor(0,0,0,0)
 			{
 				Align = CGroupCell::Left;
-				VAlign = CGroupCell::Top;
+				VAlign = CGroupCell::Middle;
 				LeftMargin = 0;
 				NoWrap = false;
 			}
@@ -557,6 +560,7 @@ namespace NLGUI
 		std::string		_TextAreaName;
 		uint			_TextAreaRow;
 		uint			_TextAreaCols;
+		uint			_TextAreaMaxLength;
 
 		// current mode is in select option
 		bool			_SelectOption;
diff --git a/code/nel/include/nel/gui/group_menu.h b/code/nel/include/nel/gui/group_menu.h
index 56b9fb0e3..420967347 100644
--- a/code/nel/include/nel/gui/group_menu.h
+++ b/code/nel/include/nel/gui/group_menu.h
@@ -381,6 +381,7 @@ namespace NLGUI
 
 		bool					_CloseSubMenuUsingPopModal;
 		bool					_Shadow;
+		bool					_ShadowOutline;
 		bool					_Formatted;
 		uint8					_Space;
 		sint32					_FontSize;
diff --git a/code/nel/include/nel/gui/group_table.h b/code/nel/include/nel/gui/group_table.h
index 60d3d9e63..746078908 100644
--- a/code/nel/include/nel/gui/group_table.h
+++ b/code/nel/include/nel/gui/group_table.h
@@ -78,6 +78,9 @@ namespace NLGUI
 		// The Width you want in pixel. This is the <td width="100"> parameter
 		sint32	WidthWanted;
 
+		sint32 ColSpan;
+		sint32 RowSpan;
+		sint32 TableColumnIndex;
 
 		// The min height of the cell
 		sint32	Height;
@@ -142,6 +145,7 @@ namespace NLGUI
 
 		// Table borders
 		sint32	Border;
+		NLMISC::CRGBA BorderColor;
 		sint32	CellPadding;
 		sint32	CellSpacing;
 
@@ -191,13 +195,14 @@ namespace NLGUI
 				WidthMax = 0;
 				WidthWanted = 0;
 				TableRatio = 0;
-				Height = 0;
+				RowSpan = 1;
 			}
 			sint32	Width;
 			sint32	Height;
 			sint32	WidthWanted;
 			sint32	WidthMax;
 			float	TableRatio;
+			sint32	RowSpan;
 		};
 
 		// Table row
diff --git a/code/nel/include/nel/gui/interface_element.h b/code/nel/include/nel/gui/interface_element.h
index 764d165ef..e2f9ffc87 100644
--- a/code/nel/include/nel/gui/interface_element.h
+++ b/code/nel/include/nel/gui/interface_element.h
@@ -117,6 +117,7 @@ namespace NLGUI
 			editorSelected = false;
 
 			serializable = true;
+			_EditorSelectable = true;
 		}
 
 		// dtor
@@ -233,6 +234,9 @@ namespace NLGUI
 
 		virtual void setActive (bool state);
 
+		void setXReal( sint32 x ){ _XReal = x; }
+		void setYReal( sint32 y ){ _YReal = y; }
+
 		void setX (sint32 x) { _X = x; }
 		void setXAndInvalidateCoords (sint32 x) { _X = x; invalidateCoords(); }
 
@@ -488,8 +492,12 @@ namespace NLGUI
 		void setEditorSelected( bool b ){ editorSelected = b; }
 		bool isEditorSelected() const{ return editorSelected; }
 
+		void parsePosParent( const std::string &id );
 		void setPosParent( const std::string &id );
+		void getPosParent( std::string &id ) const;
+		void parseSizeParent( const std::string &id );
 		void setSizeParent( const std::string &id );
+		void getSizeParent( std::string &id ) const;
 		
 		void setSerializable( bool b ){ serializable = b; }
 		bool IsSerializable() const{ return serializable; }
@@ -505,11 +513,35 @@ namespace NLGUI
 
 		/// Called when the widget is deleted,
 		/// so other widgets in the group can check if it belongs to them
-		virtual void onWidgetDeleted( CInterfaceElement *e ){}
+		virtual void onWidgetDeleted( CInterfaceElement *e );
+
+		/// Move the element by x in the X direction and y in the Y direction
+		//  Uses real coordinates
+		virtual void moveBy( sint32 x, sint32 y )
+		{
+			_XReal += x;
+			_YReal += y;
+		}
+
+		/// Retrieves the coordinates of the specified hotspot
+		void getHSCoords( const THotSpot &hs, sint32 &x, sint32 &y ) const;
+
+		/// Tells which hotspot is the closest to the specified element
+		void getClosestHotSpot( const CInterfaceElement *other, THotSpot &hs );
+
+		/// Aligns the element to the other element specified
+		void alignTo( CInterfaceElement *other );
+
+		/// Specifies if the widget can be selected in the editor
+		void setEditorSelectable( bool b ){ _EditorSelectable = b; }
+
+		/// Tells if the widget can be selected in the editor
+		bool isEditorSelectable() const{ return _EditorSelectable; }
 
 	protected:
 
 		bool editorSelected;
+		bool _EditorSelectable;
 
 		static bool editorMode;
 
diff --git a/code/nel/include/nel/gui/widget_addition_watcher.h b/code/nel/include/nel/gui/interface_factory.h
similarity index 81%
rename from code/nel/include/nel/gui/widget_addition_watcher.h
rename to code/nel/include/nel/gui/interface_factory.h
index a2717e398..bd7f8352a 100644
--- a/code/nel/include/nel/gui/widget_addition_watcher.h
+++ b/code/nel/include/nel/gui/interface_factory.h
@@ -14,19 +14,22 @@
 // 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/>.
 
-#ifndef WIDGET_ADD_WATCHER
-#define WIDGET_ADD_WATCHER
+#ifndef IFACE_FACTORY
+#define IFACE_FACTORY
 
 #include <string>
 
 namespace NLGUI
 {
-	class IWidgetAdditionWatcher
+	class CViewBase;
+
+	/// Simple interface element ( widget ) factory
+	class CInterfaceFactory
 	{
 	public:
-		virtual void widgetAdded( const std::string &name ) = 0;
+		static CViewBase* createClass( const std::string &name );
 	};
 }
 
-#endif
 
+#endif
diff --git a/code/nel/include/nel/gui/interface_group.h b/code/nel/include/nel/gui/interface_group.h
index f72bc6f1f..b9efd3357 100644
--- a/code/nel/include/nel/gui/interface_group.h
+++ b/code/nel/include/nel/gui/interface_group.h
@@ -57,6 +57,7 @@ namespace NLGUI
 		CInterfaceElement* findFromShortId(const std::string &id);
 
 		/// Dynamic creation
+		virtual void addElement (CInterfaceElement *child, sint eltOrder = -1 );
 		virtual void addView  (CViewBase *child , sint eltOrder = -1);
 		virtual void addCtrl  (CCtrlBase *child, sint eltOrder = -1);
 		virtual void addGroup (CInterfaceGroup *child, sint eltOrder = -1);
@@ -79,6 +80,9 @@ namespace NLGUI
 		bool delElement (const std::string &id, bool noWarning=false);
 		bool delElement (CInterfaceElement *pIE, bool noWarning=false);
 
+		// Take the element from the group, but don't delete it!
+		CInterfaceElement* takeElement( CInterfaceElement *e );
+
 		uint getNumGroup() const { return (uint)_ChildrenGroups.size(); }
 		CInterfaceGroup *getGroup(uint index) const;
 
@@ -324,6 +328,17 @@ namespace NLGUI
 
 		void onWidgetDeleted( CInterfaceElement *e );
 
+		void moveBy( sint32 x, sint32 y );
+
+		// Blows up the group, moves it's children to it's parent
+		bool explode();
+
+		/// Adjusts the group's size so that all elements are fully inside the borders
+		void spanElements();
+
+		/// Aligns the elements - used for forming groups
+		void alignElements();
+
 	protected:
 
 		void makeNewClip (sint32 &oldClipX, sint32 &oldClipY, sint32 &oldClipW, sint32 &oldClipH);
diff --git a/code/nel/include/nel/gui/interface_options.h b/code/nel/include/nel/gui/interface_options.h
index f52b9479a..da0ea7de8 100644
--- a/code/nel/include/nel/gui/interface_options.h
+++ b/code/nel/include/nel/gui/interface_options.h
@@ -150,16 +150,17 @@ namespace NLGUI
 		sint32 TxId_E_Open,	 W_E_Open,  H_E_Open;
 		sint32 TxId_M_Open,	 W_M_Open,  H_M_Open;
 
-		sint32 TxId_TL_HighLight;
-		sint32 TxId_T_HighLight;
-		sint32 TxId_TR_HighLight;
-		sint32 TxId_L_HighLight;
-		sint32 TxId_R_HighLight;
-		sint32 TxId_BL_HighLight;
-		sint32 TxId_B_HighLight;
-		sint32 TxId_BR_HighLight;
-
-		sint32	HeaderH;
+		sint32 TxId_TL_HighLight,	W_TL_HighLight, H_TL_HighLight;
+		sint32 TxId_T_HighLight,	W_T_HighLight,  H_T_HighLight;
+		sint32 TxId_TR_HighLight,	W_TR_HighLight, H_TR_HighLight;
+		sint32 TxId_L_HighLight,	W_L_HighLight,  H_L_HighLight;
+		sint32 TxId_R_HighLight,	W_R_HighLight,  H_R_HighLight;
+		sint32 TxId_BL_HighLight,	W_BL_HighLight, H_BL_HighLight;
+		sint32 TxId_B_HighLight,	W_B_HighLight,  H_B_HighLight;
+		sint32 TxId_BR_HighLight,	W_BR_HighLight, H_BR_HighLight;
+
+		sint32 HeaderH;
+		sint32 InsetT; // Offset height of top texture
 	};
 
 	// ***************************************************************************
diff --git a/code/nel/include/nel/gui/interface_parser.h b/code/nel/include/nel/gui/interface_parser.h
index 2bf1df9a8..18ec9045a 100644
--- a/code/nel/include/nel/gui/interface_parser.h
+++ b/code/nel/include/nel/gui/interface_parser.h
@@ -28,6 +28,7 @@
 #include "nel/gui/proc.h"
 #include "nel/gui/widget_manager.h"
 #include "nel/gui/link_data.h"
+#include "nel/gui/variable_data.h"
 
 namespace NLGUI
 {
@@ -100,20 +101,6 @@ namespace NLGUI
 			virtual void setupOptions() = 0;
 		};
 
-
-		struct VariableData
-		{
-			std::string entry;
-			std::string type;
-			std::string value;
-			uint32 size;
-
-			VariableData()
-			{
-				size = 0;
-			}
-		};
-
 		CInterfaceParser();
 		virtual ~CInterfaceParser();
 
@@ -353,7 +340,15 @@ namespace NLGUI
 		std::map< std::string, std::string > pointerSettings;
 		std::map< std::string, std::map< std::string, std::string > > keySettings;
 
+		std::string _WorkDir;
+
 	public:
+		/// Sets the working directory, where files should be looked for
+		void setWorkDir( const std::string &workdir ){ _WorkDir = workdir; }
+
+		/// Looks up a file in either the working directory or using CPath::lookup
+		std::string lookup( const std::string &file );
+
 		void initLUA();
 		void uninitLUA();
 		bool isLuaInitialized() const{ return luaInitialized; }
@@ -378,6 +373,7 @@ namespace NLGUI
 
 		void setEditorMode( bool b ){ editorMode = b; }
 
+		void setVariable( const VariableData &v );
 		bool serializeVariables( xmlNodePtr parentNode ) const;
 		bool serializeProcs( xmlNodePtr parentNode ) const;
 		bool serializePointerSettings( xmlNodePtr parentNode ) const;
diff --git a/code/nel/include/nel/gui/interface_property.h b/code/nel/include/nel/gui/interface_property.h
index 63a62ef0e..4ed6e701e 100644
--- a/code/nel/include/nel/gui/interface_property.h
+++ b/code/nel/include/nel/gui/interface_property.h
@@ -47,6 +47,15 @@ namespace NLGUI
 			_VolatileValue = NULL;
 		}
 
+		/// Tells if this property has a value
+		bool hasValue() const
+		{
+			if( _VolatileValue != NULL )
+				return true;
+			else
+				return false;
+		}
+
 		NLMISC::CCDBNodeLeaf* getNodePtr() const
 		{
 			return _VolatileValue;
diff --git a/code/nel/include/nel/gui/libwww.h b/code/nel/include/nel/gui/libwww.h
index 8da217382..bb6b2da86 100644
--- a/code/nel/include/nel/gui/libwww.h
+++ b/code/nel/include/nel/gui/libwww.h
@@ -25,6 +25,8 @@ extern "C"
 #include "WWWInit.h"
 }
 
+#include "nel/misc/rgba.h"
+
 namespace NLGUI
 {
 	class CCtrlBaseButton;
@@ -79,6 +81,7 @@ namespace NLGUI
 		HTML_ATTR(TABLE,ALIGN) = 0,
 			HTML_ATTR(TABLE,BGCOLOR),
 			HTML_ATTR(TABLE,BORDER),
+			HTML_ATTR(TABLE,BORDERCOLOR),
 			HTML_ATTR(TABLE,CELLPADDING),
 			HTML_ATTR(TABLE,CELLSPACING),
 			HTML_ATTR(TABLE,CLASS),
@@ -189,6 +192,7 @@ namespace NLGUI
 		HTML_ATTR(TEXTAREA,DISABLED),
 		HTML_ATTR(TEXTAREA,ID),
 		HTML_ATTR(TEXTAREA,LANG),
+		HTML_ATTR(TEXTAREA,MAXLENGTH),
 		HTML_ATTR(TEXTAREA,NAME),
 		HTML_ATTR(TEXTAREA,READONLY),
 		HTML_ATTR(TEXTAREA,ROWS),
diff --git a/code/nel/include/nel/gui/lua_object.h b/code/nel/include/nel/gui/lua_object.h
index 1564df080..2360f1609 100644
--- a/code/nel/include/nel/gui/lua_object.h
+++ b/code/nel/include/nel/gui/lua_object.h
@@ -285,8 +285,7 @@ namespace NLGUI
 	class CLuaHashMapTraits
 	{
 	public:
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		CLuaHashMapTraits()
 		{}
 
diff --git a/code/nel/include/nel/gui/parser.h b/code/nel/include/nel/gui/parser.h
index db868f70d..bc53e402d 100644
--- a/code/nel/include/nel/gui/parser.h
+++ b/code/nel/include/nel/gui/parser.h
@@ -23,6 +23,7 @@
 #include "nel/misc/types_nl.h"
 #include "nel/gui/proc.h"
 #include "nel/gui/link_data.h"
+#include "nel/gui/variable_data.h"
 
 namespace NLGUI
 {
@@ -83,11 +84,13 @@ namespace NLGUI
 		virtual void removeLinkData( uint32 id ) = 0;
 		virtual bool getLinkData( uint32 id, SLinkData &linkData ) = 0;
 		virtual void updateLinkData( uint32 id, const SLinkData &linkData ) = 0;
+		virtual void setVariable( const VariableData &v ) = 0;
 		virtual bool serializeVariables( xmlNodePtr parentNode ) const = 0;
 		virtual bool serializeProcs( xmlNodePtr parentNode ) const = 0;
 		virtual bool serializePointerSettings( xmlNodePtr parentNode ) const = 0;
 		virtual bool serializeKeySettings( xmlNodePtr parentNode ) const = 0;
 		virtual CViewBase* createClass( const std::string &name ) = 0;
+		virtual void setWorkDir( const std::string &workdir ) = 0;
 	};
 }
 
diff --git a/code/nel/include/nel/gui/root_group.h b/code/nel/include/nel/gui/root_group.h
new file mode 100644
index 000000000..58963a3b2
--- /dev/null
+++ b/code/nel/include/nel/gui/root_group.h
@@ -0,0 +1,46 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
+
+
+#ifndef ROOT_GROUP_H
+#define ROOT_GROUP_H
+
+#include <string>
+#include <map>
+
+#include "nel/gui/interface_group.h"
+
+namespace NLGUI
+{
+
+	class CRootGroup : public CInterfaceGroup
+	{
+	public:
+		CRootGroup(const TCtorParam &param);
+		virtual ~CRootGroup();
+
+		virtual CInterfaceElement* getElement (const std::string &id);
+		virtual void addGroup (CInterfaceGroup *child, sint eltOrder = -1);
+		virtual bool delGroup (CInterfaceGroup *child, bool dontDelete = false);
+
+	private:
+		std::map< std::string, CInterfaceGroup* > _Accel;
+	};
+
+}
+
+#endif
+
diff --git a/code/nel/tools/3d/tile_edit/PIC/readpic.h b/code/nel/include/nel/gui/variable_data.h
similarity index 65%
rename from code/nel/tools/3d/tile_edit/PIC/readpic.h
rename to code/nel/include/nel/gui/variable_data.h
index 614eba224..cffba2bce 100644
--- a/code/nel/tools/3d/tile_edit/PIC/readpic.h
+++ b/code/nel/include/nel/gui/variable_data.h
@@ -14,27 +14,28 @@
 // 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/>.
 
-#ifndef	_READPIC_H_
-#define	_READPIC_H_
+#ifndef VARIABLE_DATA_H
+#define VARIABLE_DATA_H
 
-#ifdef _MSC_VER
-#pragma warning(disable:4786)
-#endif
-
-
-#include <string>
-#include <vector>
+#include "nel/misc/types_nl.h"
 
-#include <nel/misc/types_nl.h>
-#include <nel/misc/rgba.h>
+namespace NLGUI
+{
+	struct VariableData
+	{
+		std::string entry;
+		std::string type;
+		std::string value;
+		uint32 size;
+		
+		VariableData()
+		{
+			size = 0;
+		}
+	};
 
-//============================================================
-// API.
-//============================================================
-
-
-bool	PIC_LoadPic(std::string Path, std::vector<NLMISC::CBGRA> &Tampon, uint &Width, uint &Height);
+}
 
 
+#endif
 
-#endif
\ No newline at end of file
diff --git a/code/nel/include/nel/gui/view_text.h b/code/nel/include/nel/gui/view_text.h
index df3cf27e3..d4377f38e 100644
--- a/code/nel/include/nel/gui/view_text.h
+++ b/code/nel/include/nel/gui/view_text.h
@@ -48,7 +48,7 @@ namespace NLGUI
 
 		/// Constructor
 		CViewText (const std::string& id, const std::string Text="", sint FontSize=12,
-					NLMISC::CRGBA Color=NLMISC::CRGBA(255,255,255), bool Shadow=false);
+					NLMISC::CRGBA Color=NLMISC::CRGBA(255,255,255), bool Shadow=false, bool ShadowOutline=false);
 
 		virtual ~CViewText();
 
@@ -83,6 +83,7 @@ namespace NLGUI
 		void setFontSize (sint nFontSize);
 		void setColor (const NLMISC::CRGBA &color);
 		void setShadow (bool bShadow);
+		void setShadowOutline (bool bShadowOutline);
 		void setShadowColor (const NLMISC::CRGBA &color);
 		void setLineMaxW (sint nMaxW, bool invalidate=true);
 		void setMultiLine (bool bMultiLine);
@@ -102,6 +103,7 @@ namespace NLGUI
 		sint			getFontSize() const;
 		NLMISC::CRGBA	getColor()			{ return _Color; }
 		bool			getShadow()			{ return _Shadow; }
+		bool			getShadowOutline()	{ return _ShadowOutline; }
 		NLMISC::CRGBA	getShadowColor()	{ return _ShadowColor; }
 		sint			getLineMaxW()		const { return _LineMaxW; }
 		bool			getMultiLine() const		{ return _MultiLine; }
@@ -202,7 +204,11 @@ namespace NLGUI
 		REFLECT_EXPORT_END
 
 
-			virtual void serial(NLMISC::IStream &f);
+		virtual void serial(NLMISC::IStream &f);
+
+		// Sets the parent element
+		// See the comment at the field
+		void setParentElm( CInterfaceElement *parent ){ _ParentElm = parent; }
 
 	protected:
 		std::string _HardtextFormat;
@@ -225,6 +231,7 @@ namespace NLGUI
 		NLMISC::CRGBA _Color;
 		/// the shadow mode
 		bool	_Shadow;
+		bool	_ShadowOutline;
 		/// the case mode
 		TCaseMode	_CaseMode;
 		/// the text shadow color
@@ -379,6 +386,9 @@ namespace NLGUI
 		/// Dynamic tooltips
 		std::vector<CCtrlToolTip*>	_Tooltips;
 
+		// Parent element is the element where this text belongs to
+		// For example: text button
+		CInterfaceElement *_ParentElm;
 
 	private:
 		void setup ();
diff --git a/code/nel/include/nel/gui/widget_manager.h b/code/nel/include/nel/gui/widget_manager.h
index 5fd75ac8a..6d2336047 100644
--- a/code/nel/include/nel/gui/widget_manager.h
+++ b/code/nel/include/nel/gui/widget_manager.h
@@ -75,6 +75,16 @@ namespace NLGUI
 			virtual void process() = 0;
 		};
 
+		// Interface for event handlers that can be called when widgets are added or moved
+		class IWidgetWatcher
+		{
+		public:
+			IWidgetWatcher(){}
+			virtual ~IWidgetWatcher(){}
+			virtual void onWidgetAdded( const std::string &name ) = 0;
+			virtual void onWidgetMoved( const std::string &oldid, const std::string &newid ) = 0;
+		};
+
 		/// Frame render times
 		struct SInterfaceTimes
 		{
@@ -332,7 +342,13 @@ namespace NLGUI
 		void drawViews( NL3D::UCamera camera );
 
 		bool handleEvent( const CEventDescriptor &evnt );
-		
+
+		bool handleSystemEvent( const CEventDescriptor &evnt );
+
+		bool handleKeyboardEvent( const CEventDescriptor &evnt );
+
+		bool handleMouseEvent( const CEventDescriptor &evnt );
+
 		bool handleMouseMoveEvent( const CEventDescriptor &eventDesc );
 
 		// Relative move of pointer
@@ -487,17 +503,33 @@ namespace NLGUI
 
 		IParser* getParser() const{ return parser; }
 
-		std::string& getCurrentEditorSelection(){ return currentEditorSelection; }
-		void setCurrentEditorSelection( const std::string &name );
+		/// Retrieves the Id of the currently selected widgets
+		void getEditorSelection( std::vector< std::string > &selection );
+
+		/// Adds the widget with the specified Id to the selected widgets
+		void selectWidget( const std::string &name );
+
+		/// Clears the selection
+		void clearEditorSelection();
+
 		void notifySelectionWatchers();
 		void registerSelectionWatcher( IEditorSelectionWatcher *watcher );
 		void unregisterSelectionWatcher( IEditorSelectionWatcher *watcher );
-		
-		void notifyAdditionWatchers( const std::string &widgetName );
-		void registerAdditionWatcher( IWidgetAdditionWatcher *watcher );
-		void unregisterAdditionWatcher( IWidgetAdditionWatcher *watcher );
+
+
+		void onWidgetAdded( const std::string &id );
+		void onWidgetMoved( const std::string &oldid, const std::string &newid );
+		void registerWidgetWatcher( IWidgetWatcher *watcher );
+		void unregisterWidgetWatcher( IWidgetWatcher *watcher );
 
 		CInterfaceElement* addWidgetToGroup( std::string &group, std::string &widgetClass, std::string &widgetName );
+
+		void setGroupSelection( bool b ){ _GroupSelection = b; }
+		bool groupSelection();
+		bool unGroupSelection();
+		void setMultiSelection( bool b ){ multiSelection = b; }
+
+		bool createNewGUI( const std::string &project, const std::string &window );
 				
 	private:
 		CWidgetManager();
@@ -526,6 +558,11 @@ namespace NLGUI
 
 		NLMISC::CRefPtr< CViewBase > _CapturedView;
 
+		NLMISC::CRefPtr< CInterfaceElement > draggedElement; // the element that we're currently dragging
+
+		bool startDragging();
+		void stopDragging();
+
 		// What is under pointer
 		std::vector< CViewBase* > _ViewsUnderPointer;
 		std::vector< CCtrlBase* > _CtrlsUnderPointer;
@@ -583,10 +620,12 @@ namespace NLGUI
 		std::vector< INewScreenSizeHandler* > newScreenSizeHandlers;
 		std::vector< IOnWidgetsDrawnHandler* > onWidgetsDrawnHandlers;
 		std::vector< IEditorSelectionWatcher* > selectionWatchers;
-		std::vector< IWidgetAdditionWatcher* > additionWatchers;
+		std::vector< IWidgetWatcher* > widgetWatchers;
 		
-
-		std::string currentEditorSelection;
+		std::vector< std::string > editorSelection;
+		bool _GroupSelection;
+		bool multiSelection;
+		uint32 _WidgetCount;
 	};
 
 }
diff --git a/code/nel/include/nel/misc/app_context.h b/code/nel/include/nel/misc/app_context.h
index 46d2a15c7..df9165baf 100644
--- a/code/nel/include/nel/misc/app_context.h
+++ b/code/nel/include/nel/misc/app_context.h
@@ -88,6 +88,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert) =0;
 		virtual bool getAlreadyCreateSharedAmongThreads() =0;
 		virtual void setAlreadyCreateSharedAmongThreads(bool b) =0;
+		virtual bool isWindowedApplication() = 0;
+		virtual void setWindowedApplication(bool b = true) = 0;
 		//@}
 	protected:
 		/// Called by derived class to finalize initialisation of context
@@ -131,6 +133,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert);
 		virtual bool getAlreadyCreateSharedAmongThreads();
 		virtual void setAlreadyCreateSharedAmongThreads(bool b);
+		virtual bool isWindowedApplication();
+		virtual void setWindowedApplication(bool b);
 
 	private:
 		/// Singleton registry
@@ -147,6 +151,7 @@ namespace NLMISC
 		bool DebugNeedAssert;
 		bool NoAssert;
 		bool AlreadyCreateSharedAmongThreads;
+		bool WindowedApplication;
 	};
 
 	/** This class implements the context interface for the a library module.
@@ -183,6 +188,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert);
 		virtual bool getAlreadyCreateSharedAmongThreads();
 		virtual void setAlreadyCreateSharedAmongThreads(bool b);
+		virtual bool isWindowedApplication();
+		virtual void setWindowedApplication(bool b);
 
 	private:
 		/// Pointer to the application context.
diff --git a/code/nel/include/nel/misc/callback.h b/code/nel/include/nel/misc/callback.h
new file mode 100644
index 000000000..ca5140f6f
--- /dev/null
+++ b/code/nel/include/nel/misc/callback.h
@@ -0,0 +1,327 @@
+/*
+
+Copyright (c) 2009-2014, Jan BOON
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef NLMISC_CALLBACK_H
+#define NLMISC_CALLBACK_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+#include <nel/misc/debug.h>
+
+// Project includes
+
+namespace NLMISC {
+
+#define NLMISC_CALLBACK_TEMPLATE \
+/** \
+ * \brief NLMISC_CALLBACK_ARGS_CLASS \
+ * \date 2009-03-03 18:09GMT \
+ * \author Jan BOON \
+ * Callback template \
+ */ \
+template<typename TReturn NLMISC_CALLBACK_ARGS_TYPENAME> \
+class NLMISC_CALLBACK_ARGS_CLASS \
+{ \
+	/* Very simple reference counting callback base */ \
+	class CCallbackBase \
+	{ \
+	public: \
+		CCallbackBase() : m_RefCount(0) \
+		{ \
+			 \
+		} \
+		 \
+		virtual ~CCallbackBase() \
+		{ \
+			nlassert(!m_RefCount); \
+		} \
+		 \
+		void refAdd() \
+		{ \
+			++m_RefCount; \
+		} \
+		 \
+		void refRemove() \
+		{ \
+			--m_RefCount; \
+			if (!m_RefCount) \
+				delete this; \
+		} \
+		 \
+		virtual TReturn callback(NLMISC_CALLBACK_ARGS_DECL) = 0; \
+		 \
+		virtual bool equals(const CCallbackBase *callbackBase) = 0; \
+		 \
+		/* disable copy */ \
+		CCallbackBase(const CCallbackBase &); \
+		CCallbackBase &operator=(const CCallbackBase &); \
+		 \
+	private: \
+		uint m_RefCount; \
+	}; \
+	 \
+	typedef TReturn TCallbackFunction(NLMISC_CALLBACK_ARGS_DECL); \
+	class CCallbackFunction : public CCallbackBase \
+	{ \
+	public: \
+		CCallbackFunction(TCallbackFunction *callbackFunction) : m_CallbackFunction(callbackFunction) \
+		{ \
+			nlassert(m_CallbackFunction); \
+		} \
+		 \
+		virtual ~CCallbackFunction() \
+		{ \
+			m_CallbackFunction = NULL; \
+		} \
+		 \
+		virtual TReturn callback(NLMISC_CALLBACK_ARGS_DECL) \
+		{ \
+			return m_CallbackFunction(NLMISC_CALLBACK_ARGS_IMPL); \
+		} \
+		 \
+		virtual bool equals(const CCallbackBase *callbackBase) \
+		{ \
+			const CCallbackFunction *callbackFunction = \
+				dynamic_cast<const CCallbackFunction *>(callbackBase); \
+			if (!callbackFunction) return false; \
+			return m_CallbackFunction == callbackFunction->m_CallbackFunction; \
+		} \
+		 \
+	private: \
+		TCallbackFunction *m_CallbackFunction; \
+	}; \
+	 \
+	template<typename TClass> \
+	class CCallbackMethod : public CCallbackBase \
+	{ \
+		typedef TReturn (TClass::*TCallbackMethod)(NLMISC_CALLBACK_ARGS_DECL); \
+	public: \
+		CCallbackMethod(TClass *callbackObject, TCallbackMethod callbackMethod) : m_CallbackObject(callbackObject), m_CallbackMethod(callbackMethod) \
+		{ \
+			nlassert(m_CallbackObject); \
+			nlassert(m_CallbackMethod); \
+		} \
+		 \
+		virtual ~CCallbackMethod() \
+		{ \
+			m_CallbackObject = NULL; \
+			m_CallbackMethod = NULL; \
+		} \
+		 \
+		virtual TReturn callback(NLMISC_CALLBACK_ARGS_DECL) \
+		{ \
+			return (m_CallbackObject->*m_CallbackMethod)(NLMISC_CALLBACK_ARGS_IMPL); \
+		} \
+		 \
+		virtual bool equals(const CCallbackBase *callbackBase) \
+		{ \
+			const CCallbackMethod *callbackMethod = \
+				dynamic_cast<const CCallbackMethod *>(callbackBase); \
+			if (!callbackMethod) return false; \
+			return m_CallbackObject == callbackMethod->m_CallbackObject \
+				&& m_CallbackMethod == callbackMethod->m_CallbackMethod; \
+		} \
+		 \
+	private: \
+		TClass *m_CallbackObject; \
+		TCallbackMethod m_CallbackMethod; \
+	}; \
+	 \
+public: \
+	CCallback() : m_CallbackBase(NULL) \
+	{ \
+		 \
+	} \
+	 \
+	CCallback(TCallbackFunction *callbackFunction) : m_CallbackBase(new CCallbackFunction(callbackFunction)) \
+	{ \
+		nlassert(m_CallbackBase); \
+		m_CallbackBase->refAdd(); \
+	} \
+	 \
+	template<typename TClass> \
+	CCallback(TClass *callbackObject, TReturn (TClass::*callbackMethod)(NLMISC_CALLBACK_ARGS_DECL)) : m_CallbackBase(new CCallbackMethod<TClass>(callbackObject, callbackMethod)) \
+	{ \
+		nlassert(m_CallbackBase); \
+		m_CallbackBase->refAdd(); \
+	} \
+	 \
+	CCallback(const CCallback &callback) \
+	{ \
+		m_CallbackBase = callback.m_CallbackBase; \
+		if (m_CallbackBase) \
+			m_CallbackBase->refAdd(); \
+	} \
+	 \
+	CCallback &operator=(const CCallback &callback) \
+	{ \
+		if (m_CallbackBase != callback.m_CallbackBase) \
+		{ \
+			if (m_CallbackBase) \
+				m_CallbackBase->refRemove(); \
+			m_CallbackBase = callback.m_CallbackBase; \
+			if (m_CallbackBase) \
+				m_CallbackBase->refAdd(); \
+		} \
+		return *this; \
+	} \
+	 \
+	~CCallback() \
+	{ \
+		if (m_CallbackBase) \
+		{ \
+			m_CallbackBase->refRemove(); \
+			m_CallbackBase = NULL; \
+		} \
+	} \
+	 \
+	TReturn callback(NLMISC_CALLBACK_ARGS_DECL) \
+	{ \
+		nlassert(m_CallbackBase); \
+		return m_CallbackBase->callback(NLMISC_CALLBACK_ARGS_IMPL); \
+	} \
+	 \
+	TReturn operator()(NLMISC_CALLBACK_ARGS_DECL) \
+	{ \
+		nlassert(m_CallbackBase); \
+		return m_CallbackBase->callback(NLMISC_CALLBACK_ARGS_IMPL); \
+	} \
+	 \
+	bool valid() const \
+	{ \
+		return m_CallbackBase != NULL; \
+	} \
+	 \
+	operator bool() const \
+	{ \
+		return m_CallbackBase != NULL; \
+	} \
+	 \
+	bool operator==(const CCallback &callback) \
+	{ \
+		return m_CallbackBase->equals(callback.m_CallbackBase); \
+	} \
+	 \
+private: \
+	CCallbackBase *m_CallbackBase; \
+	 \
+}; /* class CCallback */ \
+
+template<typename TReturn, typename TArgsA = void, typename TArgsB = void, typename TArgsC = void, typename TArgsD = void, typename TArgsE = void, typename TArgsF = void, typename TArgsG = void, typename TDummy = void>
+class CCallback;
+
+#define NLMISC_CALLBACK_ARGS_CLASS CCallback<TReturn, void, void, void, void, void, void, void, void>
+#define NLMISC_CALLBACK_ARGS_TYPENAME 
+#define NLMISC_CALLBACK_ARGS_DECL 
+#define NLMISC_CALLBACK_ARGS_IMPL 
+NLMISC_CALLBACK_TEMPLATE
+#undef NLMISC_CALLBACK_ARGS_CLASS
+#undef NLMISC_CALLBACK_ARGS_TYPENAME
+#undef NLMISC_CALLBACK_ARGS_DECL
+#undef NLMISC_CALLBACK_ARGS_IMPL
+
+#define NLMISC_CALLBACK_ARGS_CLASS CCallback<TReturn, TArgsA, void, void, void, void, void, void, void>
+#define NLMISC_CALLBACK_ARGS_TYPENAME , typename TArgsA
+#define NLMISC_CALLBACK_ARGS_DECL TArgsA argsA
+#define NLMISC_CALLBACK_ARGS_IMPL argsA
+NLMISC_CALLBACK_TEMPLATE
+#undef NLMISC_CALLBACK_ARGS_CLASS
+#undef NLMISC_CALLBACK_ARGS_TYPENAME
+#undef NLMISC_CALLBACK_ARGS_DECL
+#undef NLMISC_CALLBACK_ARGS_IMPL
+
+#define NLMISC_CALLBACK_ARGS_CLASS CCallback<TReturn, TArgsA, TArgsB, void, void, void, void, void, void>
+#define NLMISC_CALLBACK_ARGS_TYPENAME , typename TArgsA, typename TArgsB
+#define NLMISC_CALLBACK_ARGS_DECL TArgsA argsA, TArgsB argsB
+#define NLMISC_CALLBACK_ARGS_IMPL argsA, argsB
+NLMISC_CALLBACK_TEMPLATE
+#undef NLMISC_CALLBACK_ARGS_CLASS
+#undef NLMISC_CALLBACK_ARGS_TYPENAME
+#undef NLMISC_CALLBACK_ARGS_DECL
+#undef NLMISC_CALLBACK_ARGS_IMPL
+
+#define NLMISC_CALLBACK_ARGS_CLASS CCallback<TReturn, TArgsA, TArgsB, TArgsC, void, void, void, void, void>
+#define NLMISC_CALLBACK_ARGS_TYPENAME , typename TArgsA, typename TArgsB, typename TArgsC
+#define NLMISC_CALLBACK_ARGS_DECL TArgsA argsA, TArgsB argsB, TArgsC argsC
+#define NLMISC_CALLBACK_ARGS_IMPL argsA, argsB, argsC
+NLMISC_CALLBACK_TEMPLATE
+#undef NLMISC_CALLBACK_ARGS_CLASS
+#undef NLMISC_CALLBACK_ARGS_TYPENAME
+#undef NLMISC_CALLBACK_ARGS_DECL
+#undef NLMISC_CALLBACK_ARGS_IMPL
+
+#define NLMISC_CALLBACK_ARGS_CLASS CCallback<TReturn, TArgsA, TArgsB, TArgsC, TArgsD, void, void, void, void>
+#define NLMISC_CALLBACK_ARGS_TYPENAME , typename TArgsA, typename TArgsB, typename TArgsC, typename TArgsD
+#define NLMISC_CALLBACK_ARGS_DECL TArgsA argsA, TArgsB argsB, TArgsC argsC, TArgsD argsD
+#define NLMISC_CALLBACK_ARGS_IMPL argsA, argsB, argsC, argsD
+NLMISC_CALLBACK_TEMPLATE
+#undef NLMISC_CALLBACK_ARGS_CLASS
+#undef NLMISC_CALLBACK_ARGS_TYPENAME
+#undef NLMISC_CALLBACK_ARGS_DECL
+#undef NLMISC_CALLBACK_ARGS_IMPL
+
+#define NLMISC_CALLBACK_ARGS_CLASS CCallback<TReturn, TArgsA, TArgsB, TArgsC, TArgsD, TArgsE, void, void, void>
+#define NLMISC_CALLBACK_ARGS_TYPENAME , typename TArgsA, typename TArgsB, typename TArgsC, typename TArgsD, typename TArgsE
+#define NLMISC_CALLBACK_ARGS_DECL TArgsA argsA, TArgsB argsB, TArgsC argsC, TArgsD argsD, TArgsE argsE
+#define NLMISC_CALLBACK_ARGS_IMPL argsA, argsB, argsC, argsD, argsE
+NLMISC_CALLBACK_TEMPLATE
+#undef NLMISC_CALLBACK_ARGS_CLASS
+#undef NLMISC_CALLBACK_ARGS_TYPENAME
+#undef NLMISC_CALLBACK_ARGS_DECL
+#undef NLMISC_CALLBACK_ARGS_IMPL
+
+#define NLMISC_CALLBACK_ARGS_CLASS CCallback<TReturn, TArgsA, TArgsB, TArgsC, TArgsD, TArgsE, TArgsF, void, void>
+#define NLMISC_CALLBACK_ARGS_TYPENAME , typename TArgsA, typename TArgsB, typename TArgsC, typename TArgsD, typename TArgsE, typename TArgsF
+#define NLMISC_CALLBACK_ARGS_DECL TArgsA argsA, TArgsB argsB, TArgsC argsC, TArgsD argsD, TArgsE argsE, TArgsF argsF
+#define NLMISC_CALLBACK_ARGS_IMPL argsA, argsB, argsC, argsD, argsE, argsF
+NLMISC_CALLBACK_TEMPLATE
+#undef NLMISC_CALLBACK_ARGS_CLASS
+#undef NLMISC_CALLBACK_ARGS_TYPENAME
+#undef NLMISC_CALLBACK_ARGS_DECL
+#undef NLMISC_CALLBACK_ARGS_IMPL
+
+#define NLMISC_CALLBACK_ARGS_CLASS CCallback<TReturn, TArgsA, TArgsB, TArgsC, TArgsD, TArgsE, TArgsF, TArgsG, void>
+#define NLMISC_CALLBACK_ARGS_TYPENAME , typename TArgsA, typename TArgsB, typename TArgsC, typename TArgsD, typename TArgsE, typename TArgsF, typename TArgsG
+#define NLMISC_CALLBACK_ARGS_DECL TArgsA argsA, TArgsB argsB, TArgsC argsC, TArgsD argsD, TArgsE argsE, TArgsF argsF, TArgsG argsG
+#define NLMISC_CALLBACK_ARGS_IMPL argsA, argsB, argsC, argsD, argsE, argsF, argsG
+NLMISC_CALLBACK_TEMPLATE
+#undef NLMISC_CALLBACK_ARGS_CLASS
+#undef NLMISC_CALLBACK_ARGS_TYPENAME
+#undef NLMISC_CALLBACK_ARGS_DECL
+#undef NLMISC_CALLBACK_ARGS_IMPL
+#undef NLMISC_CALLBACK_ARGS_CLASSNAME
+
+#undef NLMISC_CALLBACK_TEMPLATE
+
+} /* namespace NLMISC */
+
+#endif /* #ifndef NLMISC_CALLBACK_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/misc/class_id.h b/code/nel/include/nel/misc/class_id.h
index 0628e8030..d02fc5646 100644
--- a/code/nel/include/nel/misc/class_id.h
+++ b/code/nel/include/nel/misc/class_id.h
@@ -61,8 +61,7 @@ public:
 class CClassIdHashMapTraits
 {
 public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	inline size_t operator() ( const CClassId& classId ) const
 	{
 		return ((((uint64)classId >> 32)|0xFFFFFFFF) ^ (((uint64)classId|0xFFFFFFFF) & 0xFFFFFFFF));
diff --git a/code/nel/include/nel/misc/debug.h b/code/nel/include/nel/misc/debug.h
index 690d340a3..8d2483e4e 100644
--- a/code/nel/include/nel/misc/debug.h
+++ b/code/nel/include/nel/misc/debug.h
@@ -350,8 +350,10 @@ void	setCrashAlreadyReported(bool state);
  */
 
 // removed because we always check assert (even in release mode) #if defined (NL_OS_WINDOWS) && defined (NL_DEBUG)
-#if defined (NL_OS_WINDOWS)
-#define NLMISC_BREAKPOINT __debugbreak();
+#if defined(NL_OS_WINDOWS)
+#define NLMISC_BREAKPOINT __debugbreak()
+#elif defined(NL_OS_UNIX) && defined(NL_COMP_GCC)
+#define NLMISC_BREAKPOINT __builtin_trap()
 #else
 #define NLMISC_BREAKPOINT abort()
 #endif
diff --git a/code/nel/include/nel/misc/dummy_window.h b/code/nel/include/nel/misc/dummy_window.h
index bd205f0a0..81ef078f9 100644
--- a/code/nel/include/nel/misc/dummy_window.h
+++ b/code/nel/include/nel/misc/dummy_window.h
@@ -22,6 +22,21 @@
 
 #ifdef NL_OS_WINDOWS // for win32 os only
 
+#ifndef WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
+#	define NOMINMAX
+#endif
 #include <windows.h>
 
 
diff --git a/code/nel/include/nel/misc/entity_id.h b/code/nel/include/nel/misc/entity_id.h
index 027fe28c7..b4e40909e 100644
--- a/code/nel/include/nel/misc/entity_id.h
+++ b/code/nel/include/nel/misc/entity_id.h
@@ -575,8 +575,7 @@ public:
 // Traits for hash_map using CEntityId
 struct CEntityIdHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CEntityIdHashMapTraits() { }
 	size_t operator() (const NLMISC::CEntityId &id ) const
 	{
diff --git a/code/nel/include/nel/misc/gtk_displayer.h b/code/nel/include/nel/misc/gtk_displayer.h
index 88dd3acc8..e2d35c83c 100644
--- a/code/nel/include/nel/misc/gtk_displayer.h
+++ b/code/nel/include/nel/misc/gtk_displayer.h
@@ -42,11 +42,7 @@ class CGtkDisplayer : public NLMISC::CWindowDisplayer
 {
 public:
 
-	CGtkDisplayer (const char *displayerName = "") : CWindowDisplayer(displayerName)
-	{
-		needSlashR = false;
-		createLabel ("@Clear|CLEAR");
-	}
+	CGtkDisplayer (const char *displayerName = "");
 
 	virtual ~CGtkDisplayer ();
 
diff --git a/code/nel/include/nel/misc/inter_window_msg_queue.h b/code/nel/include/nel/misc/inter_window_msg_queue.h
index 02867f8b4..c23a52412 100644
--- a/code/nel/include/nel/misc/inter_window_msg_queue.h
+++ b/code/nel/include/nel/misc/inter_window_msg_queue.h
@@ -27,6 +27,21 @@
 #include "nel/misc/mem_stream.h"
 #include "nel/misc/dummy_window.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
+#	define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace NLMISC
diff --git a/code/nel/include/nel/misc/mutex.h b/code/nel/include/nel/misc/mutex.h
index adbc7e7e5..cb7e9a188 100644
--- a/code/nel/include/nel/misc/mutex.h
+++ b/code/nel/include/nel/misc/mutex.h
@@ -28,7 +28,11 @@
 #	endif
 #elif defined(NL_OS_UNIX)
 #	include <pthread.h> // PThread
-#	include <semaphore.h> // PThread POSIX semaphores
+#	ifdef NL_OS_MAC
+#		include <dispatch/dispatch.h>
+#	else
+#		include <semaphore.h> // PThread POSIX semaphores
+#	endif
 #	include <unistd.h>
 #	define __forceinline
 #	ifdef NL_OS_MAC
@@ -532,8 +536,10 @@ private:
 
 #ifdef NL_OS_WINDOWS
 	TNelRtlCriticalSection	_Cs;
-#elif defined NL_OS_UNIX
-	sem_t			_Sem;
+#elif defined(NL_OS_MAC)
+	dispatch_semaphore_t	_Sem;
+#elif defined(NL_OS_UNIX)
+	sem_t					_Sem;
 #else
 #	error "No fair mutex implementation for this OS"
 #endif
diff --git a/code/nel/include/nel/misc/p_thread.h b/code/nel/include/nel/misc/p_thread.h
index 4f0a9aa63..01f476d7b 100644
--- a/code/nel/include/nel/misc/p_thread.h
+++ b/code/nel/include/nel/misc/p_thread.h
@@ -39,9 +39,9 @@ class CPThread : public IThread
 public:
 	enum TThreadState
 	{
-		ThreadStateNone, 
-		ThreadStateRunning, 
-		ThreadStateFinished, 
+		ThreadStateNone,
+		ThreadStateRunning,
+		ThreadStateFinished,
 	};
 
 	/// Constructor
diff --git a/code/nel/include/nel/misc/path.h b/code/nel/include/nel/misc/path.h
index f3120c907..383a0553c 100644
--- a/code/nel/include/nel/misc/path.h
+++ b/code/nel/include/nel/misc/path.h
@@ -343,7 +343,7 @@ public:
 	/** Adds a search path.
      * The path is a directory "c:/temp" all files in the directory will be included (and recursively if asked)
 	 *
-	 * Alternative directories are not pre-cached (instead of non Alternative files) and will used when a file is not found in the standard directories.
+	 * Alternative directories are not pre-cached (instead of non Alternative files) and will be used when a file is not found in the standard directories.
 	 * For example, local data will be in the cached directories and server repository files will be in the Alternative files. If a new file is not
 	 * found in the local data, we'll try to find it on the repository.
 	 *
@@ -507,6 +507,13 @@ public:
 	 */
 	static bool makePathRelative (const char *basePath, std::string &relativePath);
 
+	/** Make path absolute
+	* \param relativePath - The relative path
+	* \param directory - the directory to which the path is relative to
+	* returns the absolute path, or empty if something went wrong.
+	*/
+	static std::string makePathAbsolute (const std::string &relativePath, const std::string &directory );
+
 	/** If File in this list is added more than one in an addSearchPath, it doesn't launch a warning.
 	 */
 	static void addIgnoredDoubleFile(const std::string &ignoredFile);
diff --git a/code/nel/include/nel/misc/report.h b/code/nel/include/nel/misc/report.h
index 11745b6e3..55a1c2dbf 100644
--- a/code/nel/include/nel/misc/report.h
+++ b/code/nel/include/nel/misc/report.h
@@ -21,25 +21,38 @@
 
 namespace NLMISC {
 
-/** Display a custom message box.
+#if FINAL_VERSION
+#define NL_REPORT_SYNCHRONOUS false
+#define NL_REPORT_DEFAULT NLMISC::ReportAbort
+#else
+#define NL_REPORT_SYNCHRONOUS true
+#define NL_REPORT_DEFAULT NLMISC::ReportBreak
+#endif
+
+enum TReportResult
+{
+	// See also crash_report_widget.h EReturnValue
+	ReportAlwaysIgnore = 21,
+	ReportIgnore = 22,
+	ReportAbort = 23,
+	ReportBreak = 24
+};
+
+/** Display a crash report
  *
- * \param title set the title of the report. If empty, it'll display "NeL report".
- * \param header message displayed before the edit text box. If empty, it displays the default message.
- * \param body message displayed in the edit text box. This string will be sent by email.
- * \param debugButton 0 for disabling it, 1 for enable with default behaviors (generate a breakpoint), 2 for enable with no behavior
+ * \param title set the title of the report. If empty, it'll display "NeL report"
+ * \param subject extended title of the report
+ * \param body message displayed in the edit text box. This string will be sent to the crash report tool
+ * \param attachment binary file to attach. This is a filename
+ * \param synchronous use system() and wait for the crash tool exit code, passes -dev flag; otherwise return defaultResult immediately
+ * \param sendReport hide 'dont send' button, or auto enable 'send report' checkbox
  *
- *
- *
- * \return the button clicked or error
+ * \return the button clicked or defaultResult
  */
+TReportResult report(const std::string &title, const std::string &subject, const std::string &body, const std::string &attachment, bool synchronous, bool sendReport, TReportResult defaultResult);
 
-enum TReportResult { ReportDebug, ReportIgnore, ReportQuit, ReportError };
-
-TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const std::string &attachedFile = "");
-
-/** call this in the main of your appli to enable email: setReportEmailFunction (sendEmail);
- */
-void setReportEmailFunction (void *emailFunction);
+/// Set the Url of the web service used to post crash reports to. String is copied
+void setReportPostUrl(const char *postUrl);
 
 } // NLMISC
 
diff --git a/code/nel/include/nel/misc/sheet_id.h b/code/nel/include/nel/misc/sheet_id.h
index 869a61af6..b11e97188 100644
--- a/code/nel/include/nel/misc/sheet_id.h
+++ b/code/nel/include/nel/misc/sheet_id.h
@@ -248,8 +248,7 @@ private :
 class CSheetIdHashMapTraits
 {
 public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	inline size_t operator() ( const CSheetId& sheetId ) const
 	{
 		return sheetId.asInt() >> 5;
diff --git a/code/nel/include/nel/misc/sstring.h b/code/nel/include/nel/misc/sstring.h
index fdeebcfc8..c9ebff721 100644
--- a/code/nel/include/nel/misc/sstring.h
+++ b/code/nel/include/nel/misc/sstring.h
@@ -937,21 +937,21 @@ inline CSString operator+(const CSString& s0,const CSString& s1)
 */
 inline CSString operator+(char s0,const CSString& s1)
 {
-	return CSString(s0)+s1;
+	return CSString(s0) + s1.c_str();
 }
 
 inline CSString operator+(const char* s0,const CSString& s1)
 {
-	return CSString(s0)+s1;
+	return CSString(s0) + s1.c_str();
 }
 
-#ifndef NL_COMP_VC10
+#if !defined(NL_COMP_VC) || (NL_COMP_VC_VERSION <= 100)
 // TODO: check if it can be disabled for other compilers too
 inline CSString operator+(const std::string& s0,const CSString& s1)
 {
 	return s0+static_cast<const std::string&>(s1);
 }
-#endif // NL_COMP_VC10
+#endif
 
 } // NLMISC
 
diff --git a/code/nel/include/nel/misc/string_common.h b/code/nel/include/nel/misc/string_common.h
index 4a455247d..2d2a7e676 100644
--- a/code/nel/include/nel/misc/string_common.h
+++ b/code/nel/include/nel/misc/string_common.h
@@ -264,6 +264,40 @@ inline bool fromString(const std::string &str, bool &val)
 	return true;
 }
 
+inline bool fromString(const char *str, uint32 &val) { if (strstr(str, "-") != NULL) { val = 0; return false; } char *end; unsigned long v; errno = 0; v = strtoul(str, &end, 10); if (errno || v > UINT_MAX || end == str) { val = 0; return false; } else { val = (uint32)v; return true; } }
+inline bool fromString(const char *str, sint32 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > INT_MAX || v < INT_MIN || end == str) { val = 0; return false; } else { val = (sint32)v; return true; } }
+inline bool fromString(const char *str, uint8 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > UCHAR_MAX || v < 0 || end == str) { val = 0; return false; } else { val = (uint8)v; return true; } }
+inline bool fromString(const char *str, sint8 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > SCHAR_MAX || v < SCHAR_MIN || end == str) { val = 0; return false; } else { val = (sint8)v; return true; } }
+inline bool fromString(const char *str, uint16 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > USHRT_MAX || v < 0 || end == str) { val = 0; return false; } else { val = (uint16)v; return true; } }
+inline bool fromString(const char *str, sint16 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > SHRT_MAX || v < SHRT_MIN || end == str) { val = 0; return false; } else { val = (sint16)v; return true; } }
+inline bool fromString(const char *str, uint64 &val) { bool ret = sscanf(str, "%"NL_I64"u", &val) == 1; if (!ret) val = 0; return ret; }
+inline bool fromString(const char *str, sint64 &val) { bool ret = sscanf(str, "%"NL_I64"d", &val) == 1; if (!ret) val = 0; return ret; }
+inline bool fromString(const char *str, float &val) { bool ret = sscanf(str, "%f", &val) == 1; if (!ret) val = 0.0f; return ret; }
+inline bool fromString(const char *str, double &val) { bool ret = sscanf(str, "%lf", &val) == 1; if (!ret) val = 0.0; return ret; }
+
+inline bool fromString(const char *str, bool &val)
+{
+	switch (str[0])
+	{
+	case '1':
+	case 't':
+	case 'y':
+	case 'T':
+	case 'Y':
+		val = true;
+		return true;
+	case '0':
+	case 'f':
+	case 'n':
+	case 'F':
+	case 'N':
+		val = false;
+		return true;
+	}
+
+	return false;
+}
+
 inline bool fromString(const std::string &str, std::string &val) { val = str; return true; }
 
 // stl vectors of bool use bit reference and not real bools, so define the operator for bit reference
diff --git a/code/nel/include/nel/misc/string_mapper.h b/code/nel/include/nel/misc/string_mapper.h
index 36a73ed4d..1f62dd123 100644
--- a/code/nel/include/nel/misc/string_mapper.h
+++ b/code/nel/include/nel/misc/string_mapper.h
@@ -39,8 +39,7 @@ typedef	const std::string *TStringId;
 // Traits for hash_map using CStringId
 struct CStringIdHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CStringIdHashMapTraits() { }
 	size_t operator() (const NLMISC::TStringId &stringId) const
 	{
diff --git a/code/nel/include/nel/misc/types_nl.h b/code/nel/include/nel/misc/types_nl.h
index f1ed871fc..2461cb5e6 100644
--- a/code/nel/include/nel/misc/types_nl.h
+++ b/code/nel/include/nel/misc/types_nl.h
@@ -53,7 +53,10 @@
 #	endif
 #	ifdef _MSC_VER
 #		define NL_COMP_VC
-#		if _MSC_VER >= 1700
+#		if _MSC_VER >= 1800
+#			define NL_COMP_VC12
+#			define NL_COMP_VC_VERSION 120
+#		elif _MSC_VER >= 1700
 #			define NL_COMP_VC11
 #			define NL_COMP_VC_VERSION 110
 #		elif _MSC_VER >= 1600
@@ -414,6 +417,12 @@ extern void operator delete[](void *p) throw();
 #	define CHashMap stdext::hash_map
 #	define CHashSet stdext::hash_set
 #	define CHashMultiMap stdext::hash_multimap
+#elif defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 120)
+#	include <hash_map>
+#	include <hash_set>
+#	define CHashMap ::std::hash_map
+#	define CHashSet ::std::hash_set
+#	define CHashMultiMap ::std::hash_multimap
 #elif defined(NL_COMP_GCC) // GCC4
 #	include <ext/hash_map>
 #	include <ext/hash_set>
@@ -454,7 +463,11 @@ typedef	uint16	ucchar;
 
 // To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234)
 #ifdef NL_COMP_VC
-#	if (NL_COMP_VC_VERSION >= 80)
+#	if (NL_COMP_VC_VERSION >= 120)
+#		define INT64_CONSTANT(c)		(c##LL)
+#		define SINT64_CONSTANT(c)	(c##LL)
+#		define UINT64_CONSTANT(c)	(c##ULL)
+#	elif (NL_COMP_VC_VERSION >= 80)
 #		define INT64_CONSTANT(c)	(c##LL)
 #		define SINT64_CONSTANT(c)	(c##LL)
 #		define UINT64_CONSTANT(c)	(c##LL)
diff --git a/code/nel/include/nel/misc/ucstring.h b/code/nel/include/nel/misc/ucstring.h
index e6d7544b1..88e599c1a 100644
--- a/code/nel/include/nel/misc/ucstring.h
+++ b/code/nel/include/nel/misc/ucstring.h
@@ -355,8 +355,7 @@ namespace NLMISC
 // Traits for hash_map using CEntityId
 struct CUCStringHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CUCStringHashMapTraits() { }
 	size_t operator() (const ucstring &id ) const
 	{
diff --git a/code/nel/include/nel/misc/win_displayer.h b/code/nel/include/nel/misc/win_displayer.h
index 934a6e990..f450055a9 100644
--- a/code/nel/include/nel/misc/win_displayer.h
+++ b/code/nel/include/nel/misc/win_displayer.h
@@ -21,8 +21,19 @@
 
 #ifdef NL_OS_WINDOWS
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#ifndef NL_COMP_MINGW
+#ifndef WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
 #	define NOMINMAX
 #endif
 #include <windows.h>
@@ -46,11 +57,7 @@ class CWinDisplayer : public NLMISC::CWindowDisplayer
 {
 public:
 
-	CWinDisplayer (const char *displayerName = "") : CWindowDisplayer(displayerName), Exit(false)
-	{
-		needSlashR = true;
-		createLabel ("@Clear|CLEAR");
-	}
+	CWinDisplayer(const char *displayerName = "");
 
 	virtual ~CWinDisplayer ();
 
diff --git a/code/nel/include/nel/misc/xml_auto_ptr.h b/code/nel/include/nel/misc/xml_auto_ptr.h
index eacde74da..8e0c3adb7 100644
--- a/code/nel/include/nel/misc/xml_auto_ptr.h
+++ b/code/nel/include/nel/misc/xml_auto_ptr.h
@@ -31,7 +31,7 @@ public:
 	~CXMLAutoPtr() { destroy(); }
 	operator const char *() const { return _Value; }
 	operator bool() const { return _Value != NULL; }
-	operator std::string() const { return std::string(_Value); }
+	inline std::string str() const { return _Value; }
 	bool operator ! () const { return _Value == NULL; }
 	operator const unsigned char *() const { return (const unsigned char *)  _Value; }
 	char operator * ()  const { nlassert(_Value); return *_Value; }
diff --git a/code/nel/include/nel/net/service.h b/code/nel/include/nel/net/service.h
index c74688799..8c7a52c63 100644
--- a/code/nel/include/nel/net/service.h
+++ b/code/nel/include/nel/net/service.h
@@ -218,13 +218,13 @@ public:
 	static bool						isServiceInitialized() { return _Instance != NULL; }
 
 	/// Returns the current service short name (ie: TS)
-	const std::string				&getServiceShortName () const { return _ShortName; };
+	const std::string				&getServiceShortName () const { return _ShortName; }
 
 	/// Returns the current service long name (ie: test_serivce)
-	const std::string				&getServiceLongName () const { return _LongName; };
+	const std::string				&getServiceLongName () const { return _LongName; }
 
 	/// Returns the current service alias name setted by AES
-	const std::string				&getServiceAliasName () const { return _AliasName; };
+	const std::string				&getServiceAliasName () const { return _AliasName; }
 
 	/// Returns the current service unified name that is   alias/short-id or short-id if alias is empty
 	std::string						getServiceUnifiedName () const;
@@ -242,10 +242,10 @@ public:
 	uint32							getLaunchingDate () const;
 
 	/// Return true if this service don't use the NS (naming service)
-	bool							getDontUseNS() const { return _DontUseNS; };
+	bool							getDontUseNS() const { return _DontUseNS; }
 
 	/// Return true if this service don't use the AES (admin executor service)
-	bool							getDontUseAES() const { return _DontUseAES; };
+	bool							getDontUseAES() const { return _DontUseAES; }
 
 	/// Returns arguments of the program pass from the user to the program using parameters (ie: "myprog param1 param2")
 	const NLMISC::CVectorSString	&getArgs () const { return _Args; }
diff --git a/code/nel/include/nel/sound/containers.h b/code/nel/include/nel/sound/containers.h
index 63e134077..57387e91e 100644
--- a/code/nel/include/nel/sound/containers.h
+++ b/code/nel/include/nel/sound/containers.h
@@ -42,8 +42,7 @@ namespace NLSOUND {
 template <class Pointer>
 struct THashPtr : public std::unary_function<const Pointer &, size_t>
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	size_t operator () (const Pointer &ptr) const
 	{
 		//CHashSet<uint>::hasher	h;
diff --git a/code/nel/include/nel/sound/context_sound.h b/code/nel/include/nel/sound/context_sound.h
index 13683ac56..8424ee087 100644
--- a/code/nel/include/nel/sound/context_sound.h
+++ b/code/nel/include/nel/sound/context_sound.h
@@ -82,8 +82,7 @@ struct CContextMatcher
 
 	struct CHash : public std::unary_function<CContextMatcher, size_t>
 	{
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t operator () (const CContextMatcher &patternMatcher) const
 		{
 			return patternMatcher.getHashValue();
diff --git a/code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h b/code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
index e22d290e4..b45f22816 100644
--- a/code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
+++ b/code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
@@ -543,14 +543,14 @@ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog,
     setMouseTracking(true);
     cols = width;
 
-    if (withColorDialog)
+	if (withColorDialog)
 	{
 		moreButton = new ColorPickerButton(this);
 		moreButton->setFixedWidth(24);
 		moreButton->setFixedHeight(21);
 		moreButton->setFrameRect(QRect(2, 2, 20, 17));
 		connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog()));
-    }
+	}
 	else
 	{
 		moreButton = 0;
diff --git a/code/nel/samples/misc/CMakeLists.txt b/code/nel/samples/misc/CMakeLists.txt
index 753b418ae..d00a54952 100644
--- a/code/nel/samples/misc/CMakeLists.txt
+++ b/code/nel/samples/misc/CMakeLists.txt
@@ -1,3 +1,4 @@
+ADD_SUBDIRECTORY(callback)
 ADD_SUBDIRECTORY(command)
 ADD_SUBDIRECTORY(configfile)
 ADD_SUBDIRECTORY(debug)
diff --git a/code/nel/samples/misc/callback/CMakeLists.txt b/code/nel/samples/misc/callback/CMakeLists.txt
new file mode 100644
index 000000000..62626b0a7
--- /dev/null
+++ b/code/nel/samples/misc/callback/CMakeLists.txt
@@ -0,0 +1,9 @@
+FILE(GLOB SRC *.cpp)
+
+ADD_EXECUTABLE(nl_sample_callback ${SRC})
+
+TARGET_LINK_LIBRARIES(nl_sample_callback nelmisc)
+NL_DEFAULT_PROPS(nl_sample_callback "NeL, Samples, Misc: Callback")
+NL_ADD_RUNTIME_FLAGS(nl_sample_callback)
+
+INSTALL(TARGETS nl_sample_callback RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesmisc)
diff --git a/code/nel/samples/misc/callback/main.cpp b/code/nel/samples/misc/callback/main.cpp
new file mode 100644
index 000000000..157f3b259
--- /dev/null
+++ b/code/nel/samples/misc/callback/main.cpp
@@ -0,0 +1,62 @@
+/*
+
+Copyright (c) 2014, Jan BOON
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include <nel/misc/callback.h>
+#include <nel/misc/debug.h>
+
+class CTestClass
+{
+public:
+	void helloWorld(int y)
+	{
+		nldebug("Method call: %i, %i", y, x);
+	}
+	int x;
+};
+
+void functionCall(int i)
+{
+	nldebug("Function call: %i", i);
+}
+
+typedef NLMISC::CCallback<void, int> TCallbackType;
+
+int main(int argc, char **argv)
+{
+	CTestClass tc;
+	tc.x = 42;
+	
+	TCallbackType cbMethod = TCallbackType(&tc, &CTestClass::helloWorld);
+	TCallbackType cbFunction = TCallbackType(functionCall);
+	cbMethod(100);
+	cbFunction(99);
+
+	getchar();
+
+	return EXIT_SUCCESS;
+}
diff --git a/code/nel/samples/misc/debug/main.cpp b/code/nel/samples/misc/debug/main.cpp
index 6ee31754f..5850cb2b3 100644
--- a/code/nel/samples/misc/debug/main.cpp
+++ b/code/nel/samples/misc/debug/main.cpp
@@ -18,11 +18,16 @@
 #include <stdlib.h>
 
 // contains all debug features
-#include "nel/misc/debug.h"
+#include <nel/misc/debug.h>
+#include <nel/misc/report.h>
 
-using namespace NLMISC;
+void repeatederror()
+{
+	// hit always ignore to surpress this error for the duration of the program
+	nlassert(false && "hit always ignore");
+}
 
-int main (int /* argc */, char ** /* argv */)
+int main(int /* argc */, char ** /* argv */)
 {
 	// all debug functions have different behaviors in debug and in release mode.
 	// in general, in debug mode, all debug functions are active, they display
@@ -36,20 +41,24 @@ int main (int /* argc */, char ** /* argv */)
 	// in release mode, this function does nothing by default. you have to add a displayer
 	// manually, or put true in the parameter to say to the function that you want it to
 	// add the default displayers
-	createDebug ();
+	NLMISC::createDebug();
+
+	// enable the crash report tool
+	NLMISC::INelContext::getInstance().setWindowedApplication(true);
+	NLMISC::setReportPostUrl("http://ryzomcore.org/crash_report/");
 
 	// display debug information, that will be skipped in release mode.
-	nldebug ("nldebug() %d", 1);
+	nldebug("nldebug() %d", 1);
 
 	// display the string
-	nlinfo ("nlinfo() %d", 2);
+	nlinfo("nlinfo() %d", 2);
 
 	// when something not normal, but that the program can manage, occurs, call nlwarning()
-	nlwarning ("nlwarning() %d", 3);
+	nlwarning("nlwarning() %d", 3);
 
 	// nlassert() is like assert but do more powerful things. in release mode, the test is
 	// not executed and nothing will happen. (Press F5 in Visual C++ to continue the execution)
-	nlassert (true == false);
+	nlassert(true == false);
 
 	// in a switch case or when you want that the program never executes a part of code, use stop.
 	// in release, nlstop does nothing. in debug mode,
@@ -61,16 +70,20 @@ int main (int /* argc */, char ** /* argv */)
 	// occurs. (In Visual C++ press F5 to continue)
 	try
 	{
-		nlerror ("nlerror() %d", 4);
+		nlerror("nlerror() %d", 4);
 	}
-	catch(const EFatalError &)
+	catch (const NLMISC::EFatalError &)
 	{
 		// just continue...
-		nlinfo ("nlerror() generated an EFatalError exception, just ignore it");
+		nlinfo("nlerror() generated an EFatalError exception, just ignore it");
 	}
 
+	// keep repeating the same error
+	for (int i = 0; i < 32; ++i)
+		repeatederror();
+
 	printf("\nPress <return> to exit\n");
-	getchar ();
+	getchar();
 
 	return EXIT_SUCCESS;
 }
diff --git a/code/nel/samples/net/udp/bench_service.cpp b/code/nel/samples/net/udp/bench_service.cpp
index 981a0dd0a..190347d4b 100644
--- a/code/nel/samples/net/udp/bench_service.cpp
+++ b/code/nel/samples/net/udp/bench_service.cpp
@@ -98,8 +98,7 @@ struct CClient
 
 struct TInetAddressHash
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 
 	inline bool operator() (const NLNET::CInetAddress &x1, const NLNET::CInetAddress &x2) const
 	{
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index 916cafe49..2ce747105 100644
--- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -1509,9 +1509,6 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
 		}
 	}
 
-	
-//	_D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &parameters, &_DeviceInterface);
-
 	// Check some caps
 	D3DCAPS9 caps;
 	if (_DeviceInterface->GetDeviceCaps(&caps) == D3D_OK)
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
index ce60d7f42..35cf9c094 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
@@ -435,11 +435,7 @@ bool CDriverGL::setupDisplay()
 	glViewport(0,0,_CurrentMode.Width,_CurrentMode.Height);
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-#ifdef USE_OPENGLES
-	glOrthof(0.f,_CurrentMode.Width,_CurrentMode.Height,0.f,-1.0f,1.0f);
-#else
 	glOrtho(0,_CurrentMode.Width,_CurrentMode.Height,0,-1.0f,1.0f);
-#endif
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 #ifndef USE_OPENGLES
@@ -725,11 +721,7 @@ bool CDriverGL::activeFrameBufferObject(ITexture * tex)
 		}
 		else
 		{
-#ifdef USE_OPENGLES
-			nglBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-#else
 			nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-#endif
 			return true;
 		}
 	}
@@ -2178,7 +2170,7 @@ void CDriverGL::flush()
 // ***************************************************************************
 void	CDriverGL::setSwapVBLInterval(uint interval)
 {
-	H_AUTO_OGL(CDriverGL_setSwapVBLInterval)
+	H_AUTO_OGL(CDriverGL_setSwapVBLInterval);
 
 	if (!_Initialized)
 		return;
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h b/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
index 41d2c1366..31ca00961 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
@@ -40,6 +40,24 @@ extern "C" {
 #define GL_ADD_SIGNED_EXT GL_ADD_SIGNED
 #define GL_INTERPOLATE_EXT GL_INTERPOLATE
 #define GL_BUMP_ENVMAP_ATI GL_INTERPOLATE
+#define GL_FRAMEBUFFER_EXT GL_FRAMEBUFFER_OES
+#define GL_RENDERBUFFER_EXT GL_RENDERBUFFER_OES
+#define GL_DEPTH24_STENCIL8_EXT GL_DEPTH24_STENCIL8_OES
+#define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES
+#define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0_OES
+#define GL_DEPTH_ATTACHMENT_EXT GL_DEPTH_ATTACHMENT_OES
+#define GL_STENCIL_ATTACHMENT_EXT GL_STENCIL_ATTACHMENT_OES
+#define GL_ARRAY_BUFFER_ARB GL_ARRAY_BUFFER
+#define GL_TEXTURE0_ARB GL_TEXTURE0
+
+#define GL_ALPHA8 GL_ALPHA
+#define GL_LUMINANCE8_ALPHA8 GL_LUMINANCE_ALPHA
+#define GL_LUMINANCE8 GL_LUMINANCE
+#define GL_RGBA8 GL_RGBA
+#define GL_RGB8 GL_RGB
+
+#define GL_STATIC_DRAW_ARB GL_STATIC_DRAW
+#define GL_DYNAMIC_DRAW_ARB GL_DYNAMIC_DRAW
 
 #define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES
 #define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES
@@ -48,6 +66,31 @@ extern "C" {
 #define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES
 #define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES
 
+#define nglGenRenderbuffersEXT nglGenRenderbuffersOES
+#define nglBindRenderbufferEXT nglBindRenderbufferOES
+#define nglDeleteRenderbuffersEXT nglDeleteRenderbuffersOES
+#define nglRenderbufferStorageEXT nglRenderbufferStorageOES
+#define nglGenFramebuffersEXT nglGenFramebuffersOES
+#define nglBindFramebufferEXT nglBindFramebufferOES
+#define nglFramebufferTexture2DEXT nglFramebufferTexture2DOES
+#define nglFramebufferRenderbufferEXT nglFramebufferRenderbufferOES
+#define nglCheckFramebufferStatusEXT nglCheckFramebufferStatusOES
+#define nglDeleteBuffersARB glDeleteBuffers
+#define nglIsBufferARB glIsBuffer
+#define nglDeleteRenderbuffersEXT nglDeleteRenderbuffersOES
+#define nglBindFramebufferEXT nglBindFramebufferOES
+#define nglDeleteFramebuffersEXT nglDeleteFramebuffersOES
+#define nglUnmapBufferARB nglUnmapBufferOES
+#define nglActiveTextureARB glActiveTexture
+#define nglClientActiveTextureARB glClientActiveTexture
+#define nglBindBufferARB glBindBuffer
+#define nglGenBuffersARB glGenBuffers
+#define nglBufferDataARB glBufferData
+
+#define glFrustum glFrustumf
+#define glOrtho glOrthof
+#define glDepthRange glDepthRangef
+
 #else
 
 #if defined(NL_OS_MAC)
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
index 986dd6303..95c8e61f2 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
@@ -403,7 +403,7 @@ bool CDriverGL::setupMaterial(CMaterial& mat)
 	// Must setup textures each frame. (need to test if touched).
 	// Must separate texture setup and texture activation in 2 "for"...
 	// because setupTexture() may disable all stage.
-	if (matShader != CMaterial::Water 
+	if (matShader != CMaterial::Water
 		&& ((matShader != CMaterial::Program) || (_LastSetuppedPP->features().MaterialFlags & CProgramFeatures::TextureStages))
 		)
 	{
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
index 855c10c21..41575024c 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
@@ -37,19 +37,11 @@ void CDriverGL::setFrustum(float left, float right, float bottom, float top, flo
 
 	if (perspective)
 	{
-#ifdef USE_OPENGLES
-		glFrustumf(left,right,bottom,top,znear,zfar);
-#else
 		glFrustum(left,right,bottom,top,znear,zfar);
-#endif
 	}
 	else
 	{
-#ifdef USE_OPENGLES
-		glOrthof(left,right,bottom,top,znear,zfar);
-#else
 		glOrtho(left,right,bottom,top,znear,zfar);
-#endif
 	}
 
 	_ProjMatDirty = true;
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
index 60a0609dc..8ec7a6bc8 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
@@ -155,11 +155,7 @@ void			CDriverGLStates::forceDefaults(uint nbStages)
 	for(stage=0;stage<nbStages; stage++)
 	{
 		// disable texturing.
-#ifdef USE_OPENGLES
-		glActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 
 		glDisable(GL_TEXTURE_2D);
 
@@ -188,13 +184,8 @@ void			CDriverGLStates::forceDefaults(uint nbStages)
 	}
 
 	// ActiveTexture current texture to 0.
-#ifdef USE_OPENGLES
-	glActiveTexture(GL_TEXTURE0);
-	glClientActiveTexture(GL_TEXTURE0);
-#else
 	nglActiveTextureARB(GL_TEXTURE0_ARB);
 	nglClientActiveTextureARB(GL_TEXTURE0_ARB);
-#endif
 
 	_CurrentActiveTextureARB= 0;
 	_CurrentClientActiveTextureARB= 0;
@@ -622,11 +613,7 @@ void CDriverGLStates::updateDepthRange()
 
 	float delta = _ZBias * (_DepthRangeFar - _DepthRangeNear);
 
-#ifdef USE_OPENGLES
-	glDepthRangef(delta + _DepthRangeNear, delta + _DepthRangeFar);
-#else
 	glDepthRange(delta + _DepthRangeNear, delta + _DepthRangeFar);
-#endif
 }
 
 // ***************************************************************************
@@ -767,7 +754,7 @@ void			CDriverGLStates::setTextureMode(TTextureMode texMode)
 		{
 			glDisable(GL_TEXTURE_2D);
 		}
-		else if(oldTexMode == TextureRect)
+		else if (oldTexMode == TextureRect)
 		{
 #ifndef USE_OPENGLES
 			if(_TextureRectangleSupported)
@@ -780,7 +767,7 @@ void			CDriverGLStates::setTextureMode(TTextureMode texMode)
 				glDisable(GL_TEXTURE_2D);
 			}
 		}
-		else if(oldTexMode == TextureCubeMap)
+		else if (oldTexMode == TextureCubeMap)
 		{
 			if(_TextureCubeMapSupported)
 			{
@@ -835,11 +822,7 @@ void			CDriverGLStates::activeTextureARB(uint stage)
 
 	if( _CurrentActiveTextureARB != stage )
 	{
-#ifdef USE_OPENGLES
-		glActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 
 		_CurrentActiveTextureARB= stage;
 	}
@@ -850,11 +833,7 @@ void			CDriverGLStates::forceActiveTextureARB(uint stage)
 {
 	H_AUTO_OGL(CDriverGLStates_forceActiveTextureARB);
 
-#ifdef USE_OPENGLES
-	glActiveTexture(GL_TEXTURE0+stage);
-#else
 	nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 
 	_CurrentActiveTextureARB= stage;
 }
@@ -958,11 +937,7 @@ void			CDriverGLStates::clientActiveTextureARB(uint stage)
 
 	if( _CurrentClientActiveTextureARB != stage )
 	{
-#ifdef USE_OPENGLES
-		glClientActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglClientActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 		_CurrentClientActiveTextureARB= stage;
 	}
 }
@@ -1121,11 +1096,7 @@ void CDriverGLStates::forceBindARBVertexBuffer(uint objectID)
 {
 	H_AUTO_OGL(CDriverGLStates_forceBindARBVertexBuffer)
 
-#ifdef USE_OPENGLES
-	glBindBuffer(GL_ARRAY_BUFFER, objectID);
-#else
 	nglBindBufferARB(GL_ARRAY_BUFFER_ARB, objectID);
-#endif
 
 	_CurrARBVertexBuffer = objectID;
 }
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
index 9b798ae51..7b49e20a0 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
@@ -93,19 +93,6 @@ CTextureDrvInfosGL::~CTextureDrvInfosGL()
 	{
 		_Driver->_TextureUsed[TextureUsedIdx] = NULL;
 	}
-
-#ifdef USE_OPENGLES
-	if (InitFBO)
-	{
-		nglDeleteFramebuffersOES(1, &FBOId);
-		if(AttachDepthStencil)
-		{
-			nglDeleteRenderbuffersOES(1, &DepthFBOId);
-			if(!UsePackedDepthStencil)
-				nglDeleteRenderbuffersOES(1, &StencilFBOId);
-		}
-	}
-#endif
 }
 
 CDepthStencilFBO::CDepthStencilFBO(CDriverGL *driver, uint width, uint height)
@@ -175,56 +162,9 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 			AttachDepthStencil = !((CTextureBloom*)tex)->isMode2D();
 		}
 
-#ifdef USE_OPENGLES
-		// generate IDs
-		nglGenFramebuffersOES(1, &FBOId);
-		if(AttachDepthStencil)
-		{
-			nglGenRenderbuffersOES(1, &DepthFBOId);
-			if(UsePackedDepthStencil)
-				StencilFBOId = DepthFBOId;
-			else
-				nglGenRenderbuffersOES(1, &StencilFBOId);
-		}
-
-		//nldebug("3D: using depth %d and stencil %d", DepthFBOId, StencilFBOId);
-
-		// initialize FBO
-		nglBindFramebufferOES(GL_FRAMEBUFFER_OES, FBOId);
-		nglFramebufferTexture2DOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, TextureMode, ID, 0);
-
-		// attach depth/stencil render to FBO
-		// note: for some still unkown reason it's impossible to add
-		// a stencil buffer as shown in the respective docs (see
-		// opengl.org extension registry). Until a safe approach to add
-		// them is found, there will be no attached stencil for the time
-		// being, aside of using packed depth+stencil buffers.
-		if(AttachDepthStencil)
-		{
-			if(UsePackedDepthStencil)
-			{
-				//nldebug("3D: using packed depth stencil");
-				nglBindRenderbufferOES(GL_RENDERBUFFER_OES, StencilFBOId);
-				nglRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH24_STENCIL8_OES, tex->getWidth(), tex->getHeight());
-			}
-			else
-			{
-				nglBindRenderbufferOES(GL_RENDERBUFFER_OES, DepthFBOId);
-				nglRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH_COMPONENT24_OES, tex->getWidth(), tex->getHeight());
-				/*
-				nglBindRenderbufferEXT(GL_RENDERBUFFER_OES, StencilFBOId);
-				nglRenderbufferStorageEXT(GL_RENDERBUFFER_OES, GL_STENCIL_INDEX8_EXT, tex->getWidth(), tex->getHeight());
-				*/
-			}
-			nglFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, DepthFBOId);
-			nldebug("3D: glFramebufferRenderbufferExt(depth:24) = %X", nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
-			nglFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_STENCIL_ATTACHMENT_OES, GL_RENDERBUFFER_OES, StencilFBOId);
-			nldebug("3D: glFramebufferRenderbufferExt(stencil:8) = %X", nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
-		}
-#else
 		// generate IDs
 		nglGenFramebuffersEXT(1, &FBOId);
-		
+
 		//nldebug("3D: using depth %d and stencil %d", DepthFBOId, StencilFBOId);
 
 		// initialize FBO
@@ -253,15 +193,10 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 										 GL_RENDERBUFFER_EXT, DepthStencilFBO->StencilFBOId);
 			nldebug("3D: glFramebufferRenderbufferExt(stencil:8) = %X", nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
 		}
-#endif
 
 		// check status
-		GLenum status;
-#ifdef USE_OPENGLES
-		status = (GLenum) nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES);
-#else
-		status = (GLenum) nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-#endif
+		GLenum status = (GLenum) nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+
 		switch(status) {
 #ifdef GL_FRAMEBUFFER_COMPLETE_EXT
 			case GL_FRAMEBUFFER_COMPLETE_EXT:
@@ -361,11 +296,8 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 		// clean up resources if allocation failed
 		if (!InitFBO)
 		{
-#ifdef USE_OPENGLES
-			nglDeleteFramebuffersOES(1, &FBOId);
-#else
 			nglDeleteFramebuffersEXT(1, &FBOId);
-#endif
+
 			if (AttachDepthStencil)
 			{
 				DepthStencilFBO = NULL;
@@ -385,22 +317,14 @@ bool CTextureDrvInfosGL::activeFrameBufferObject(ITexture * tex)
 		if(initFrameBufferObject(tex))
 		{
 			glBindTexture(TextureMode, 0);
-#ifdef USE_OPENGLES
-			nglBindFramebufferOES(GL_FRAMEBUFFER_OES, FBOId);
-#else
 			nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, FBOId);
-#endif
 		}
 		else
 			return false;
 	}
 	else
 	{
-#ifdef USE_OPENGLES
-		nglBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-#else
 		nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-#endif
 	}
 
 	return true;
@@ -508,11 +432,7 @@ GLint	CDriverGL::getGlTextureFormat(ITexture& tex, bool &compressed)
 		break;
 	}
 
-#ifdef USE_OPENGLES
-	return GL_RGBA;
-#else
 	return GL_RGBA8;
-#endif
 }
 
 // ***************************************************************************
@@ -521,11 +441,7 @@ static GLint	getGlSrcTextureFormat(ITexture &tex, GLint glfmt)
 	H_AUTO_OGL(getGlSrcTextureFormat)
 
 	// Is destination format is alpha or lumiance ?
-#ifdef USE_OPENGLES
-	if ((glfmt==GL_ALPHA)||(glfmt==GL_LUMINANCE_ALPHA)||(glfmt==GL_LUMINANCE))
-#else
 	if ((glfmt==GL_ALPHA8)||(glfmt==GL_LUMINANCE8_ALPHA8)||(glfmt==GL_LUMINANCE8))
-#endif
 	{
 		switch(tex.getPixelFormat())
 		{
@@ -578,19 +494,9 @@ uint				CDriverGL::computeMipMapMemoryUsage(uint w, uint h, GLint glfmt) const
 	H_AUTO_OGL(CDriverGL_computeMipMapMemoryUsage)
 	switch(glfmt)
 	{
-#ifdef GL_RGBA8
 	case GL_RGBA8:		return w*h* 4;
-#endif
-#ifdef GL_RGBA
-	case GL_RGBA:		return w*h* 4;
-#endif
 	// Well this is ugly, but simple :). GeForce 888 is stored as 32 bits.
-#ifdef GL_RGB8
 	case GL_RGB8:		return w*h* 4;
-#endif
-#ifdef GL_RGB
-	case GL_RGB:		return w*h* 4;
-#endif
 #ifdef GL_RGBA4
 	case GL_RGBA4:		return w*h* 2;
 #endif
@@ -600,24 +506,9 @@ uint				CDriverGL::computeMipMapMemoryUsage(uint w, uint h, GLint glfmt) const
 #ifdef GL_RGB5
 	case GL_RGB5:		return w*h* 2;
 #endif
-#ifdef GL_LUMINANCE8
 	case GL_LUMINANCE8:	return w*h* 1;
-#endif
-#ifdef GL_LUMINANCE
-	case GL_LUMINANCE:	return w*h* 1;
-#endif
-#ifdef GL_ALPHA8
 	case GL_ALPHA8:		return w*h* 1;
-#endif
-#ifdef GL_ALPHA
-	case GL_ALPHA:		return w*h* 1;
-#endif
-#ifdef GL_LUMINANCE8_ALPHA8
 	case GL_LUMINANCE8_ALPHA8:	return w*h* 2;
-#endif
-#ifdef GL_LUMINANCE_ALPHA
-	case GL_LUMINANCE_ALPHA:	return w*h* 2;
-#endif
 #ifdef GL_COMPRESSED_RGB_S3TC_DXT1_EXT
 	case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:	return w*h /2;
 #endif
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
index 0556fad3e..25c7da614 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
@@ -1216,11 +1216,7 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	GLuint vertexBufferID;
 	glGetError();
 
-#ifdef USE_OPENGLES
-	glGenBuffers(1, &vertexBufferID);
-#else
 	nglGenBuffersARB(1, &vertexBufferID);
-#endif
 
 	if (glGetError() != GL_NO_ERROR) return NULL;
 	_Driver->_DriverGLStates.forceBindARBVertexBuffer(vertexBufferID);
@@ -1229,7 +1225,8 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	{
 		case CVertexBuffer::AGPVolatile:
 #ifdef USE_OPENGLES
-			glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STREAM_DRAW);
+			// TODO: GL_STREAM_DRAW doesn't exist in OpenGL ES 1.x
+			glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
 #else
 			nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STREAM_DRAW_ARB);
 #endif
@@ -1259,11 +1256,7 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	}
 	if (glGetError() != GL_NO_ERROR)
 	{
-#ifdef USE_OPENGLES
-		glDeleteBuffers(1, &vertexBufferID);
-#else
 		nglDeleteBuffersARB(1, &vertexBufferID);
-#endif
 
 		return NULL;
 	}
@@ -1306,13 +1299,10 @@ void CVertexArrayRangeARB::updateLostBuffers()
 		{
 			nlassert((*it)->_VertexObjectId);
 			GLuint id = (GLuint) (*it)->_VertexObjectId;
-#ifdef USE_OPENGLES
-			nlassert(glIsBuffer(id));
-			glDeleteBuffers(1, &id);
-#else
+
 			nlassert(nglIsBufferARB(id));
 			nglDeleteBuffersARB(1, &id);
-#endif
+
 			(*it)->_VertexObjectId = 0;
 			(*it)->VB->setLocation(CVertexBuffer::NotResident);
 		}
@@ -1361,13 +1351,8 @@ CVertexBufferHardARB::~CVertexBufferHardARB()
 	if (_VertexObjectId)
 	{
 		GLuint id = (GLuint) _VertexObjectId;
-#ifdef USE_OPENGLES
-		nlassert(glIsBuffer(id));
-		glDeleteBuffers(1, &id);
-#else
 		nlassert(nglIsBufferARB(id));
 		nglDeleteBuffersARB(1, &id);
-#endif
 	}
 	if (_VertexArrayRange)
 	{
@@ -1412,12 +1397,7 @@ void *CVertexBufferHardARB::lock()
 		}
 		// recreate a vb
 		GLuint vertexBufferID;
-
-#ifdef USE_OPENGLES
-		glGenBuffers(1, &vertexBufferID);
-#else
 		nglGenBuffersARB(1, &vertexBufferID);
-#endif
 
 		if (glGetError() != GL_NO_ERROR)
 		{
@@ -1429,42 +1409,30 @@ void *CVertexBufferHardARB::lock()
 		{
 			case CVertexBuffer::AGPVolatile:
 #ifdef USE_OPENGLES
-				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STREAM_DRAW);
+				// TODO: GL_STREAM_DRAW doesn't exist in OpenGL ES 1.x
+				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
 #else
 				nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STREAM_DRAW_ARB);
 #endif
 			break;
 			case CVertexBuffer::StaticPreferred:
 				if (_Driver->getStaticMemoryToVRAM())
-#ifdef USE_OPENGLES
-					glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STATIC_DRAW);
-#else
 					nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STATIC_DRAW_ARB);
-#endif
 				else
-#ifdef USE_OPENGLES
-					glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
-#else
 					nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
-#endif
 			break;
 			// case CVertexBuffer::AGPPreferred:
 			default:
-#ifdef USE_OPENGLES
-				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
-#else
 				nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
-#endif
+
 			break;
 		}
 		if (glGetError() != GL_NO_ERROR)
 		{
 			_Driver->incrementResetCounter();
-#ifdef USE_OPENGLES
-			glDeleteBuffers(1, &vertexBufferID);
-#else
+
 			nglDeleteBuffersARB(1, &vertexBufferID);
-#endif
+
 			return &_DummyVB[0];;
 		}
 		_VertexObjectId = vertexBufferID;
@@ -1567,12 +1535,10 @@ void CVertexBufferHardARB::unlock()
 
 #ifdef USE_OPENGLES
 	if (_Driver->_Extensions.OESMapBuffer)
+#endif
 	{
-		unmapOk = nglUnmapBufferOES(GL_ARRAY_BUFFER);
+		unmapOk = nglUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
 	}
-#else
-	unmapOk = nglUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
-#endif
 
 	#ifdef NL_DEBUG
 		_Unmapping = false;
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
index 5470ec5c5..22bc5ff5a 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
@@ -453,7 +453,6 @@ bool CDriverGL::setupEXTVertexShader(const CVPParser::TProgram &program, GLuint
 	// clear last error
 	GLenum glError = glGetError();
 
-	//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
 	//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
 
 	// allocate the symbols
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index 751e72149..5c6cecab9 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -463,6 +463,7 @@ bool CDriverGL::unInit()
 	{
 		nlwarning("Can't unregister NLClass");
 	}
+	_Registered = 0;
 
 	// Restaure monitor color parameters
 	if (_NeedToRestaureGammaRamp)
@@ -626,10 +627,15 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 	// Offscreen mode ?
 	if (_CurrentMode.OffScreen)
 	{
-#if 0
-		if (!createWindow(mode))
-			return false;
+		if (!createWindow(mode)) return false;
 
+		HWND tmpHWND = _win;
+		int width = mode.Width;
+		int height = mode.Height;
+
+#ifdef USE_OPENGLES
+		// TODO: implement for OpenGL ES 1.x
+#else
 		// resize the window
 		RECT rc;
 		SetRect (&rc, 0, 0, width, height);
@@ -1436,8 +1442,17 @@ bool CDriverGL::createWindow(const GfxMode &mode)
 #ifdef NL_OS_WINDOWS
 
 	// create the OpenGL window
-	window = CreateWindowW(L"NLClass", L"NeL Window", WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN|WS_CLIPSIBLINGS,
-		CW_USEDEFAULT, CW_USEDEFAULT, mode.Width, mode.Height, HWND_DESKTOP, NULL, GetModuleHandle(NULL), NULL);
+	DWORD dwStyle = WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN|WS_CLIPSIBLINGS;
+	int pos = CW_USEDEFAULT;
+	HWND hwndParent = HWND_DESKTOP;
+	if (mode.OffScreen)
+	{
+		dwStyle &= ~WS_VISIBLE;
+		pos = 0;
+		hwndParent = NULL;
+	}
+	window = CreateWindowW(L"NLClass", L"NeL Window", dwStyle, 
+		pos, pos, mode.Width, mode.Height, hwndParent, NULL, GetModuleHandle(NULL), NULL);
 
 	if (window == EmptyWindow)
 	{
@@ -1468,7 +1483,7 @@ bool CDriverGL::createWindow(const GfxMode &mode)
 		[[CocoaApplicationDelegate alloc] initWithDriver:this];
 
 	// set the application delegate, this will handle window/app close events
-	[NSApp setDelegate:appDelegate];
+	[NSApp setDelegate:(id<NSFileManagerDelegate>)appDelegate];
 
 	// bind the close button of the window to applicationShouldTerminate
 	id closeButton = [cocoa_window standardWindowButton:NSWindowCloseButton];
@@ -1851,6 +1866,9 @@ bool CDriverGL::setMode(const GfxMode& mode)
 #if defined(NL_OS_WINDOWS)
 	// save relative cursor
 	POINT cursorPos;
+	cursorPos.x = 0;
+	cursorPos.y = 0;
+
 	BOOL cursorPosOk = isSystemCursorInClientArea()
 		&& GetCursorPos(&cursorPos)
 		&& ScreenToClient(_win, &cursorPos);
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
index d290e0cee..6206d94c3 100644
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
@@ -270,28 +270,14 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 		return false;
 	}
 
-	// first event about mouse movement after setting to emulateRawMode
-	if(_setToEmulateRawMode &&
-		(event.type == NSMouseMoved || 
-		event.type == NSLeftMouseDragged || 
-		event.type == NSRightMouseDragged))
-	{
-		// do not report because it reflects wrapping pointer to 0.5/0.5 
-		_setToEmulateRawMode = false;
-		return false;
-	}
-
 	// convert the modifiers for nel to pass them with the events
-	NLMISC::TKeyButton modifiers =
-		modifierFlagsToNelKeyButton([event modifierFlags]);
+	NLMISC::TKeyButton modifiers = modifierFlagsToNelKeyButton([event modifierFlags]);
 
 	switch(event.type)
 	{
 	case NSLeftMouseDown:
 	{
-		server->postEvent(new NLMISC::CEventMouseDown(
-			mousePos.x, mousePos.y,
-			(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this));
+		server->postEvent(new NLMISC::CEventMouseDown(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this));
 	}
 	break;
 	case NSLeftMouseUp:
@@ -319,15 +305,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;
 
-		// when emulating raw mode, send the delta in a CGDMouseMove event
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(
-				mousePos.x, mousePos.y, (NLMISC::TMouseButton)modifiers, this);
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)modifiers, this);
 
 		server->postEvent(nelEvent);
 		break;
@@ -336,15 +314,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;
 
-		// when emulating raw mode, send the delta in a CGDMouseMove event
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y,
-				(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this);
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this);
 
 		server->postEvent(nelEvent);
 		break;
@@ -353,15 +323,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;
 
-		// when emulating raw mode, send the delta in a CGDMouseMove event
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y,
-				(NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this);
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this);
 
 		server->postEvent(nelEvent);
 		break;
@@ -434,12 +396,6 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	}
 	}
 
-	if(_emulateRawMode && _driver && (event.type == NSMouseMoved || 
-		event.type == NSLeftMouseDragged || event.type == NSRightMouseDragged)) 
-	{
-		_driver->setMousePos(0.5, 0.5);
-	}
-
 	return true;
 }
 
@@ -492,17 +448,4 @@ void CCocoaEventEmitter::submitEvents(CEventServer& server, bool /* allWins */)
 	_server = &server;
 }
 
-void CCocoaEventEmitter::emulateMouseRawMode(bool enable)
-{
-	_emulateRawMode = enable;
-	
-	if(_emulateRawMode)
-	{
-		_setToEmulateRawMode = true;
-		
-		if(_driver)
-			_driver->setMousePos(0.5, 0.5);
-	}
-}
-
 }
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
index aa7d591fd..960614ef4 100644
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
+++ b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
@@ -31,8 +31,6 @@ namespace NLMISC
 
 class CCocoaEventEmitter : public IEventEmitter
 {
-	bool             _emulateRawMode;
-	bool             _setToEmulateRawMode;
 	bool             _eventLoop;
 	NL3D::IDriver*   _driver;
 	CocoaOpenGLView* _glView;
@@ -42,8 +40,6 @@ class CCocoaEventEmitter : public IEventEmitter
 
 public:
 	CCocoaEventEmitter() :
-		_emulateRawMode(false),
-		_setToEmulateRawMode(false),
 		_driver(NULL),
 		_glView(nil),
 		_server(NULL) { }
diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.h b/code/nel/src/3d/driver/opengl/unix_event_emitter.h
index 7eeef970e..493c4ad35 100644
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.h
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.h
@@ -100,7 +100,6 @@ private:
 	std::map<TKey, bool>	_PressedKeys;
 	XIM						_im;
 	XIC						_ic;
-	bool					_emulateRawMode;
 	NL3D::IDriver*			_driver;
 	CUnixEventServer		_InternalServer;
 	ucstring				_CopiedString;
diff --git a/code/nel/src/3d/driver_user.cpp b/code/nel/src/3d/driver_user.cpp
index c4dc97655..017a2b6dc 100644
--- a/code/nel/src/3d/driver_user.cpp
+++ b/code/nel/src/3d/driver_user.cpp
@@ -109,10 +109,6 @@ void					UDriver::purgeMemory()
 // ***************************************************************************
 
 
-// ***************************************************************************
-bool	CDriverUser::_StaticInit= false;
-
-
 // ***************************************************************************
 CDriverUser::CDriverUser (uintptr_t windowIcon, TDriver driver, emptyProc exitFunc)
 {
@@ -122,16 +118,7 @@ CDriverUser::CDriverUser (uintptr_t windowIcon, TDriver driver, emptyProc exitFu
 	nlassert((uint)IDriver::iconCount == (uint)UDriver::iconCount);
 
 
-	// Static Initialisation.
-	if(!_StaticInit)
-	{
-		_StaticInit= true;
-		// Register basic serial.
-		NL3D::registerSerial3d();
-
-		// Register basic csene.
-		CScene::registerBasics();
-	}
+	NL3D::init3d();
 
 	_Driver = NULL;
 
diff --git a/code/nel/src/3d/fxaa.cpp b/code/nel/src/3d/fxaa.cpp
index f19bcd8b4..89d1c59cd 100644
--- a/code/nel/src/3d/fxaa.cpp
+++ b/code/nel/src/3d/fxaa.cpp
@@ -148,7 +148,7 @@ CFXAA::CFXAA(NL3D::UDriver *driver) : m_Driver(driver), m_PP(NULL), m_VP(NULL),
 		m_QuadUV.V2 = CVector(1.f, 1.f, 0.5f);
 		m_QuadUV.V3 = CVector(0.f, 1.f, 0.5f);
 
-		if (drv->textureCoordinateAlternativeMode())
+		/*if (drv->textureCoordinateAlternativeMode())
 		{
 			m_QuadUV.Uv0 = CUV(0.f,  1.f);
 			m_QuadUV.Uv1 = CUV(1.f, 1.f);
@@ -156,12 +156,12 @@ CFXAA::CFXAA(NL3D::UDriver *driver) : m_Driver(driver), m_PP(NULL), m_VP(NULL),
 			m_QuadUV.Uv3 = CUV(0.f,  0.f);
 		}
 		else
-		{
+		{*/
 			m_QuadUV.Uv0 = CUV(0.f,  0.f);
 			m_QuadUV.Uv1 = CUV(1.f, 0.f);
 			m_QuadUV.Uv2 = CUV(1.f, 1.f);
 			m_QuadUV.Uv3 = CUV(0.f,  1.f);
-		}
+		/*}*/
 
 		/*CVertexBuffer &vb = m_VB;
 		vb.clearValueEx();
diff --git a/code/nel/src/3d/init_3d.cpp b/code/nel/src/3d/init_3d.cpp
index bd8dffdfd..b2bf2c05e 100644
--- a/code/nel/src/3d/init_3d.cpp
+++ b/code/nel/src/3d/init_3d.cpp
@@ -19,19 +19,35 @@
 
 #include "nel/3d/init_3d.h"
 #include <cfloat>
+#include "nel/3d/scene.h"
+#include "nel/3d/register_3d.h"
+
+namespace
+{
+static bool _Initialized = false;
+}
 
 namespace NL3D
 {
 
 void init3d ()
 {
+
+	if( _Initialized )
+		return;
+
 	// Init for windows
 #ifdef NL_OS_WINDOWS
 	// Enable FPU exceptions
 
 	// Enable divid by zero and  overflow exception
-	_control87 (_EM_INVALID|_EM_DENORMAL/*|_EM_ZERODIVIDE|_EM_OVERFLOW*/|_EM_UNDERFLOW|_EM_INEXACT, _MCW_EM);
+	//_control87 (_EM_INVALID|_EM_DENORMAL/*|_EM_ZERODIVIDE|_EM_OVERFLOW*/|_EM_UNDERFLOW|_EM_INEXACT, _MCW_EM);
 #endif // NL_OS_WINDOWS
+
+	NL3D::registerSerial3d();
+	CScene::registerBasics();
+
+	_Initialized = true;
 }
 
 } // NL3D
diff --git a/code/nel/src/3d/landscape.cpp b/code/nel/src/3d/landscape.cpp
index 154f6f847..ccdeabc34 100644
--- a/code/nel/src/3d/landscape.cpp
+++ b/code/nel/src/3d/landscape.cpp
@@ -583,7 +583,6 @@ void			CLandscape::setDriver(IDriver *drv)
 		// Does the driver has sufficient requirements for Vegetable???
 		// only if VP supported by GPU, and Only if max vertices allowed.
 		_DriverOkForVegetable = _VertexShaderOk && (_Driver->getMaxVerticesByVertexBufferHard()>=(uint)NL3D_LANDSCAPE_VEGETABLE_MAX_AGP_VERTEX_MAX);
-
 	}
 }
 
diff --git a/code/nel/src/3d/landscapevb_allocator.cpp b/code/nel/src/3d/landscapevb_allocator.cpp
index 2c30cc19b..51714b88d 100644
--- a/code/nel/src/3d/landscapevb_allocator.cpp
+++ b/code/nel/src/3d/landscapevb_allocator.cpp
@@ -611,7 +611,6 @@ void			CLandscapeVBAllocator::setupVBFormatAndVertexProgram(bool withVertexProgr
 			nlverify(_Driver->compileVertexProgram(_VertexProgram[1]));
 		}
 	}
-
 }
 
 
diff --git a/code/nel/src/3d/meshvp_wind_tree.cpp b/code/nel/src/3d/meshvp_wind_tree.cpp
index 0d2e91363..1e3d215a3 100644
--- a/code/nel/src/3d/meshvp_wind_tree.cpp
+++ b/code/nel/src/3d/meshvp_wind_tree.cpp
@@ -392,7 +392,6 @@ bool	CMeshVPWindTree::begin(IDriver *driver, CScene *scene, CMeshBaseInstance *m
 	sint	numPls= renderTrav->getNumVPLights()-1;
 	clamp(numPls, 0, CRenderTrav::MaxVPLight-1);
 
-
 	// Enable normalize only if requested by user. Because lighting don't manage correct "scale lighting"
 	uint	idVP= (SpecularLighting?2:0) + (driver->isForceNormalize()?1:0) ;
 	// correct VP id for correct unmber of pls.
@@ -523,7 +522,7 @@ void	CMeshVPWindTree::beginMBRInstance(IDriver *driver, CScene *scene, CMeshBase
 	idVP = numPls*4 + idVP;
 
 	// re-activate VP if idVP different from last setup
-	if(idVP != _LastMBRIdVP)
+	if (idVP != _LastMBRIdVP)
 	{
 		_LastMBRIdVP= idVP;
 		driver->activeVertexProgram(_VertexProgram[_LastMBRIdVP]);
diff --git a/code/nel/src/3d/scene.cpp b/code/nel/src/3d/scene.cpp
index 67465eb8c..7c552efd4 100644
--- a/code/nel/src/3d/scene.cpp
+++ b/code/nel/src/3d/scene.cpp
@@ -158,7 +158,7 @@ CScene::CScene(bool bSmallScene) : LightTrav(bSmallScene)
 
 	_MaxSkeletonsInNotCLodForm= 20;
 
-	_FilterRenderFlags= std::numeric_limits<uint32>::max();
+	_FilterRenderFlags = std::numeric_limits<uint32>::max();
 
 	_NextRenderProfile= false;
 
@@ -592,11 +592,9 @@ void	CScene::renderPart(UScene::TRenderPart rp, bool	doHrcPass, bool doTrav, boo
 		//
 		nlassert(CurrentCamera);
 
-
 		// update models.
 		updateModels();
 
-
 		// Use the camera to setup Clip / Render pass.
 		float left, right, bottom, top, znear, zfar;
 		CurrentCamera->getFrustum(left, right, bottom, top, znear, zfar);
diff --git a/code/nel/src/3d/shadow_map_manager.cpp b/code/nel/src/3d/shadow_map_manager.cpp
index 383a28184..0c9f7ba8b 100644
--- a/code/nel/src/3d/shadow_map_manager.cpp
+++ b/code/nel/src/3d/shadow_map_manager.cpp
@@ -244,7 +244,7 @@ void			CShadowMapManager::addShadowReceiver(CTransform *model)
 void			CShadowMapManager::renderGenerate(CScene *scene)
 {
 	H_AUTO( NL3D_ShadowManager_Generate );
-	
+
 	// Each frame, do a small garbage collector for unused free textures.
 	garbageShadowTextures(scene);
 
diff --git a/code/nel/src/3d/text_context.cpp b/code/nel/src/3d/text_context.cpp
index 4b6e46c85..456ab77a6 100644
--- a/code/nel/src/3d/text_context.cpp
+++ b/code/nel/src/3d/text_context.cpp
@@ -40,6 +40,7 @@ CTextContext::CTextContext()
 	_ScaleZ = 1.0f;
 
 	_Shaded = false;
+	_ShadeOutline = false;
 	_ShadeExtent = 0.001f;
 	_ShadeColor = NLMISC::CRGBA(0,0,0);
 
diff --git a/code/nel/src/3d/text_context_user.cpp b/code/nel/src/3d/text_context_user.cpp
index 570c879f9..6ee880d91 100644
--- a/code/nel/src/3d/text_context_user.cpp
+++ b/code/nel/src/3d/text_context_user.cpp
@@ -148,6 +148,18 @@ bool CTextContextUser::getShaded() const
 
 	return _TextContext.getShaded();
 }
+void CTextContextUser::setShadeOutline(bool b)
+{
+	H_AUTO2;
+
+	_TextContext.setShadeOutline(b);
+}
+bool CTextContextUser::getShadeOutline() const
+{
+	H_AUTO2;
+
+	return _TextContext.getShadeOutline();
+}
 void CTextContextUser::setShadeExtent(float shext)
 {
 	H_AUTO2;
diff --git a/code/nel/src/3d/transform.cpp b/code/nel/src/3d/transform.cpp
index c12754c57..0ec65360d 100644
--- a/code/nel/src/3d/transform.cpp
+++ b/code/nel/src/3d/transform.cpp
@@ -113,7 +113,7 @@ CTransform::CTransform()
 	_StateFlags= IsOpaque | IsUserLightable;
 
 	// By default, always allow rendering of Transform Models.
-	_RenderFilterType= std::numeric_limits<uint32>::max();
+	_RenderFilterType = std::numeric_limits<uint32>::max();
 
 	// By default, don't suport fast intersection detection
 	_SupportFastIntersect= false;
diff --git a/code/nel/src/3d/vertex_program_parse.cpp b/code/nel/src/3d/vertex_program_parse.cpp
index 40ac2282e..0e144d54f 100644
--- a/code/nel/src/3d/vertex_program_parse.cpp
+++ b/code/nel/src/3d/vertex_program_parse.cpp
@@ -17,7 +17,86 @@
 #include "std3d.h"
 #include "nel/3d/vertex_program_parse.h"
 
-
+enum TArguments
+{
+#ifdef NL_LITTLE_ENDIAN
+	ADD  = 1094992928,
+	ARL  = 1095912480,
+	BFC0 = 1111900976,
+	BFC1 = 1111900977,
+	COL0 = 1129270320,
+	COL1 = 1129270321,
+	DP3  = 1146106656,
+	DP4  = 1146106912,
+	DST  = 1146311712,
+	END  = 1162757152,
+	EXP  = 1163415584,
+	EXPP = 1163415632,
+	FOGC = 1179600707,
+	HPOS = 1213222739,
+	LIT  = 1279874080,
+	LOG  = 1280263968,
+	MAD  = 1296122912,
+	MAX  = 1296128032,
+	MIN  = 1296649760,
+	MOV  = 1297045024,
+	MUL  = 1297435680,
+	NRML = 1314016588,
+	OPOS = 1330663251,
+	PSIZ = 1347635546,
+	RCP  = 1380143136,
+	RSQ  = 1381191968,
+	SGE  = 1397179680,
+	SLT  = 1397511200,
+	TEX0 = 1413830704,
+	TEX1 = 1413830705,
+	TEX2 = 1413830706,
+	TEX3 = 1413830707,
+	TEX4 = 1413830708,
+	TEX5 = 1413830709,
+	TEX6 = 1413830710,
+	TEX7 = 1413830711,
+	WGHT = 1464289364,
+#else
+	ADD  = 541344833,
+	ARL  = 541872705,
+	BFC0 = 809715266,
+	BFC1 = 826492482,
+	COL0 = 810307395,
+	COL1 = 827084611,
+	DP3  = 540233796,
+	DP4  = 540299332,
+	DST  = 542397252,
+	END  = 541347397,
+	EXP  = 542136389,
+	EXPP = 1347442757,
+	FOGC = 1128746822,
+	HPOS = 1397706824,
+	LIT  = 542394700,
+	LOG  = 541544268,
+	MAD  = 541344077,
+	MAX  = 542654797,
+	MIN  = 542001485,
+	MOV  = 542527309,
+	MUL  = 541873485,
+	NRML = 1280135758,
+	OPOS = 1397706831,
+	PSIZ = 1514754896,
+	RCP  = 542131026,
+	RSQ  = 542200658,
+	SGE  = 541411155,
+	SLT  = 542395475,
+	TEX0 = 811091284,
+	TEX1 = 827868500,
+	TEX2 = 844645716,
+	TEX3 = 861422932,
+	TEX4 = 878200148,
+	TEX5 = 894977364,
+	TEX6 = 911754580,
+	TEX7 = 928531796,
+	WGHT = 1414022999,
+#endif
+};
 
 //=====================================
 bool CVPParser::parseWriteMask(uint &mask, std::string &errorOutput)
@@ -256,23 +335,23 @@ bool CVPParser::parseInputRegister(CVPOperand &operand, std::string &errorOutput
 			strValue |= ((uint32) *_CurrChar) << (8 * (3 - k));
 			++_CurrChar;
 		}
-		switch (strValue)
+		switch ((TArguments)strValue)
 		{
-			case 'OPOS': operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
-			case 'WGHT': operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
-			case 'NRML': operand.Value.InputRegisterValue = CVPOperand::INormal; break;
-			case 'COL0': operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
-			case 'COL1': operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
-			case 'FOGC': operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
+			case OPOS: operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
+			case WGHT: operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
+			case NRML: operand.Value.InputRegisterValue = CVPOperand::INormal; break;
+			case COL0: operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
+			case COL1: operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
+			case FOGC: operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
 			// texture argument
-			case 'TEX0':
-			case 'TEX1':
-			case 'TEX2':
-			case 'TEX3':
-			case 'TEX4':
-			case 'TEX5':
-			case 'TEX6':
-			case 'TEX7':
+			case TEX0:
+			case TEX1:
+			case TEX2:
+			case TEX3:
+			case TEX4:
+			case TEX5:
+			case TEX6:
+			case TEX7:
 				operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0');
 			break;
 			default:
@@ -384,23 +463,23 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
 		++_CurrChar;
 	}
 	// convert to enum
-	switch(strValue)
+	switch((TArguments)strValue)
 	{
-		case 'HPOS': operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
-		case 'COL0': operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
-		case 'COL1': operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
-		case 'BFC0': operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
-		case 'BFC1': operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
-		case 'FOGC': operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
-		case 'PSIZ': operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
-		case 'TEX0': operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
-		case 'TEX1': operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
-		case 'TEX2': operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
-		case 'TEX3': operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
-		case 'TEX4': operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
-		case 'TEX5': operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
-		case 'TEX6': operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
-		case 'TEX7': operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
+		case HPOS: operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
+		case COL0: operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
+		case COL1: operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
+		case BFC0: operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
+		case BFC1: operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
+		case FOGC: operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
+		case PSIZ: operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
+		case TEX0: operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
+		case TEX1: operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
+		case TEX2: operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
+		case TEX3: operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
+		case TEX4: operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
+		case TEX5: operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
+		case TEX6: operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
+		case TEX7: operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
 		default:
 			errorOutput = "Can't read index for output register.";
 			return false;
@@ -753,9 +832,9 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	{
 		instrStr |= (uint32) ' ';
 	}
-	switch (instrStr)
+	switch ((TArguments)instrStr)
 	{
-		case 'ARL ':
+		case ARL:
 			instr.Opcode = CVPInstruction::ARL;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -764,7 +843,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case 'RSQ ':
+		case RSQ:
 			instr.Opcode = CVPInstruction::RSQ;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -773,8 +852,8 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case 'EXP ':
-		case 'EXPP':
+		case EXP:
+		case EXPP:
 			instr.Opcode = CVPInstruction::EXPP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -789,7 +868,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}*/
 		break;
-		case 'LOG ':
+		case LOG:
 			instr.Opcode = CVPInstruction::LOG;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -805,7 +884,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 			*/
 		break;
-		case 'RCP ':
+		case RCP:
 			instr.Opcode = CVPInstruction::RCP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -815,60 +894,60 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 		break;
 		/////////////////
-		case 'MOV ':
+		case MOV:
 			instr.Opcode = CVPInstruction::MOV;
 			if (!parseOp2(instr, errorOutput)) return false;
 
 		break;
-		case 'LIT ':
+		case LIT:
 			instr.Opcode = CVPInstruction::LIT;
 			if (!parseOp2(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'MAD ':
+		case MAD:
 			instr.Opcode = CVPInstruction::MAD;
 			if (!parseOp4(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'ADD ':
+		case ADD:
 			instr.Opcode = CVPInstruction::ADD;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'MUL ':
+		case MUL:
 			instr.Opcode = CVPInstruction::MUL;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DP3 ':
+		case DP3:
 			instr.Opcode = CVPInstruction::DP3;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DP4 ':
+		case DP4:
 			instr.Opcode = CVPInstruction::DP4;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DST ':
+		case DST:
 			instr.Opcode = CVPInstruction::DST;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'MIN ':
+		case MIN:
 			instr.Opcode = CVPInstruction::MIN;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'MAX ':
+		case MAX:
 			instr.Opcode = CVPInstruction::MAX;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'SLT ':
+		case SLT:
 			instr.Opcode = CVPInstruction::SLT;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'SGE ':
+		case SGE:
 			instr.Opcode = CVPInstruction::SGE;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'END ':
+		case END:
 			endEncountered = true;
 			return true;
 		break;
diff --git a/code/nel/src/3d/water_pool_manager.cpp b/code/nel/src/3d/water_pool_manager.cpp
index b38068852..c377ff1f3 100644
--- a/code/nel/src/3d/water_pool_manager.cpp
+++ b/code/nel/src/3d/water_pool_manager.cpp
@@ -44,19 +44,19 @@ NLMISC_COMMAND(setWaterPool, "Setup a pool of water in the water pool manager",
 	}
 	if (numArgs == 3)
 	{
-		whmb.FilterWeight = ::atof(args[2].c_str());
+		NLMISC::fromString(args[2], whmb.FilterWeight);
 	}
 	if (numArgs == 4)
 	{
-		whmb.UnitSize = ::atof(args[3].c_str());
+		NLMISC::fromString(args[3], whmb.UnitSize);
 	}
 	if (numArgs == 5)
 	{
-		whmb.WaveIntensity = ::atof(args[4].c_str());
+		NLMISC::fromString(args[4], whmb.WaveIntensity);
 	}
 	if (numArgs == 4)
 	{
-		whmb.WavePeriod = ::atof(args[5].c_str());
+		NLMISC::fromString(args[5], whmb.WavePeriod);
 	}
 	// create the water pool
 	GetWaterPoolManager().createWaterPool(whmb);
diff --git a/code/nel/src/3d/zone_search.cpp b/code/nel/src/3d/zone_search.cpp
index cbadc8c39..f850d4377 100644
--- a/code/nel/src/3d/zone_search.cpp
+++ b/code/nel/src/3d/zone_search.cpp
@@ -73,7 +73,7 @@ pair<string, uint32> CZoneSearch::getZoneName(uint x, uint y, uint cx, uint cy)
 
 	sprintf(name, "%d_%c%c.zonel", zoneY, firstLetter, secondLetter);
 
-	return make_pair<string, uint32>(string(name), distance);
+	return std::pair<string, uint32>(string(name), distance);
 }
 
 
diff --git a/code/nel/src/georges/form_dfn.cpp b/code/nel/src/georges/form_dfn.cpp
index d4a16bb50..16ee74d5b 100644
--- a/code/nel/src/georges/form_dfn.cpp
+++ b/code/nel/src/georges/form_dfn.cpp
@@ -707,7 +707,7 @@ bool CFormDfn::getEntryIndexByName (uint &entry, const	std::string &name) const
 		}
 		entryIndex++;
 	}
-	entry=std::numeric_limits<uint>::max();
+	entry = std::numeric_limits<uint>::max();
 	return	false;
 }
 
diff --git a/code/nel/src/georges/form_elm.cpp b/code/nel/src/georges/form_elm.cpp
index 658d1d9f6..01e4010e2 100644
--- a/code/nel/src/georges/form_elm.cpp
+++ b/code/nel/src/georges/form_elm.cpp
@@ -231,7 +231,7 @@ bool CFormElm::isAtom () const
 const CType* CFormElm::getType ()
 {
 	warning (false, "getType", "This node is not an atom.");
-	return 0;
+	return NULL;
 }
 
 // ***************************************************************************
diff --git a/code/nel/src/gui/CMakeLists.txt b/code/nel/src/gui/CMakeLists.txt
index e3d501e23..32125791d 100644
--- a/code/nel/src/gui/CMakeLists.txt
+++ b/code/nel/src/gui/CMakeLists.txt
@@ -6,7 +6,7 @@ SOURCE_GROUP("src" FILES ${SRC})
 
 NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
 
-INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
 
 TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBWWW_LIBRARIES} ${CURL_LIBRARIES})
 SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")
diff --git a/code/nel/src/gui/ctrl_base_button.cpp b/code/nel/src/gui/ctrl_base_button.cpp
index 4f118cd51..673ea906d 100644
--- a/code/nel/src/gui/ctrl_base_button.cpp
+++ b/code/nel/src/gui/ctrl_base_button.cpp
@@ -701,6 +701,11 @@ namespace NLGUI
 					//pIM->submitEvent ("button_click:"+getId());
 				}
 				*/
+
+				// top-right corner is EventX=0, EventY=0
+				_EventX = eventDesc.getX() - _XReal;
+				_EventY = (_YReal + _HReal) - eventDesc.getY();
+
 				runLeftClickAction();
 				if (CWidgetManager::getInstance()->getCapturePointerLeft() == NULL) return true; // event handler may release cpature from this object (if it is removed for example)
 
diff --git a/code/nel/src/gui/ctrl_scroll.cpp b/code/nel/src/gui/ctrl_scroll.cpp
index f534fc0a1..c29f73fea 100644
--- a/code/nel/src/gui/ctrl_scroll.cpp
+++ b/code/nel/src/gui/ctrl_scroll.cpp
@@ -519,17 +519,17 @@ namespace NLGUI
 
 		// Read Action handlers
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscroll" );
-		if (prop)	_AHOnScroll = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScroll = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"params" );
 		if (prop)	_AHOnScrollParams = string((const char*)prop);
 		//
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscrollend" );
-		if (prop)	_AHOnScrollEnd = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScrollEnd = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"end_params" );
 		if (prop)	_AHOnScrollEndParams = string((const char*)prop);
 		//
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscrollcancel" );
-		if (prop)	_AHOnScrollCancel = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScrollCancel = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"cancel_params" );
 		if (prop)	_AHOnScrollCancelParams = string((const char*)prop);
 
@@ -538,9 +538,9 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( node, (xmlChar*)"target" );
 		if (prop)
 		{
-			CInterfaceGroup	*group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(prop));
+			CInterfaceGroup	*group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(prop.str()));
 			if(group == NULL)
-				group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(this->getId(), prop));
+				group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(this->getId(), prop.str()));
 
 			if(group != NULL)
 				setTarget (group);
diff --git a/code/nel/src/gui/ctrl_text_button.cpp b/code/nel/src/gui/ctrl_text_button.cpp
index d3a0f6765..2fb19a9fc 100644
--- a/code/nel/src/gui/ctrl_text_button.cpp
+++ b/code/nel/src/gui/ctrl_text_button.cpp
@@ -23,6 +23,7 @@
 #include "nel/gui/group_container_base.h"
 #include "nel/gui/lua_ihm.h"
 #include "nel/gui/widget_manager.h"
+#include "nel/gui/interface_factory.h"
 #include "nel/misc/i18n.h"
 
 using namespace std;
@@ -66,8 +67,6 @@ namespace NLGUI
 	{
 		if( _ViewText != NULL )
 		{
-			if( _Parent != NULL )
-				_Parent->delView( _ViewText, true );
 			delete _ViewText;
 			_ViewText = NULL;
 		}
@@ -569,6 +568,7 @@ namespace NLGUI
 			((CViewTextID*)_ViewText)->parseTextIdOptions(cur);
 		// Same RenderLayer as us.
 		_ViewText->setRenderLayer(getRenderLayer());
+		_ViewText->setParentElm(this);
 		// Parse the hardText (if not text id)
 		if(!_IsViewTextId)
 		{
@@ -863,9 +863,20 @@ namespace NLGUI
 			}
 			if(getFrozen() && getFrozenHalfTone())
 				_ViewText->setAlpha(_ViewText->getAlpha()>>2);
+
+			_ViewText->draw();
 		}
 	}
 
+	// ***************************************************************************
+	void CCtrlTextButton::checkCoords()
+	{
+		if( _ViewText != NULL )
+			_ViewText->checkCoords();
+
+		CCtrlBaseButton::checkCoords();
+	}
+
 
 	// ***************************************************************************
 	void CCtrlTextButton::updateCoords()
@@ -873,6 +884,9 @@ namespace NLGUI
 		// Should have been setuped with addCtrl
 		nlassert(_Setuped);
 
+		if( _Name == "==MARKED==" )
+			bool marked = true;
+
 		// Compute Size according to bitmap and Text.
 		if (!(_SizeRef & 1))
 		{
@@ -886,6 +900,8 @@ namespace NLGUI
 		}
 
 		CViewBase::updateCoords();
+
+		_ViewText->updateCoords();
 	}
 
 	// ***************************************************************************
@@ -901,7 +917,7 @@ namespace NLGUI
 
 		if( _ViewText == NULL )
 		{
-			CViewBase *v = CWidgetManager::getInstance()->getParser()->createClass( "text" );
+			CViewBase *v = CInterfaceFactory::createClass( "text" );
 			nlassert( v != NULL );
 			_ViewText = dynamic_cast< CViewText* >( v );
 			_ViewText->setId( _Id + "_text" );
@@ -910,15 +926,13 @@ namespace NLGUI
 		}
 
 		// setup the viewText and add to parent
-		_ViewText->setParent (getParent());
+		_ViewText->setParentElm (this);
 		_ViewText->setParentPos (this);
 		_ViewText->setParentPosRef (_TextParentPosRef);
 		_ViewText->setPosRef (_TextPosRef);
 		_ViewText->setActive(_Active);
 		_ViewText->setX(_TextX);
 		_ViewText->setY(_TextY);
-
-		getParent()->addView(_ViewText);
 	}
 
 	// ***************************************************************************
@@ -1007,17 +1021,18 @@ namespace NLGUI
 	// ***************************************************************************
 	void CCtrlTextButton::onRemoved()
 	{
-		if( _ViewText != NULL )
-		{
-			if( _Parent != NULL )
-				_Parent->delView( _ViewText, true );
-		}
 	}
 
 	void CCtrlTextButton::onWidgetDeleted( CInterfaceElement *e )
 	{
-		if( e == _ViewText )
-			_ViewText = NULL;
+	}
+
+	void CCtrlTextButton::moveBy( sint32 x, sint32 y )
+	{
+		CInterfaceElement::moveBy( x, y );
+
+		if( _ViewText != NULL )
+			_ViewText->updateCoords();
 	}
 }
 
diff --git a/code/nel/src/gui/dbgroup_combo_box.cpp b/code/nel/src/gui/dbgroup_combo_box.cpp
index 61b8ec3e6..39ddd63c1 100644
--- a/code/nel/src/gui/dbgroup_combo_box.cpp
+++ b/code/nel/src/gui/dbgroup_combo_box.cpp
@@ -268,7 +268,7 @@ namespace NLGUI
 	void	CDBGroupComboBox::addText(const ucstring &text)
 	{
 		dirt();
-		_Texts.push_back(make_pair(_Texts.size(), text));
+		_Texts.push_back(make_pair((uint)_Texts.size(), text));
 		_Textures.push_back(std::string());
 	}
 
@@ -330,7 +330,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	const uint		&CDBGroupComboBox::getTextId(uint i) const
+	uint CDBGroupComboBox::getTextId(uint i) const
 	{
 		static	uint	null = 0;
 		if(i<_Texts.size())
diff --git a/code/nel/src/gui/dbview_number.cpp b/code/nel/src/gui/dbview_number.cpp
index a0b6dfb02..e844bf4c0 100644
--- a/code/nel/src/gui/dbview_number.cpp
+++ b/code/nel/src/gui/dbview_number.cpp
@@ -121,7 +121,7 @@ namespace NLGUI
 		{
 			sint64 i;
 			if( fromString( value, i ) )
-				_Divisor = i;
+				_Modulo = i;
 			return;
 		}
 		else
@@ -249,5 +249,16 @@ namespace NLGUI
 	{
 	}
 
+	sint64 CDBViewNumber::getVal()
+	{
+		if( !_Number.hasValue() )
+			return 0;
+
+		if( _Modulo == 0 )
+			return _Number.getSInt64() / _Divisor;
+		else
+			return ( _Number.getSInt64() / _Divisor ) % _Modulo;
+	}
+
 }
 
diff --git a/code/nel/src/gui/dbview_quantity.cpp b/code/nel/src/gui/dbview_quantity.cpp
index ad651f582..12dfce4b8 100644
--- a/code/nel/src/gui/dbview_quantity.cpp
+++ b/code/nel/src/gui/dbview_quantity.cpp
@@ -157,14 +157,17 @@ namespace NLGUI
 	// ***************************************************************************
 	void CDBViewQuantity::draw ()
 	{
-		// change text
-		sint32	val= _Number.getSInt32();
-		sint32	valMax= _NumberMax.getSInt32();
-		if(_Cache!=val || _CacheMax!=valMax)
+		if( _Number.hasValue() && _NumberMax.hasValue() )
 		{
-			_Cache= val;
-			_CacheMax=valMax;
-			buildTextFromCache();
+			// change text
+			sint32	val= _Number.getSInt32();
+			sint32	valMax= _NumberMax.getSInt32();
+			if(_Cache!=val || _CacheMax!=valMax)
+			{
+				_Cache= val;
+				_CacheMax=valMax;
+				buildTextFromCache();
+			}
 		}
 
 		// parent call
diff --git a/code/nel/src/gui/group_container.cpp b/code/nel/src/gui/group_container.cpp
index c3a7834c5..18a65bc5f 100644
--- a/code/nel/src/gui/group_container.cpp
+++ b/code/nel/src/gui/group_container.cpp
@@ -2373,7 +2373,7 @@ namespace NLGUI
 		{
 			setMaxH(_PopupMaxH);
 			// _W is given by scripter-man
-			newH = pLayer->H_T;
+			newH = (pLayer->H_T - pLayer->InsetT);
 		}
 		else
 		{
@@ -2382,7 +2382,7 @@ namespace NLGUI
 				_W = _Parent->getW();
 			}
 			setMaxH (16384); // No scrollbar for container of layer > 0
-			newH = pLayer->H_T;
+			newH = (pLayer->H_T - pLayer->InsetT);
 		}
 
 		if (_Opened)
@@ -2396,11 +2396,11 @@ namespace NLGUI
 				_HeaderOpened->setY (- newH);
 				_HeaderOpened->setW (_W-(pLayer->W_L+pLayer->W_R));
 				_HeaderOpened->updateCoords();
-				newH += max (_HeaderOpened->getHReal(), pLayer->getValSInt32 ("header_h"));
+				newH += max (_HeaderOpened->getHReal(), pLayer->HeaderH);
 			}
 			else
 			{
-				newH += pLayer->getValSInt32 ("header_h");
+				newH += pLayer->HeaderH;
 			}
 
 			newH -= (sint32) _ContentYOffset;
@@ -2448,12 +2448,12 @@ namespace NLGUI
 			if (_LayerSetup == 0)
 			{
 				// zeH is the height to substract to total height of the container to obtain height of the list
-				sint32 zeH = pLayer->H_T + pLayer->H_B_Open + pLayer->H_EM_Open;
+				sint32 zeH = (pLayer->H_T - pLayer->InsetT) + pLayer->H_B_Open + pLayer->H_EM_Open;
 
 				if (_HeaderOpened != NULL)
-					zeH += max (_HeaderOpened->getHReal(), pLayer->getValSInt32 ("header_h"));
+					zeH += max (_HeaderOpened->getHReal(), pLayer->HeaderH);
 				else
-					zeH += pLayer->getValSInt32 ("header_h");
+					zeH += pLayer->HeaderH;
 
 				if (_Content != NULL)
 					zeH += _Content->getHReal();
@@ -2513,11 +2513,11 @@ namespace NLGUI
 				_HeaderClosed->setY (-newH);
 				_HeaderClosed->setW (_W-(pLayer->W_L+pLayer->W_R));
 				_HeaderClosed->updateCoords();
-				newH += max (_HeaderClosed->getHReal(), pLayer->getValSInt32 ("header_h"));
+				newH += max (_HeaderClosed->getHReal(), pLayer->HeaderH);
 			}
 			else
 			{
-				newH += pLayer->getValSInt32 ("header_h");
+				newH += pLayer->HeaderH;
 			}
 			newH += pLayer->H_B;
 
@@ -2731,7 +2731,8 @@ namespace NLGUI
 		// h is the size of what is on top of the child list
 		sint32 x, y, w, h;
 
-		h = pLayer->H_T + pLayer->H_B_Open;
+		bool bHasChild = (_List->getNbElement() > 0);
+		h = (pLayer->H_T - pLayer->InsetT) + (((!_Opened) || (!bHasChild)) ? pLayer->H_B : pLayer->H_B_Open);
 
 		if (_Opened)
 		{
@@ -2749,7 +2750,6 @@ namespace NLGUI
 		{
 			h = _HReal;
 		}
-		bool bHasChild = (_List->getNbElement() > 0);
 
 		x = _XReal;
 		y = _YReal+_HReal-h;
@@ -2767,7 +2767,7 @@ namespace NLGUI
 			// Top Right
 			rVR.drawRotFlipBitmap (rl, x+w-pLayer->W_TR, y+h-pLayer->H_TR, pLayer->W_TR, pLayer->H_TR, 0, false, pLayer->TxId_TR, col);
 
-			if ((!_Opened) || (_Opened && !bHasChild))
+			if ((!_Opened) || (!bHasChild))
 			{ // Not opened
 				// Left
 				if (pLayer->Tile_L == 0) // Tiling ?
@@ -2817,9 +2817,9 @@ namespace NLGUI
 				rVR.drawRotFlipBitmap (rl, x+w-pLayer->W_BR_Open, y, pLayer->W_BR_Open, pLayer->H_BR_Open, 0, false, pLayer->TxId_BR_Open, col);
 				// Content
 				if (pLayer->Tile_Blank == 0) // Tiling ?
-					rVR.drawRotFlipBitmap (rl, x+pLayer->W_L, y+pLayer->H_B, w-(pLayer->W_R+pLayer->W_L), h-(pLayer->H_B_Open+pLayer->H_T), 0, false, pLayer->TxId_Blank, col);
+					rVR.drawRotFlipBitmap (rl, x+pLayer->W_L, y+pLayer->H_B_Open, w-(pLayer->W_R+pLayer->W_L), h-(pLayer->H_B_Open+pLayer->H_T), 0, false, pLayer->TxId_Blank, col);
 				else
-					rVR.drawRotFlipBitmapTiled (rl, x+pLayer->W_L, y+pLayer->H_B, w-(pLayer->W_R+pLayer->W_L), h-(pLayer->H_B_Open+pLayer->H_T), 0, false, pLayer->TxId_Blank, pLayer->Tile_Blank-1, col);
+					rVR.drawRotFlipBitmapTiled (rl, x+pLayer->W_L, y+pLayer->H_B_Open, w-(pLayer->W_R+pLayer->W_L), h-(pLayer->H_B_Open+pLayer->H_T), 0, false, pLayer->TxId_Blank, pLayer->Tile_Blank-1, col);
 				// ScrollBar Placement
 				if (pLayer->Tile_M_Open == 0)  // Tiling ?
 					rVR.drawRotFlipBitmap (rl, x, _YReal+pLayer->H_EL_Open, pLayer->W_M_Open, _HReal-h-pLayer->H_EL_Open, 0, false, pLayer->TxId_M_Open, col);
@@ -2848,7 +2848,7 @@ namespace NLGUI
 			// Top Right
 			rVR.drawRotFlipBitmap (rl, x+w-pLayer->W_TR, y+h-pLayer->H_TR, pLayer->W_TR, pLayer->H_TR, 0, false, pLayer->TxId_TR, col);
 
-			if ((!_Opened) || (_Opened && !bHasChild))
+			if ((!_Opened) || (!bHasChild))
 			{
 				// Left
 				if (pLayer->Tile_L == 0) // Tiling ?
@@ -2856,7 +2856,7 @@ namespace NLGUI
 				else
 					rVR.drawRotFlipBitmapTiled (rl, x, y+pLayer->H_BL, pLayer->W_L, h-(pLayer->H_BL+pLayer->H_TL), 0, false, pLayer->TxId_L, pLayer->Tile_L-1, col);
 				// Right
-				if (pLayer->Tile_T == 0) // Tiling ?
+				if (pLayer->Tile_R == 0) // Tiling ?
 					rVR.drawRotFlipBitmap (rl, x+w-pLayer->W_R, y+pLayer->H_BR, pLayer->W_R, h-(pLayer->H_BL+pLayer->H_TL), 0, false, pLayer->TxId_R, col);
 				else
 					rVR.drawRotFlipBitmapTiled (rl, x+w-pLayer->W_R, y+pLayer->H_BR, pLayer->W_R, h-(pLayer->H_BL+pLayer->H_TL), 0, false, pLayer->TxId_R, pLayer->Tile_R-1, col);
@@ -3003,18 +3003,16 @@ namespace NLGUI
 				col.A = nInverted;
 			else
 				col.A = max(_HighLightedAlpha, nInverted);
-			sint32 hw, hh; // size of highlight texture
-			rVR.getTextureSizeFromId(pLayer->TxId_TL_HighLight, hw, hh);
 			// corners
-			rVR.drawRotFlipBitmap (_RenderLayer, x, y + h - hh, hw, hh, 0, false, pLayer->TxId_TL_HighLight, col);
-			rVR.drawRotFlipBitmap (_RenderLayer, x + _WReal - hw, y + h - hh, hw, hh, 0, false, pLayer->TxId_TR_HighLight, col);
-			rVR.drawRotFlipBitmap (_RenderLayer, x, _YReal, hw, hh, 0, false, pLayer->TxId_BL_HighLight, col);
-			rVR.drawRotFlipBitmap (_RenderLayer, x + _WReal - hw, _YReal, hw, hh, 0, false, pLayer->TxId_BR_HighLight, col);
+			rVR.drawRotFlipBitmap (_RenderLayer, x, y + h - pLayer->H_T_HighLight, pLayer->W_TL_HighLight, pLayer->H_TL_HighLight, 0, false, pLayer->TxId_TL_HighLight, col);
+			rVR.drawRotFlipBitmap (_RenderLayer, x + _WReal - pLayer->W_TR_HighLight, y + h - pLayer->H_T_HighLight, pLayer->W_TR_HighLight, pLayer->H_TR_HighLight, 0, false, pLayer->TxId_TR_HighLight, col);
+			rVR.drawRotFlipBitmap (_RenderLayer, x, _YReal, pLayer->W_BL_HighLight, pLayer->H_BL_HighLight, 0, false, pLayer->TxId_BL_HighLight, col);
+			rVR.drawRotFlipBitmap (_RenderLayer, x + _WReal - pLayer->W_BR_HighLight, _YReal, pLayer->W_BR_HighLight, pLayer->H_BR_HighLight, 0, false, pLayer->TxId_BR_HighLight, col);
 			// border
-			rVR.drawRotFlipBitmap (_RenderLayer, x + hw, y + h - hh, _WReal - 2 * hw, hh, 0, false, pLayer->TxId_T_HighLight, col);
-			rVR.drawRotFlipBitmap (_RenderLayer, x + hw, _YReal, _WReal - 2 * hw, hh, 0, false, pLayer->TxId_B_HighLight, col);
-			rVR.drawRotFlipBitmap (_RenderLayer, x, _YReal + hh, hw, _HReal - 2 * hh, 0, false, pLayer->TxId_L_HighLight, col);
-			rVR.drawRotFlipBitmap (_RenderLayer, x + _WReal - hw, _YReal + hh, hw, _HReal - 2 * hh, 0, false, pLayer->TxId_R_HighLight, col);
+			rVR.drawRotFlipBitmap (_RenderLayer, x + pLayer->W_TL_HighLight, y + h - pLayer->H_T_HighLight, _WReal - pLayer->W_TL_HighLight - pLayer->W_TR_HighLight, pLayer->H_T_HighLight, 0, false, pLayer->TxId_T_HighLight, col);
+			rVR.drawRotFlipBitmap (_RenderLayer, x + pLayer->W_BL_HighLight, _YReal, _WReal - pLayer->W_BL_HighLight - pLayer->W_BR_HighLight, pLayer->H_B_HighLight, 0, false, pLayer->TxId_B_HighLight, col);
+			rVR.drawRotFlipBitmap (_RenderLayer, x, _YReal + pLayer->H_B_HighLight, pLayer->W_L_HighLight, _HReal - pLayer->H_T_HighLight - pLayer->H_B_HighLight, 0, false, pLayer->TxId_L_HighLight, col);
+			rVR.drawRotFlipBitmap (_RenderLayer, x + _WReal - pLayer->W_R_HighLight, _YReal + pLayer->H_B_HighLight, pLayer->W_R_HighLight, _HReal - pLayer->H_T_HighLight - pLayer->H_B_HighLight, 0, false, pLayer->TxId_R_HighLight, col);
 		}
 
 
@@ -3715,6 +3713,7 @@ namespace NLGUI
 			_TitleOpened->setParentPosRef (Hotspot_TL);
 			_TitleOpened->setPosRef (Hotspot_TL);
 			_TitleOpened->setShadow (true);
+			_TitleOpened->setShadowOutline (false);
 			_TitleOpened->setColor (CRGBA(255,255,255,255));
 			_TitleOpened->setModulateGlobalColor(getModulateGlobalColor());
 			_TitleOpened->setOverExtendViewText(_TitleOverExtendViewText);
@@ -3766,6 +3765,7 @@ namespace NLGUI
 			_TitleClosed->setParentPosRef (Hotspot_TL);
 			_TitleClosed->setPosRef (Hotspot_TL);
 			_TitleClosed->setShadow (true);
+			_TitleClosed->setShadowOutline (false);
 			_TitleClosed->setColor (CRGBA(255,255,255,255));
 			_TitleClosed->setModulateGlobalColor(getModulateGlobalColor());
 			_TitleClosed->setOverExtendViewText(_TitleOverExtendViewText);
diff --git a/code/nel/src/gui/group_editbox.cpp b/code/nel/src/gui/group_editbox.cpp
index 751d9241b..f6d909119 100644
--- a/code/nel/src/gui/group_editbox.cpp
+++ b/code/nel/src/gui/group_editbox.cpp
@@ -27,7 +27,7 @@
 #include "nel/gui/widget_manager.h"
 #include "nel/gui/view_renderer.h"
 #include "nel/gui/db_manager.h"
-#include <limits>
+#include "nel/gui/interface_factory.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -999,7 +999,8 @@ namespace NLGUI
 			break;
 			// OTHER
 			default:
-				if ((rEDK.getChar() == KeyRETURN) && !_WantReturn)
+				bool isKeyRETURN = !rEDK.getKeyCtrl() && rEDK.getChar() == KeyRETURN;
+				if (isKeyRETURN && !_WantReturn)
 				{
 					// update historic.
 					if(_MaxHistoric)
@@ -1030,9 +1031,9 @@ namespace NLGUI
 					// If the char is not alphanumeric -> return.
 					//		if(!isalnum(ec.Char))
 					//			return
-					if( (rEDK.getChar()>=32) || (rEDK.getChar() == KeyRETURN) )
+					if( (rEDK.getChar()>=32) || isKeyRETURN )
 					{
-						if (rEDK.getChar() == KeyRETURN)
+						if (isKeyRETURN)
 						{
 							ucstring	copyStr= _InputString;
 							if ((uint) std::count(copyStr.begin(), copyStr.end(), '\n') >= _MaxNumReturn)
@@ -1049,7 +1050,7 @@ namespace NLGUI
 							cutSelection();
 						}
 
-						ucchar c = (rEDK.getChar() == KeyRETURN)?'\n':rEDK.getChar();
+						ucchar c = isKeyRETURN ? '\n' : rEDK.getChar();
 						if (isFiltered(c)) return;
 						switch(_EntryType)
 						{
@@ -1128,7 +1129,7 @@ namespace NLGUI
 							++ _CursorPos;
 							triggerOnChangeAH();
 						}
-						if (rEDK.getChar() == KeyRETURN)
+						if (isKeyRETURN)
 						{
 							CAHManager::getInstance()->runActionHandler(_AHOnEnter, this, _AHOnEnterParams);
 						}
@@ -1320,15 +1321,31 @@ namespace NLGUI
 				}
 			}
 
+			// if click, and not frozen, then get the focus
+			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup && !_Frozen)
+			{
+				_SelectingText = false;
+				if (_SelectCursorPos == _CursorPos)
+					_CurrSelection = NULL;
+				
+				return true;
+			}
+
 			if (!isIn(eventDesc.getX(), eventDesc.getY()))
 				return false;
 
 			// if click, and not frozen, then get the focus
 			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftdown && !_Frozen)
 			{
+				if( getEditorMode() )
+				{
+					return CViewBase::handleEvent( event );
+				}
+
 				_SelectingText = true;
 				stopParentBlink();
 				CWidgetManager::getInstance()->setCaptureKeyboard (this);
+				CWidgetManager::getInstance()->setCapturePointerLeft (this);
 				// set the right cursor position
 				uint newCurPos;
 				bool cursorAtPreviousLineEnd;
@@ -1356,16 +1373,6 @@ namespace NLGUI
 				return true;
 			}
 
-			// if click, and not frozen, then get the focus
-			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup && !_Frozen)
-			{
-				_SelectingText = false;
-				if (_SelectCursorPos == _CursorPos)
-					_CurrSelection = NULL;
-				
-				return true;
-			}
-
 			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouserightdown)
 			{
 				CWidgetManager::getInstance()->setCapturePointerRight(this);
@@ -1530,36 +1537,45 @@ namespace NLGUI
 		CInterfaceGroup::clearViews();
 	}
 
+	// ----------------------------------------------------------------------------
+
+	void CGroupEditBox::createViewText()
+	{
+		nlwarning("Interface: CGroupEditBox: text 'edit_text' missing or bad type");
+		nlwarning( "Trying to create a new 'edit_text' for %s", getId().c_str() );
+		_ViewText = dynamic_cast< CViewText* >( CInterfaceFactory::createClass( "text" ) );
+		if( _ViewText == NULL )
+		{
+			nlwarning( "Failed to create new 'edit_text' for %s", getId().c_str() );
+			return;
+		}
+
+		_ViewText->setParent( this );
+		_ViewText->setIdRecurse( "edit_text" );
+		_ViewText->setHardText( "" );
+		_ViewText->setPosRef( Hotspot_ML );
+		_ViewText->setParentPosRef( Hotspot_ML );
+		addView( _ViewText );
+
+		sint32 w,h;
+		w = std::max( sint32( _ViewText->getFontWidth() * _ViewText->getText().size() ), getW() );
+		h = std::max( sint32(  _ViewText->getFontHeight() ), getH() );
+					
+		setH( h );
+		setW( w );
+	}
+
 	// ----------------------------------------------------------------------------
 	void CGroupEditBox::setup()
 	{
 		// bind to the controls
-		_ViewText = dynamic_cast<CViewText *>(CInterfaceGroup::getView("edit_text"));
+		if( _ViewText == NULL )
+			_ViewText = dynamic_cast<CViewText *>(CInterfaceGroup::getView("edit_text"));
 
 		if(_ViewText == NULL)
-		{
-			nlwarning("Interface: CGroupEditBox: text 'edit_text' missing or bad type");
-			if( editorMode )
-			{
-				nlwarning( "Trying to create a new 'edit_text' for %s", getId().c_str() );
-				_ViewText = dynamic_cast< CViewText* >( CWidgetManager::getInstance()->getParser()->createClass( "text" ) );
-				if( _ViewText != NULL )
-				{
-					_ViewText->setParent( this );
-					_ViewText->setIdRecurse( "edit_text" );
-					_ViewText->setHardText( "sometext" );
-					_ViewText->setPosRef( Hotspot_TL );
-					_ViewText->setParentPosRef( Hotspot_TL );
-					addView( _ViewText );
-					
-					setH( _ViewText->getFontHeight() );
-					setW( _ViewText->getFontWidth() * _ViewText->getText().size() );
-					
-				}
-				else
-					nlwarning( "Failed to create new 'edit_text' for %s", getId().c_str() );
-			}
-		}
+			createViewText();
+
+		_ViewText->setEditorSelectable( false );
 
 		// For MultiLine editbox, clip the end space, else weird when edit space at end of line (nothing happens)
 		if(_ViewText)
diff --git a/code/nel/src/gui/group_editbox_decor.cpp b/code/nel/src/gui/group_editbox_decor.cpp
new file mode 100644
index 000000000..ae31513de
--- /dev/null
+++ b/code/nel/src/gui/group_editbox_decor.cpp
@@ -0,0 +1,380 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2014  Laszlo Kis-Adam
+// 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/>.
+
+#include "stdpch.h"
+#include "nel/gui/group_editbox_decor.h"
+#include "nel/gui/view_bitmap.h"
+#include "nel/gui/view_text.h"
+
+namespace NLGUI
+{
+	class EBDPrivate
+	{
+	public:
+		enum Textures
+		{
+			BG,
+			L,
+			R,
+			TM,
+			BM,
+			TL,
+			TR,
+			BL,
+			BR,
+			TCOUNT
+		};
+
+		EBDPrivate()
+		{
+			for( int i = 0; i < TCOUNT; i++ )
+			{
+				_Textures.push_back( new CViewBitmap( CViewBase::TCtorParam() ) );
+			}
+		}
+
+		~EBDPrivate()
+		{
+			for( int i = 0; i < _Textures.size(); i++ )
+				delete _Textures[ i ];
+			_Textures.clear();
+		}
+
+		void draw()
+		{
+			for( int i = 0; i < _Textures.size(); i++ )
+			{
+				CViewBitmap *bm = _Textures[ i ];
+				bm->draw();
+			}
+		}
+
+		void updateCoords()
+		{
+			for( int i = 0; i < _Textures.size(); i++ )
+			{
+				CViewBitmap *bm = _Textures[ i ];
+				bm->fitTexture();
+			}
+
+			// W and H parameters depend on the sizes of the other textures
+			// Negative sizes mean that the sizes are that much smaller than the parent
+			sint32 w,h;
+			h = _Textures[ TL ]->getHReal() + _Textures[ BL ]->getHReal();
+			h *= -1;
+			_Textures[ L ]->setH( h );
+
+			h = _Textures[ TR ]->getHReal() + _Textures[ BR ]->getHReal();
+			h *= -1;
+			_Textures[ R ]->setH( h );
+
+			w = _Textures[ TL ]->getWReal() + _Textures[ TR ]->getWReal();
+			w *= -1;
+			_Textures[ TM ]->setW( w );
+
+			w = _Textures[ BL ]->getWReal() + _Textures[ BR ]->getWReal();
+			w *= -1;
+			_Textures[ BM ]->setW( w );
+
+			h = _Textures[ TM ]->getHReal() + _Textures[ BM ]->getHReal();
+			h *= -1;
+			w = _Textures[ L ]->getWReal() + _Textures[ R ]->getWReal();
+			w *= -1;
+			_Textures[ BG ]->setW( w );
+			_Textures[ BG ]->setH( h );
+
+			for( int i = 0; i < _Textures.size(); i++ )
+			{
+				CViewBitmap *bm = _Textures[ i ];
+				bm->updateCoords();
+			}
+		}
+
+		void setup( CInterfaceGroup *parent )
+		{
+			for( int i = 0; i < _Textures.size(); i++ )
+			{
+				CViewBitmap *bm = _Textures[ i ];
+				bm->setParent( parent );
+				bm->setParentPos( parent );
+				bm->setParentSize( parent );
+				bm->setEditorSelectable( false );
+			}
+
+			_Textures[ TL ]->setPosRef( Hotspot_TL );
+			_Textures[ TL ]->setParentPosRef( Hotspot_TL );
+
+			_Textures[ TM ]->setPosRef( Hotspot_TM );
+			_Textures[ TM ]->setParentPosRef( Hotspot_TM );
+			_Textures[ TM ]->setScale( true );
+			_Textures[ TM ]->setSizeRef( "w" );
+
+			_Textures[ TR ]->setPosRef( Hotspot_TR );
+			_Textures[ TR ]->setParentPosRef( Hotspot_TR );
+
+			_Textures[ BL ]->setPosRef( Hotspot_BL );
+			_Textures[ BL ]->setParentPosRef( Hotspot_BL );
+
+			_Textures[ BM ]->setPosRef( Hotspot_BM );
+			_Textures[ BM ]->setParentPosRef( Hotspot_BM );
+			_Textures[ BM ]->setScale( true );
+			_Textures[ BM ]->setSizeRef( "w" );
+
+			_Textures[ BR ]->setPosRef( Hotspot_BR );
+			_Textures[ BR ]->setParentPosRef( Hotspot_BR );
+
+			_Textures[ L ]->setPosRef( Hotspot_ML );
+			_Textures[ L ]->setParentPosRef( Hotspot_ML );
+			_Textures[ L ]->setScale( true );
+			_Textures[ L ]->setSizeRef( "h" );
+
+			_Textures[ R ]->setPosRef( Hotspot_MR );
+			_Textures[ R ]->setParentPosRef( Hotspot_MR );
+			_Textures[ R ]->setScale( true );
+			_Textures[ R ]->setSizeRef( "h" );
+
+			_Textures[ BG ]->setPosRef( Hotspot_MM );
+			_Textures[ BG ]->setParentPosRef( Hotspot_MM );
+			_Textures[ BG ]->setScale( true );
+			_Textures[ BG ]->setSizeRef( "wh" );
+		}
+
+		std::vector< CViewBitmap* > _Textures;
+	};
+
+	NLMISC_REGISTER_OBJECT( CViewBase, CGroupEditBoxDecor, std::string, "edit_box_decor" );
+
+	CGroupEditBoxDecor::CGroupEditBoxDecor( const TCtorParam &param ) :
+	CGroupEditBox( param )
+	{
+		_Pvt = new EBDPrivate();
+		_Pvt->setup( this );
+
+		createViewText();
+		getVT()->setSerializable( false );
+		getVT()->setEditorSelectable( false );
+	}
+
+	CGroupEditBoxDecor::~CGroupEditBoxDecor()
+	{
+		delete _Pvt;
+		_Pvt = NULL;
+	}
+
+	void CGroupEditBoxDecor::moveBy( sint32 x, sint32 y )
+	{
+		CInterfaceElement::moveBy( x, y );
+
+		_Pvt->updateCoords();
+	}
+
+	void CGroupEditBoxDecor::setIdRecurse( const std::string &newID )
+	{
+		CInterfaceElement::setIdRecurse( newID );
+		_ViewText->setIdRecurse( _ViewText->getShortId() );
+	}
+
+	std::string CGroupEditBoxDecor::getProperty( const std::string &name ) const
+	{
+		if( name == "tx_tl" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::TL ]->getTexture();
+		}
+		else
+		if( name == "tx_tm" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::TM ]->getTexture();
+		}
+		else
+		if( name == "tx_tr" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::TR ]->getTexture();
+		}
+		else
+		if( name == "tx_bl" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::BL ]->getTexture();
+		}
+		else
+		if( name == "tx_bm" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::BM ]->getTexture();
+		}
+		else
+		if( name == "tx_br" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::BR ]->getTexture();
+		}
+		else
+		if( name == "tx_l" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::L ]->getTexture();
+		}
+		else
+		if( name == "tx_r" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::R ]->getTexture();
+		}
+		else
+		if( name == "tx_bg" )
+		{
+			return _Pvt->_Textures[ EBDPrivate::BG ]->getTexture();
+		}
+		else
+			return CGroupEditBox::getProperty( name );
+	}
+
+	void CGroupEditBoxDecor::setProperty( const std::string &name, const std::string &value )
+	{
+		if( name == "tx_tl" )
+		{
+			_Pvt->_Textures[ EBDPrivate::TL ]->setTexture( value );
+		}
+		else
+		if( name == "tx_tm" )
+		{
+			_Pvt->_Textures[ EBDPrivate::TM ]->setTexture( value );
+		}
+		else
+		if( name == "tx_tr" )
+		{
+			_Pvt->_Textures[ EBDPrivate::TR ]->setTexture( value );
+		}
+		else
+		if( name == "tx_bl" )
+		{
+			_Pvt->_Textures[ EBDPrivate::BL ]->setTexture( value );
+		}
+		else
+		if( name == "tx_bm" )
+		{
+			_Pvt->_Textures[ EBDPrivate::BM ]->setTexture( value );
+		}
+		else
+		if( name == "tx_br" )
+		{
+			_Pvt->_Textures[ EBDPrivate::BR ]->setTexture( value );
+		}
+		else
+		if( name == "tx_l" )
+		{
+			_Pvt->_Textures[ EBDPrivate::L ]->setTexture( value );
+		}
+		else
+		if( name == "tx_r" )
+		{
+			_Pvt->_Textures[ EBDPrivate::R ]->setTexture( value );
+		}
+		else
+		if( name == "tx_bg" )
+		{
+			_Pvt->_Textures[ EBDPrivate::BG ]->setTexture( value );
+		}
+		else
+			CGroupEditBox::setProperty( name, value );
+	}
+
+	xmlNodePtr CGroupEditBoxDecor::serialize( xmlNodePtr parentNode, const char *type ) const
+	{
+		xmlNodePtr node = CGroupEditBox::serialize( parentNode, type );
+		if( node == NULL )
+			return NULL;
+
+		xmlSetProp( node, BAD_CAST "type", BAD_CAST "edit_box_decor" );
+		xmlSetProp( node, BAD_CAST "tx_tl", BAD_CAST _Pvt->_Textures[ EBDPrivate::TL ]->getTexture().c_str() );
+		xmlSetProp( node, BAD_CAST "tx_tr", BAD_CAST _Pvt->_Textures[ EBDPrivate::TR ]->getTexture().c_str() );
+		xmlSetProp( node, BAD_CAST "tx_tm", BAD_CAST _Pvt->_Textures[ EBDPrivate::TM ]->getTexture().c_str() );
+		xmlSetProp( node, BAD_CAST "tx_bl", BAD_CAST _Pvt->_Textures[ EBDPrivate::BL ]->getTexture().c_str() );
+		xmlSetProp( node, BAD_CAST "tx_bm", BAD_CAST _Pvt->_Textures[ EBDPrivate::BM ]->getTexture().c_str() );
+		xmlSetProp( node, BAD_CAST "tx_br", BAD_CAST _Pvt->_Textures[ EBDPrivate::BR ]->getTexture().c_str() );
+		xmlSetProp( node, BAD_CAST "tx_l", BAD_CAST _Pvt->_Textures[ EBDPrivate::L ]->getTexture().c_str() );
+		xmlSetProp( node, BAD_CAST "tx_r", BAD_CAST _Pvt->_Textures[ EBDPrivate::R ]->getTexture().c_str() );
+		xmlSetProp( node, BAD_CAST "tx_bg", BAD_CAST _Pvt->_Textures[ EBDPrivate::BG ]->getTexture().c_str() );
+
+		return node;
+	}
+
+	bool CGroupEditBoxDecor::parse( xmlNodePtr cur, CInterfaceGroup *parent )
+	{
+		if( !CGroupEditBox::parse( cur, parent ) )
+			return false;
+
+		CXMLAutoPtr prop;
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_tl" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::TL ]->setTexture( ( const char* )prop );
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_tm" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::TM ]->setTexture( ( const char* )prop );
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_tr" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::TR ]->setTexture( ( const char* )prop );
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_bl" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::BL ]->setTexture( ( const char* )prop );
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_bm" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::BM ]->setTexture( ( const char* )prop );
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_br" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::BR ]->setTexture( ( const char* )prop );
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_l" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::L ]->setTexture( ( const char* )prop );
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_r" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::R ]->setTexture( ( const char* )prop );
+
+		prop = ( char* ) xmlGetProp( cur, BAD_CAST "tx_bg" );
+		if( prop )
+			_Pvt->_Textures[ EBDPrivate::BG ]->setTexture( ( const char* )prop );
+
+		getVT()->setIdRecurse( "edit_text" );
+
+		return true;
+	}
+
+	void CGroupEditBoxDecor::draw()
+	{
+		CGroupEditBox::draw();
+
+		_Pvt->draw();
+	}
+
+	void CGroupEditBoxDecor::updateCoords()
+	{
+		sint32 tw = _Pvt->_Textures[ EBDPrivate::L ]->getWReal();
+		getVT()->setX( tw + 1 );
+
+		CGroupEditBox::updateCoords();
+		_Pvt->updateCoords();
+	}
+
+	void CGroupEditBoxDecor::forceLink()
+	{
+	}
+}
+
+
diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index 9f19f383a..656e36ca8 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -1217,7 +1217,7 @@ namespace NLGUI
 								normal = value[MY_HTML_INPUT_SRC];
 
 							// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
-							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name;
+							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name + "|submit_button_type=image";
 
 							// Add the ctrl button
 							addButton (CCtrlButton::PushButton, name, normal, pushed.empty()?normal:pushed, over,
@@ -1241,7 +1241,15 @@ namespace NLGUI
 								text = value[MY_HTML_INPUT_VALUE];
 
 							// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
-							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name;
+							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name + "|submit_button_type=submit";
+							if (text.size() > 0)
+							{
+								// escape AH param separator
+								string tmp = text;
+								while(NLMISC::strFindReplace(tmp, "|", "&#124;"))
+									;
+								param = param + "|submit_button_value=" + tmp;
+							}
 
 							// Add the ctrl button
 							if (!_Paragraph)
@@ -1289,16 +1297,19 @@ namespace NLGUI
 							string name;
 							ucstring ucValue;
 							uint size = 120;
+							uint maxlength = 1024;
 							if (present[MY_HTML_INPUT_NAME] && value[MY_HTML_INPUT_NAME])
 								name = value[MY_HTML_INPUT_NAME];
 							if (present[MY_HTML_INPUT_SIZE] && value[MY_HTML_INPUT_SIZE])
 								fromString(value[MY_HTML_INPUT_SIZE], size);
 							if (present[MY_HTML_INPUT_VALUE] && value[MY_HTML_INPUT_VALUE])
 								ucValue.fromUtf8(value[MY_HTML_INPUT_VALUE]);
+							if (present[MY_HTML_INPUT_MAXLENGTH] && value[MY_HTML_INPUT_MAXLENGTH])
+								fromString(value[MY_HTML_INPUT_MAXLENGTH], maxlength);
 
 							string textTemplate(!templateName.empty() ? templateName : DefaultFormTextGroup);
 							// Add the editbox
-							CInterfaceGroup *textArea = addTextArea (textTemplate, name.c_str (), 1, size/12, false, ucValue);
+							CInterfaceGroup *textArea = addTextArea (textTemplate, name.c_str (), 1, size/12, false, ucValue, maxlength);
 							if (textArea)
 							{
 								// Add the text area to the form
@@ -1450,6 +1461,8 @@ namespace NLGUI
 						getPercentage (table->ForceWidthMin, table->TableRatio, value[MY_HTML_TABLE_WIDTH]);
 					if (present[MY_HTML_TABLE_BORDER] && value[MY_HTML_TABLE_BORDER])
 						fromString(value[MY_HTML_TABLE_BORDER], table->Border);
+					if (present[MY_HTML_TABLE_BORDERCOLOR] && value[MY_HTML_TABLE_BORDERCOLOR])
+						table->BorderColor = getColor (value[MY_HTML_TABLE_BORDERCOLOR]);
 					if (present[MY_HTML_TABLE_CELLSPACING] && value[MY_HTML_TABLE_CELLSPACING])
 						fromString(value[MY_HTML_TABLE_CELLSPACING], table->CellSpacing);
 					if (present[MY_HTML_TABLE_CELLPADDING] && value[MY_HTML_TABLE_CELLPADDING])
@@ -1514,11 +1527,19 @@ namespace NLGUI
 									}
 								}
 							}
+
+							if (present[MY_HTML_TD_COLSPAN] && value[MY_HTML_TD_COLSPAN])
+								fromString(value[MY_HTML_TD_COLSPAN], _Cells.back()->ColSpan);
+							if (present[MY_HTML_TD_ROWSPAN] && value[MY_HTML_TD_ROWSPAN])
+								fromString(value[MY_HTML_TD_ROWSPAN], _Cells.back()->RowSpan);
+
 							_Cells.back()->BgColor = _CellParams.back().BgColor;
 							_Cells.back()->Align = _CellParams.back().Align;
 							_Cells.back()->VAlign = _CellParams.back().VAlign;
 							_Cells.back()->LeftMargin = _CellParams.back().LeftMargin;
 							_Cells.back()->NoWrap = _CellParams.back().NoWrap;
+							_Cells.back()->ColSpan = std::max(1, _Cells.back()->ColSpan);
+							_Cells.back()->RowSpan = std::max(1, _Cells.back()->RowSpan);
 
 							float temp;
 							if (present[MY_HTML_TD_WIDTH] && value[MY_HTML_TD_WIDTH])
@@ -1553,12 +1574,15 @@ namespace NLGUI
 					_TextAreaRow = 1;
 					_TextAreaCols = 10;
 					_TextAreaContent = "";
-					if (present[HTML_TEXTAREA_NAME] && value[HTML_TEXTAREA_NAME])
-						_TextAreaName = value[HTML_TEXTAREA_NAME];
-					if (present[HTML_TEXTAREA_ROWS] && value[HTML_TEXTAREA_ROWS])
-						fromString(value[HTML_TEXTAREA_ROWS], _TextAreaRow);
-					if (present[HTML_TEXTAREA_COLS] && value[HTML_TEXTAREA_COLS])
-						fromString(value[HTML_TEXTAREA_COLS], _TextAreaCols);
+					_TextAreaMaxLength = 1024;
+					if (present[MY_HTML_TEXTAREA_NAME] && value[MY_HTML_TEXTAREA_NAME])
+						_TextAreaName = value[MY_HTML_TEXTAREA_NAME];
+					if (present[MY_HTML_TEXTAREA_ROWS] && value[MY_HTML_TEXTAREA_ROWS])
+						fromString(value[MY_HTML_TEXTAREA_ROWS], _TextAreaRow);
+					if (present[MY_HTML_TEXTAREA_COLS] && value[MY_HTML_TEXTAREA_COLS])
+						fromString(value[MY_HTML_TEXTAREA_COLS], _TextAreaCols);
+					if (present[MY_HTML_TEXTAREA_MAXLENGTH] && value[MY_HTML_TEXTAREA_MAXLENGTH])
+						fromString(value[MY_HTML_TEXTAREA_MAXLENGTH], _TextAreaMaxLength);
 
 					_TextAreaTemplate = !templateName.empty() ? templateName : DefaultFormTextAreaGroup;
 					_TextArea = true;
@@ -1675,21 +1699,19 @@ namespace NLGUI
 				break;
 			case HTML_TEXTAREA:
 				{
-					// Add the editbox
-	// 				nlinfo("textarea temp '%s'", _TextAreaTemplate.c_str());
-	// 				nlinfo("textarea name '%s'", _TextAreaName.c_str());
-	// 				nlinfo("textarea %d %d", _TextAreaRow, _TextAreaCols);
-	// 				nlinfo("textarea content '%s'", _TextAreaContent.toUtf8().c_str());
-					CInterfaceGroup *textArea = addTextArea (_TextAreaTemplate, _TextAreaName.c_str (), _TextAreaRow, _TextAreaCols, true, _TextAreaContent);
-					if (textArea)
+					_TextArea = false;
+					if (!(_Forms.empty()))
 					{
-						// Add the text area to the form
-						CGroupHTML::CForm::CEntry entry;
-						entry.Name = _TextAreaName;
-						entry.TextArea = textArea;
-						_Forms.back().Entries.push_back (entry);
+						CInterfaceGroup *textArea = addTextArea (_TextAreaTemplate, _TextAreaName.c_str (), _TextAreaRow, _TextAreaCols, true, _TextAreaContent, _TextAreaMaxLength);
+						if (textArea)
+						{
+							// Add the text area to the form
+							CGroupHTML::CForm::CEntry entry;
+							entry.Name = _TextAreaName;
+							entry.TextArea = textArea;
+							_Forms.back().Entries.push_back (entry);
+						}
 					}
-					_TextArea = false;
 				}
 				break;
 			case HTML_TITLE:
@@ -3149,116 +3171,62 @@ namespace NLGUI
 	void CGroupHTML::addImage(const char *img, bool globalColor, bool reloadImg)
 	{
 		// In a paragraph ?
-		if (_Paragraph)
+		if (!_Paragraph)
 		{
-			string finalUrl;
+			newParagraph (0);
+			paragraphChange ();
+		}
+
+		string finalUrl;
 
+		// No more text in this text view
+		_CurrentViewLink = NULL;
+
+		// Not added ?
+		CViewBitmap *newImage = new CViewBitmap (TCtorParam());
+
+		//
+		// 1/ try to load the image with the old system (local files in bnp)
+		//
+		string image = CFile::getPath(img) + CFile::getFilenameWithoutExtension(img) + ".tga";
+		if (lookupLocalFile (finalUrl, image.c_str(), false))
+		{
+			newImage->setRenderLayer(getRenderLayer()+1);
+			image = finalUrl;
+		}
+		else
+		{
 			//
-			// 1/ try to load the image with the old system (local files in bnp)
+			// 2/ if it doesn't work, try to load the image in cache
 			//
-			string image = CFile::getPath(img) + CFile::getFilenameWithoutExtension(img) + ".tga";
-			if (lookupLocalFile (finalUrl, image.c_str(), false))
+			image = localImageName(img);
+			if (!reloadImg && lookupLocalFile (finalUrl, image.c_str(), false))
 			{
-				// No more text in this text view
-				_CurrentViewLink = NULL;
-
-				// Not added ?
-				CViewBitmap *newImage = new CViewBitmap (TCtorParam());
-				/* todo link in image
-				if (getA())
-				{
-					newImage->Link = getLink();
-					newImage->setHTMLView (this);
-				}*/
-				newImage->setRenderLayer(getRenderLayer()+1);
-				newImage->setTexture (finalUrl);
-				newImage->setModulateGlobalColor(globalColor);
-
-				/* todo link in image
-				if (getA())
-					getParagraph()->addChildLink(newImage);
-				else*/
-				getParagraph()->addChild(newImage);
-				paragraphChange ();
+				// don't display image that are not power of 2
+				uint32 w, h;
+				CBitmap::loadSize (image, w, h);
+				if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
+					image.clear();
 			}
 			else
 			{
 				//
-				// 2/ if it doesn't work, try to load the image in cache
+				// 3/ if it doesn't work, display a placeholder and ask to dl the image into the cache
 				//
-				image = localImageName(img);
-				if (!reloadImg && lookupLocalFile (finalUrl, image.c_str(), false))
-				{
-					// No more text in this text view
-					_CurrentViewLink = NULL;
-
-					// Not added ?
-					CViewBitmap *newImage = new CViewBitmap (TCtorParam());
-					/* todo link in image
-					if (getA())
-					{
-					newImage->Link = getLink();
-					newImage->setHTMLView (this);
-					}*/
-
-					// don't display image that are not power of 2
-					uint32 w, h;
-					CBitmap::loadSize (image, w, h);
-					if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
-						image.clear();
-
-					newImage->setTexture (image);
-	//				newImage->setTexture (finalUrl);
-					newImage->setModulateGlobalColor(globalColor);
-
-					/* todo link in image
-					if (getA())
-					getParagraph()->addChildLink(newImage);
-					else*/
-					getParagraph()->addChild(newImage);
-					paragraphChange ();
-				}
-				else
-				{
-
-					//
-					// 3/ if it doesn't work, display a placeholder and ask to dl the image into the cache
-					//
-					image = "web_del.tga";
-					if (lookupLocalFile (finalUrl, image.c_str(), false))
-					{
-						// No more text in this text view
-						_CurrentViewLink = NULL;
-
-						// Not added ?
-						CViewBitmap *newImage = new CViewBitmap (TCtorParam());
-						/* todo link in image
-						if (getA())
-						{
-						newImage->Link = getLink();
-						newImage->setHTMLView (this);
-						}*/
-						newImage->setTexture (image);
-						//				newImage->setTexture (finalUrl);
-						newImage->setModulateGlobalColor(globalColor);
-
-						addImageDownload(img, newImage);
-
-						/* todo link in image
-						if (getA())
-						getParagraph()->addChildLink(newImage);
-						else*/
-						getParagraph()->addChild(newImage);
-						paragraphChange ();
-					}
-				}
+				image = "web_del.tga";
+				addImageDownload(img, newImage);
 			}
 		}
+		newImage->setTexture (image);
+		newImage->setModulateGlobalColor(globalColor);
+
+		getParagraph()->addChild(newImage);
+		paragraphChange ();
 	}
 
 	// ***************************************************************************
 
-	CInterfaceGroup *CGroupHTML::addTextArea(const std::string &templateName, const char *name, uint /* rows */, uint cols, bool multiLine, const ucstring &content)
+	CInterfaceGroup *CGroupHTML::addTextArea(const std::string &templateName, const char *name, uint /* rows */, uint cols, bool multiLine, const ucstring &content, uint maxlength)
 	{
 		// In a paragraph ?
 		if (!_Paragraph)
@@ -3280,7 +3248,8 @@ namespace NLGUI
 			templateParams.push_back (std::pair<std::string,std::string> ("multiline", multiLine?"true":"false"));
 			templateParams.push_back (std::pair<std::string,std::string> ("want_return", multiLine?"true":"false"));
 			templateParams.push_back (std::pair<std::string,std::string> ("enter_recover_focus", "false"));
-			templateParams.push_back (std::pair<std::string,std::string> ("max_num_chars", "1024"));
+			if (maxlength > 0)
+				templateParams.push_back (std::pair<std::string,std::string> ("max_num_chars", toString(maxlength)));
 			CInterfaceGroup *textArea = CWidgetManager::getInstance()->getParser()->createGroupInstance (templateName.c_str(),
 				getParagraph()->getId(), templateParams.empty()?NULL:&(templateParams[0]), (uint)templateParams.size());
 
@@ -3677,14 +3646,18 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	void CGroupHTML::submitForm (uint formId, const char *submitButtonName)
+	void CGroupHTML::submitForm (uint formId, const char *submitButtonType, const char *submitButtonName, const char *submitButtonValue, sint32 x, sint32 y)
 	{
 		// Form id valid ?
 		if (formId < _Forms.size())
 		{
 			_PostNextTime = true;
 			_PostFormId = formId;
+			_PostFormSubmitType = submitButtonType;
 			_PostFormSubmitButton = submitButtonName;
+			_PostFormSubmitValue = submitButtonValue;
+			_PostFormSubmitX = x;
+			_PostFormSubmitY = y;
 		}
 	}
 
@@ -3957,9 +3930,22 @@ namespace NLGUI
 						}
 					}
 
-					// Add the button coordinates
-					HTParseFormInput(formfields, (_PostFormSubmitButton + "_x=0").c_str());
-					HTParseFormInput(formfields, (_PostFormSubmitButton + "_y=0").c_str());
+					if (_PostFormSubmitType == "image")
+					{
+						// Add the button coordinates
+						if (_PostFormSubmitButton.find_first_of("[") == string::npos)
+						{
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "_x=" + NLMISC::toString(_PostFormSubmitX)).c_str());
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "_y=" + NLMISC::toString(_PostFormSubmitY)).c_str());
+						}
+						else
+						{
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + NLMISC::toString(_PostFormSubmitX)).c_str());
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + NLMISC::toString(_PostFormSubmitY)).c_str());
+						}
+					}
+					else
+						HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + _PostFormSubmitValue).c_str());
 
 					// Add custom params
 					addHTTPPostParams(formfields, _TrustedDomain);
diff --git a/code/nel/src/gui/group_menu.cpp b/code/nel/src/gui/group_menu.cpp
index 85ed1959e..ddd022310 100644
--- a/code/nel/src/gui/group_menu.cpp
+++ b/code/nel/src/gui/group_menu.cpp
@@ -1203,6 +1203,7 @@ namespace NLGUI
 		pV->setColor (_GroupMenu->_Color);
 		pV->setFontSize (_GroupMenu->_FontSize);
 		pV->setShadow (_GroupMenu->_Shadow);
+		pV->setShadowOutline (_GroupMenu->_ShadowOutline);
 		pV->setCheckable(checkable);
 		pV->setChecked(checked);
 		pV->setModulateGlobalColor(_GroupMenu->_ModulateGlobalColor);
@@ -1282,6 +1283,7 @@ namespace NLGUI
 		pV->setColor (_GroupMenu->_Color);
 		pV->setFontSize (_GroupMenu->_FontSize);
 		pV->setShadow (_GroupMenu->_Shadow);
+		pV->setShadowOutline (_GroupMenu->_ShadowOutline);
 		pV->setCheckable(checkable);
 		pV->setChecked(checked);
 		pV->setModulateGlobalColor(_GroupMenu->_ModulateGlobalColor);
@@ -1922,6 +1924,7 @@ namespace NLGUI
 		_HighLightOver.set(128, 0, 0, 255);
 		_FontSize = 12;
 		_Shadow = false;
+		_ShadowOutline = false;
 		_ResizeFromChildH = _ResizeFromChildW = true;
 		_DisplayFrame = false;
 		_RootMenu = NULL;
@@ -1998,6 +2001,11 @@ namespace NLGUI
 			return toString( _Shadow );
 		}
 		else
+		if( name == "shadow_outline" )
+		{
+			return toString( _ShadowOutline );
+		}
+		else
 		if( name == "formatted" )
 		{
 			return toString( _Formatted );
@@ -2110,6 +2118,14 @@ namespace NLGUI
 			return;
 		}
 		else
+		if( name == "shadow_outline" )
+		{
+			bool b;
+			if( fromString( value, b ) )
+				_ShadowOutline = b;
+			return;
+		}
+		else
 		if( name == "formatted" )
 		{
 			bool b;
@@ -2152,6 +2168,7 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "space", BAD_CAST toString( _Space ).c_str() );
 		xmlSetProp( node, BAD_CAST "fontsize", BAD_CAST toString( _FontSize ).c_str() );
 		xmlSetProp( node, BAD_CAST "shadow", BAD_CAST toString( _Shadow ).c_str() );
+		xmlSetProp( node, BAD_CAST "shadow_outline", BAD_CAST toString( _ShadowOutline ).c_str() );
 		xmlSetProp( node, BAD_CAST "formatted", BAD_CAST toString( _Formatted ).c_str() );
 		
 		if( _RootMenu == NULL )
@@ -2183,7 +2200,7 @@ namespace NLGUI
 			if( editorMode )
 				_Extends = std::string( (const char*)prop );
 
-			CGroupMenu *gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId(prop));
+			CGroupMenu *gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId(prop.str()));
 			if (!gm)
 			{
 				gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId("ui:interface:" + std::string((const char*)prop)));
@@ -2197,6 +2214,7 @@ namespace NLGUI
 				_Color = gm->_Color;
 				_ShadowColor = gm->_ShadowColor;
 				_Shadow = gm->_Shadow;
+				_ShadowOutline = gm->_ShadowOutline;
 				_FontSize = gm->_FontSize;
 				_ColorOver = gm->_ColorOver;
 				_ShadowColorOver = gm->_ShadowColorOver;
@@ -2266,6 +2284,10 @@ namespace NLGUI
 		if (prop)
 			_Shadow = convertBool(prop);
 
+		prop = (char*) xmlGetProp( in,  (xmlChar*)"shadow_outline" );
+		if (prop)
+			_ShadowOutline = convertBool(prop);
+
 		prop = (char*) xmlGetProp( in,  (xmlChar*)"formatted" );
 		if (prop)
 			_Formatted = convertBool(prop);
diff --git a/code/nel/src/gui/group_table.cpp b/code/nel/src/gui/group_table.cpp
index 2fdd7e364..65ed2d93d 100644
--- a/code/nel/src/gui/group_table.cpp
+++ b/code/nel/src/gui/group_table.cpp
@@ -44,9 +44,12 @@ namespace NLGUI
 		TableRatio = 0.f;
 		WidthWanted = 0;
 		Height = 0;
+		ColSpan = 1;
+		RowSpan = 1;
+		TableColumnIndex = 0;
 		Group = new CInterfaceGroup(CViewBase::TCtorParam());
 		Align = Left;
-		VAlign = Top;
+		VAlign = Middle;
 		LeftMargin = 0;
 		NoWrap = false;
 		IgnoreMaxWidth = false;
@@ -249,6 +252,22 @@ namespace NLGUI
 				AddChildW = b;
 			return;
 		}
+		else
+		if (name == "colspan" )
+		{
+			sint32 i;
+			if (fromString( value, i ) )
+				ColSpan = std::max(1, i);
+			return;
+		}
+		else
+		if (name == "rowspan" )
+		{
+			sint32 i;
+			if (fromString( value, i ) )
+				RowSpan = std::max(1, i);
+			return;
+		}
 		else
 			CInterfaceGroup::setProperty( name, value );
 	}
@@ -310,6 +329,8 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "ignore_max_width", BAD_CAST toString( IgnoreMaxWidth ).c_str() );
 		xmlSetProp( node, BAD_CAST "ignore_min_width", BAD_CAST toString( IgnoreMinWidth ).c_str() );
 		xmlSetProp( node, BAD_CAST "add_child_w", BAD_CAST toString( AddChildW ).c_str() );
+		xmlSetProp( node, BAD_CAST "colspan", BAD_CAST toString( ColSpan ).c_str() );
+		xmlSetProp( node, BAD_CAST "rowspan", BAD_CAST toString( RowSpan ).c_str() );
 
 		return node;
 	}
@@ -422,6 +443,22 @@ namespace NLGUI
 		{
 			AddChildW = convertBool(ptr);
 		}
+		//
+		ptr = (char*) xmlGetProp( cur, (xmlChar*)"colspan" );
+		if (ptr)
+		{
+			sint32 i;
+			if (fromString((const char*)ptr, i))
+				ColSpan = std::max(1, i);
+		}
+		//
+		ptr = (char*) xmlGetProp( cur, (xmlChar*)"rowspan" );
+		if (ptr)
+		{
+			sint32 i;
+			if (fromString((const char*)ptr, i))
+				RowSpan = std::max(1, i);
+		}
 
 		return true;
 	}
@@ -499,6 +536,29 @@ namespace NLGUI
 			}
 		}
 
+		// Get the parent table
+		if (getParent ())
+		{
+			CGroupTable *table = static_cast<CGroupTable*> (getParent ());
+			if (table->Border) {
+				CRGBA lighter = blend(table->BorderColor, CRGBA::White, 0.5f);
+
+				CRGBA borderColorTL;
+				borderColorTL.modulateFromColor (lighter, CWidgetManager::getInstance()->getGlobalColor());
+				borderColorTL.A = (uint8) (((uint16) table->CurrentAlpha * (uint16) borderColorTL.A) >> 8);
+
+				CRGBA borderColorBR;
+				borderColorBR.modulateFromColor (table->BorderColor, CWidgetManager::getInstance()->getGlobalColor());
+				borderColorBR.A = (uint8) (((uint16) table->CurrentAlpha * (uint16) borderColorBR.A) >> 8);
+
+				CViewRenderer &rVR = *CViewRenderer::getInstance();
+				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, 1, 0, false, rVR.getBlankTextureId(), borderColorTL );
+				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, 1, _HReal, 0, false, rVR.getBlankTextureId(), borderColorBR );
+				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal+_HReal-1, _WReal, 1, 0, false, rVR.getBlankTextureId(), borderColorBR );
+				rVR.drawRotFlipBitmap (_RenderLayer, _XReal+_WReal-1, _YReal, 1, _HReal, 0, false, rVR.getBlankTextureId(), borderColorTL );
+			}
+		}
+
 		CInterfaceGroup::draw ();
 	}
 
@@ -559,8 +619,9 @@ namespace NLGUI
 		TableRatio = 0.f;
 		ForceWidthMin = 0;
 		Border=0;
-		CellPadding=0;
-		CellSpacing=0;
+		BorderColor = CRGBA(32, 32, 32, 255);
+		CellPadding=1;
+		CellSpacing=2;
 		ContinuousUpdate = false;
 	}
 
@@ -692,35 +753,75 @@ namespace NLGUI
 
 					// New cell ?
 					if (cell->NewLine)
+					{
+						while (column < _Columns.size())
+						{
+							if (_Columns[column].RowSpan > 1)
+								_Columns[column].RowSpan--;
+							column++;
+						}
 						column = 0;
+					}
 
 					// Resize the array
 					if (column>=_Columns.size())
 						_Columns.resize(column+1);
 
+					// Handle rowspan from previous row
+					while (_Columns[column].RowSpan > 1)
+					{
+						_Columns[column].RowSpan--;
+						column++;
+						// if previous row had less <TD> elements, then we missing columns
+						if (column>=_Columns.size())
+							_Columns.resize(column+1);
+					}
+
+					// remember column index for later use
+					cell->TableColumnIndex = column;
+
+					// new column, set rowspan from current <TD>
+					_Columns[column].RowSpan = cell->RowSpan;
+					float colspan = 1.f / cell->ColSpan;
+					float rowspan = 1.f / cell->RowSpan;
+
 					// Update sizes
-					if (cellWidth > _Columns[column].Width)
-						_Columns[column].Width = cellWidth;
-					if (cell->WidthMax > _Columns[column].WidthMax)
-						_Columns[column].WidthMax = cell->WidthMax;
-					if (cell->TableRatio > _Columns[column].TableRatio)
-						_Columns[column].TableRatio = cell->TableRatio;
-					if (cell->WidthWanted + additionnalWidth > _Columns[column].WidthWanted)
-						_Columns[column].WidthWanted = cell->WidthWanted + additionnalWidth;
-					if (cell->Height > _Columns[column].Height)
-						_Columns[column].Height = cell->Height;
+					if (cellWidth*colspan > _Columns[column].Width)
+						_Columns[column].Width = cellWidth*colspan;
+					if (cell->WidthMax*colspan > _Columns[column].WidthMax)
+						_Columns[column].WidthMax = cell->WidthMax*colspan;
+					if (cell->TableRatio*colspan > _Columns[column].TableRatio)
+						_Columns[column].TableRatio = cell->TableRatio*colspan;
+					if (cell->WidthWanted*colspan + additionnalWidth > _Columns[column].WidthWanted)
+						_Columns[column].WidthWanted = (sint32)(cell->WidthWanted*colspan) + additionnalWidth;
 
 					if (_Columns[column].WidthWanted + additionnalWidth)
 						_Columns[column].WidthMax = _Columns[column].WidthWanted + additionnalWidth;
 					if (_Columns[column].WidthWanted > _Columns[column].Width)
 						_Columns[column].Width = _Columns[column].WidthWanted;
 
+					if (cell->ColSpan > 1) {
+						// copy this info to all spanned columns, create new columns as needed
+						uint newsize = column + cell->ColSpan - 1;
+						if (newsize >= _Columns.size())
+							_Columns.resize(newsize+1);
+						for(uint span = 0; span < cell->ColSpan -1; span++){
+							column++;
+							_Columns[column].Width = _Columns[column-1].Width;
+							_Columns[column].WidthMax = _Columns[column-1].WidthMax;
+							_Columns[column].TableRatio = _Columns[column-1].TableRatio;
+							_Columns[column].WidthWanted = _Columns[column-1].WidthWanted;
+							_Columns[column].RowSpan = _Columns[column-1].RowSpan;
+						}
+					}
+
 					// Next column
 					column++;
 				}
 
 				// Width of cells and table borders
-				sint32 borderWidth = 2*Border + ((sint32)_Columns.size()+1) * CellSpacing + ((sint32)_Columns.size()*2) * CellPadding;
+				sint32 padding = CellPadding + (Border ? 1 : 0);
+				sint32 borderWidth = 2*Border + ((sint32)_Columns.size()+1) * CellSpacing + ((sint32)_Columns.size()*2) * padding;
 
 				// Get the width
 				sint32 tableWidthMax = ForceWidthMin?ForceWidthMin:_LastParentW; // getWReal();
@@ -802,7 +903,6 @@ namespace NLGUI
 
 					// Some space ?
 					space = finalWidth - tableWidth;
-
 					if (space > 0)
 					{
 						// Then add in wanted Width cells
@@ -892,6 +992,18 @@ namespace NLGUI
 											}
 										}
 									}
+
+									// If there is still space left, then sum up column widths
+									// and add all the remaining space to final column.
+									if (space > 0)
+									{
+										sint32 innerWidth = 0;
+										for(i=0;i<_Columns.size();i++)
+											innerWidth += _Columns[i].Width;
+
+										if (innerWidth > 0 && finalWidth > innerWidth)
+											_Columns[_Columns.size()-1].Width += finalWidth - innerWidth;
+									}
 								}
 							}
 						}
@@ -902,7 +1014,8 @@ namespace NLGUI
 
 				column = 0;
 				sint32 row = 0;
-				sint32 currentX = Border + CellSpacing + CellPadding;
+				sint32 currentX = Border + CellSpacing + padding;
+
 				_Rows.clear ();
 				for (i=0; i<_Cells.size(); i++)
 				{
@@ -911,25 +1024,41 @@ namespace NLGUI
 					if (cell->NewLine)
 					{
 						column = 0;
-						currentX = Border + CellSpacing + CellPadding;
+						currentX = Border + CellSpacing + padding;
+
 						_Rows.push_back(CRow());
 					}
 
+					if (cell->TableColumnIndex > 0)
+					{
+						// we have active rowspan, must add up 'skipped' columns
+						for( ; column<cell->TableColumnIndex; column++)
+							currentX += _Columns[column].Width + padding*2 + CellSpacing;
+					}
+
 					// Set the x and width
 
 					// Check align
 					sint32 alignmentX = 0;
 					sint32 widthReduceX = 0;
-					if (cell->WidthMax < _Columns[column].Width)
+					sint32 columnWidth = _Columns[column].Width;
+					if (cell->ColSpan > 1)
+					{
+						// scan ahead and add up column widths as they might be different
+						for(int j = 1; j<cell->ColSpan; j++)
+							columnWidth += CellSpacing + padding*2 +  _Columns[column+j].Width;
+					}
+
+					if (cell->WidthMax < columnWidth)
 					{
 						switch (cell->Align)
 						{
 						case CGroupCell::Center:
-							alignmentX = (_Columns[column].Width - cell->WidthMax) / 2;
+							alignmentX = (columnWidth - cell->WidthMax) / 2;
 							widthReduceX = alignmentX * 2;
 							break;
 						case CGroupCell::Right:
-							alignmentX = _Columns[column].Width - cell->WidthMax;
+							alignmentX = columnWidth - cell->WidthMax;
 							widthReduceX = alignmentX;
 							break;
 						default:
@@ -937,11 +1066,11 @@ namespace NLGUI
 						}
 					}
 
-					cell->setX(currentX);
-					cell->setW(_Columns[column].Width);
+					cell->setX(currentX - padding);
+					cell->setW(columnWidth + padding*2);
 
-					cell->Group->setX(alignmentX+cell->LeftMargin);
-					cell->Group->setW(_Columns[column].Width - widthReduceX);
+					cell->Group->setX(alignmentX + cell->LeftMargin + padding);
+					cell->Group->setW(columnWidth - widthReduceX);
 					cell->Group->CInterfaceElement::updateCoords();
 
 					// Update coords to get H
@@ -949,16 +1078,17 @@ namespace NLGUI
 					cell->Group->updateCoords();
 
 					// Resize the row array
-					_Rows.back().Height = std::max(cell->Height, std::max(_Rows.back().Height, (sint32)cell->Group->getH()));
+					float rowspan = 1 / cell->RowSpan;
+					_Rows.back().Height = std::max((sint32)(cell->Height*rowspan), std::max(_Rows.back().Height, (sint32)(cell->Group->getH()*rowspan)));
 
 					// Next column
-					currentX += _Columns[column].Width + 2*CellPadding + CellSpacing;
-					column ++;
+					currentX += columnWidth + 2*padding + CellSpacing;
+					column += cell->ColSpan;
 				}
 
 				// Set cell Y
 				row = 0;
-				sint32 currentY = -(Border + CellSpacing + CellPadding);
+				sint32 currentY = -(Border + CellSpacing + padding);
 				for (i=0; i<_Cells.size(); i++)
 				{
 					// New cell ?
@@ -967,37 +1097,45 @@ namespace NLGUI
 					{
 						if (_Rows[row].Height != 0)
 						{
-							currentY -= _Rows[row].Height + 2*CellPadding + CellSpacing;
+							currentY -= _Rows[row].Height + 2*padding + CellSpacing;
 						}
 						row++;
 					}
 
 					// Check align
 					sint32 alignmentY = 0;
-					if ((sint32)cell->Group->getH() < _Rows[row].Height)
+					sint32 rowHeight = _Rows[row].Height;
+					if (cell->RowSpan > 1)
+					{
+						// we need to scan down and add up row heights
+						int k = std::min((sint32)_Rows.size(), row + cell->RowSpan);
+						for(int j=row+1; j<k; j++)
+							rowHeight += CellSpacing + padding*2 + _Rows[j].Height;
+					}
+					if ((sint32)cell->Group->getH() < rowHeight)
 					{
 						switch (cell->VAlign)
 						{
 						case CGroupCell::Middle:
-							alignmentY = (_Rows[row].Height - (sint32)cell->Group->getH()) / 2;
+							alignmentY = (rowHeight - (sint32)cell->Group->getH()) / 2;
 							break;
 						case CGroupCell::Bottom:
-							alignmentY = _Rows[row].Height - (sint32)cell->Group->getH();
+							alignmentY = rowHeight - (sint32)cell->Group->getH();
 							break;
 						default:
 							break;
 						}
 					}
 
-					cell->setY(currentY);
-					cell->setH (_Rows[row].Height);
-					cell->Group->setY(-alignmentY);
+					cell->setY(currentY + padding);
+					cell->setH (rowHeight + 2*padding);
+					cell->Group->setY(-(alignmentY + padding));
 				}
 
 				// Resize the table
 				setW(finalWidth+borderWidth-_LastParentW);
 				if (!_Rows.empty())
-					currentY -= _Rows[row].Height + CellPadding + CellSpacing + Border;
+					currentY -= _Rows[row].Height + padding + CellSpacing + Border;
 				setH(-currentY);
 
 				// All done
@@ -1177,60 +1315,66 @@ namespace NLGUI
 		if (gr == NULL)
 			CurrentAlpha = 255;
 
-		if (!_Columns.empty() && !_Rows.empty() && BgColor.A)
+		if (!_Columns.empty() && !_Rows.empty())
 		{
-			sint32 border = Border + CellSpacing + CellPadding;
-			if (border)
+			sint32 border = Border + CellSpacing;
+			if (border && BgColor.A)
 			{
 				CRGBA finalColor;
 				finalColor.modulateFromColor (BgColor, CWidgetManager::getInstance()->getGlobalColor());
 				finalColor.A = CurrentAlpha;
 
-				// Draw the top and bottom lines
+				// Draw the top line
 				CViewRenderer &rVR = *CViewRenderer::getInstance();
-				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, border, 0, false, rVR.getBlankTextureId(), finalColor);
 				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal-border+_HReal, _WReal, border, 0, false, rVR.getBlankTextureId(), finalColor);
 
-				// Draw the left and right lines
-				sint32 insideHeight = std::max((sint32)0, (sint32)_HReal - (sint32)2*border);
-				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal+border, border, insideHeight, 0, false, rVR.getBlankTextureId(), finalColor);
-				rVR.drawRotFlipBitmap (_RenderLayer, _XReal+_WReal-border, _YReal+border, border, insideHeight, 0, false, rVR.getBlankTextureId(), finalColor);
+				// Draw the left line
+				sint32 insideHeight = std::max((sint32)0, (sint32)_HReal - (sint32)border);
+				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, border, insideHeight, 0, false, rVR.getBlankTextureId(), finalColor);
 
 				// Draw the inside borders
-				sint32 insideWidth = 2*CellPadding + CellSpacing;
-				if (insideWidth)
+				if (CellSpacing)
 				{
-					// Draw the inside verticals
 					uint i;
-					sint32 x = _XReal + _Columns[0].Width + border;
-					for (i=1; i<_Columns.size(); i++)
+					sint32 x, y;
+					for (i=0; i<_Cells.size(); i++)
 					{
-						rVR.drawRotFlipBitmap (_RenderLayer, x, _YReal+border, insideWidth, insideHeight, 0, false, rVR.getBlankTextureId(), finalColor);
-						x += _Columns[i].Width + insideWidth;
+						CGroupCell *cell = _Cells[i];
+
+						x = cell->getXReal();
+						y = cell->getYReal() - CellSpacing;
+						// right
+						rVR.drawRotFlipBitmap (_RenderLayer, x + cell->getW(), y, CellSpacing, cell->getH() + CellSpacing, 0, false, rVR.getBlankTextureId(), finalColor);
+						// bottom
+						rVR.drawRotFlipBitmap (_RenderLayer, x, y, cell->getW(), CellSpacing, 0, false, rVR.getBlankTextureId(), finalColor);
 					}
+				}
 
-					// Draw the inside horizontals
-					sint32 y = _YReal + _HReal - border - _Rows[0].Height;
-					if (_Rows[0].Height != 0)
-					{
-						y -= insideWidth;
-					}
-					for (i=1; i<_Rows.size(); i++)
-					{
-						uint j;
-						x = _XReal + border;
-						if (_Rows[i].Height != 0)
-						{
-							for (j=0; j<_Columns.size(); j++)
-							{
-								rVR.drawRotFlipBitmap (_RenderLayer, x, y, _Columns[j].Width, insideWidth, 0, false, rVR.getBlankTextureId(), finalColor);
-								x += _Columns[j].Width + insideWidth;
-							}
-							y -= _Rows[i].Height+ insideWidth;
-						}
-					}
+			}
+			if (Border)
+			{
+				CViewRenderer &rVR = *CViewRenderer::getInstance();
+
+				CRGBA borderColorTL;
+				CRGBA lighter = blend(BorderColor, CRGBA::White, 0.5f);
+				borderColorTL.modulateFromColor (lighter, CWidgetManager::getInstance()->getGlobalColor());
+				borderColorTL.A = CurrentAlpha;
+
+				CRGBA borderColorBR;
+				borderColorBR.modulateFromColor (BorderColor, CWidgetManager::getInstance()->getGlobalColor());
+				borderColorBR.A = CurrentAlpha;
+
+				// beveled table border
+				for (sint32 i=0; i<Border; i++)
+				{
+					// bottom, left, top, right
+					rVR.drawRotFlipBitmap (_RenderLayer, _XReal+i, _YReal+i, _WReal-i*2, 1, 0, false, rVR.getBlankTextureId(), borderColorBR);
+					rVR.drawRotFlipBitmap (_RenderLayer, _XReal+i, _YReal+i, 1, _HReal-i*2, 0, false, rVR.getBlankTextureId(), borderColorTL);
+					rVR.drawRotFlipBitmap (_RenderLayer, _XReal+i, _YReal+_HReal-i-1, _WReal-i*2, 1, 0, false, rVR.getBlankTextureId(), borderColorTL);
+					rVR.drawRotFlipBitmap (_RenderLayer, _XReal+_WReal-i-1, _YReal+i, 1, _HReal-i*2, 0, false, rVR.getBlankTextureId(), borderColorBR);
 				}
 			}
+
 		}
 
 		CInterfaceGroup::draw ();
@@ -1243,6 +1387,11 @@ namespace NLGUI
 			return toString( Border );
 		}
 		else
+		if( name == "bordercolor" )
+		{
+			return toString( BorderColor );
+		}
+		else
 		if( name == "cellpadding" )
 		{
 			return toString( CellPadding );
@@ -1279,6 +1428,14 @@ namespace NLGUI
 			return;
 		}
 		else
+		if( name == "bordercolor" )
+		{
+			CRGBA c;
+			if( fromString( value, c ) )
+				BorderColor = c;
+			return;
+		}
+		else
 		if( name == "cellpadding" )
 		{
 			sint32 i;
@@ -1321,6 +1478,7 @@ namespace NLGUI
 
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "table" );
 		xmlSetProp( node, BAD_CAST "border", BAD_CAST toString( Border ).c_str() );
+		xmlSetProp( node, BAD_CAST "bordercolor", BAD_CAST toString( BorderColor ).c_str() );
 		xmlSetProp( node, BAD_CAST "cellpadding", BAD_CAST toString( CellPadding ).c_str() );
 		xmlSetProp( node, BAD_CAST "cellspacing", BAD_CAST toString( CellSpacing ).c_str() );
 		xmlSetProp( node, BAD_CAST "bgcolor", BAD_CAST toString( BgColor ).c_str() );
@@ -1345,6 +1503,12 @@ namespace NLGUI
 			fromString((const char*)ptr, Border);
 		}
 		//
+		ptr = (char*) xmlGetProp( cur, (xmlChar*)"bordercolor" );
+		if (ptr)
+		{
+			BorderColor = convertColor((const char*)ptr);
+		}
+		//
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"cellpadding" );
 		if (ptr)
 		{
diff --git a/code/nel/src/gui/interface_anim.cpp b/code/nel/src/gui/interface_anim.cpp
index 627a93280..693e63f09 100644
--- a/code/nel/src/gui/interface_anim.cpp
+++ b/code/nel/src/gui/interface_anim.cpp
@@ -74,7 +74,7 @@ namespace NLGUI
 		}
 
 		//
-		if (!CInterfaceLink::splitLinkTargets (ptr, parentGroup, _Targets))
+		if (!CInterfaceLink::splitLinkTargets (ptr.str(), parentGroup, _Targets))
 		{
 			nlwarning ("no target for track");
 			return false;
diff --git a/code/nel/src/gui/interface_element.cpp b/code/nel/src/gui/interface_element.cpp
index 0225d2797..66eee038e 100644
--- a/code/nel/src/gui/interface_element.cpp
+++ b/code/nel/src/gui/interface_element.cpp
@@ -147,12 +147,16 @@ namespace NLGUI
 		}
 		if( name == "posparent" )
 		{
-			return CWidgetManager::getInstance()->getParser()->getParentPosAssociation( (CInterfaceElement*)this );
+			std::string pp;
+			getPosParent( pp );
+			return pp;
 		}
 		else
 		if( name == "sizeparent" )
 		{
-			return CWidgetManager::getInstance()->getParser()->getParentSizeAssociation( (CInterfaceElement*)this );
+			std::string sp;
+			getSizeParent( sp );
+			return sp;
 		}
 		else
 		if( name == "global_color" )
@@ -226,13 +230,13 @@ namespace NLGUI
 		else
 		if( name == "posref" )
 		{
-			convertHotSpot( value.c_str() );
+			_PosRef = convertHotSpot( value.c_str() );
 			return;
 		}
 		else
 		if( name == "parentposref" )
 		{
-			convertHotSpot( value.c_str() );
+			_ParentPosRef = convertHotSpot( value.c_str() );
 		}
 		else
 		if( name == "sizeref" )
@@ -294,11 +298,13 @@ namespace NLGUI
 		xmlNewProp( node, BAD_CAST "w", BAD_CAST toString( _W ).c_str() );
 		xmlNewProp( node, BAD_CAST "h", BAD_CAST toString( _H ).c_str() );
 		xmlNewProp( node, BAD_CAST "posref", BAD_CAST HotSpotCoupleToString( _ParentPosRef, _PosRef ).c_str() );
-		xmlNewProp( node, BAD_CAST "posparent",
-			BAD_CAST CWidgetManager::getInstance()->getParser()->getParentPosAssociation( (CInterfaceElement*)this ).c_str() );
+		
+		std::string pp;
+		getPosParent( pp );
+		xmlNewProp( node, BAD_CAST "posparent", BAD_CAST pp.c_str() );
 		xmlNewProp( node, BAD_CAST "sizeref", BAD_CAST getSizeRefAsString().c_str() );
-		xmlNewProp( node, BAD_CAST "sizeparent",
-			BAD_CAST CWidgetManager::getInstance()->getParser()->getParentSizeAssociation( (CInterfaceElement*)this ).c_str() );
+		getSizeParent( pp );
+		xmlNewProp( node, BAD_CAST "sizeparent", BAD_CAST pp.c_str() );
 
 		xmlNewProp( node, BAD_CAST "global_color", BAD_CAST toString( _ModulateGlobalColor ).c_str() );
 		xmlNewProp( node, BAD_CAST "render_layer", BAD_CAST toString( _RenderLayer ).c_str() );
@@ -382,13 +388,13 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"posparent" );
 		if (ptr)
 		{
-			setPosParent( std::string( (const char*)ptr ) );
+			parsePosParent( (const char*)ptr );
 		}
 
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"sizeparent" );
 		if (ptr)
 		{
-			setSizeParent( std::string( (const char*)ptr ) );
+			parseSizeParent( (const char*)ptr );
 		}
 
 		ptr = (char*) xmlGetProp (cur, (xmlChar*)"sizeref");
@@ -1526,42 +1532,170 @@ namespace NLGUI
 		return false;
 	}
 
+	void CInterfaceElement::parsePosParent( const std::string &id )
+	{
+		CInterfaceElement *p = getParent();
+
+		if( ( id == "parent" ) || ( id.empty() ) )
+		{
+			setParentPos( p );
+			return;
+		}
+
+		std::string ppId;
+
+		if( p != NULL )
+			ppId = p->getId() + ":" + id;
+		else
+			ppId = std::string( "ui:" ) + id;
+
+		CWidgetManager::getInstance()->getParser()->addParentPositionAssociation( this, ppId );
+	}
+
 	void CInterfaceElement::setPosParent( const std::string &id )
 	{
-		std::string Id = stripId( id );
+		// Parent or empty id simply means the group parent
+		if( ( id == "parent" ) || ( id.empty() ) )
+		{
+			setParentPos( getParent() );
+			return;
+		}
 
-		if( Id != "parent" )
+		CInterfaceElement *pp = NULL;
+
+		// Check if it's a short Id
+		std::string::size_type idx = id.find( "ui:" );
+		if( idx == std::string::npos )
 		{
-			std::string idParent;
-			if( _Parent != NULL )
-				idParent = _Parent->getId() + ":";
-			else
-				idParent = "ui:";
-			CWidgetManager::getInstance()->getParser()->addParentPositionAssociation( this, idParent + Id );
+			// If it is, find the widget in the parent group and set as posparent
+			CInterfaceGroup *p = getParent();
+			if( p != NULL )
+			{
+				pp = p->findFromShortId( id );
+			}
+		}
+		else
+		{
+			// If it is not, find using the widgetmanager
+			// TODO: refactor, shouldn't use a singleton
+			pp = CWidgetManager::getInstance()->getElementFromId( id );
 		}
+
+		if( pp != NULL )
+			setParentPos( pp );
+
 	}
 
-	void CInterfaceElement::setSizeParent( const std::string &id )
+	void CInterfaceElement::getPosParent( std::string &id ) const
 	{
-		std::string Id = stripId( id );
-		std::string idParent;
 
-		if( Id != "parent" )
+		// If there's no pos parent set, then the parent group is the pos parent
+		if( getParentPos() == NULL )
 		{
-			if( _Parent != NULL )
-				idParent = _Parent->getId() + ":";
-			else
-				idParent = "ui:";
-			CWidgetManager::getInstance()->getParser()->addParentSizeAssociation( this, idParent + Id );
+			id = "parent";
+			return;
 		}
+
+		// If pos parent and parent are the same then ofc the parent group is the pos parent...
+		CInterfaceElement *p = getParent();
+		if( getParentPos() == p )
+		{
+			id = "parent";
+			return;
+		}
+
+		// If parent is in the same group, use the short id
+		p = getParentPos();
+		if( p->isInGroup( getParent() ) )
+		{
+			id = p->getShortId();
+			return;
+		}
+
+		// Otherwise use the full id
+		id = p->getId();
+	}
+
+	void CInterfaceElement::parseSizeParent( const std::string &id )
+	{
+		CInterfaceElement *p = getParent();
+
+		if( ( id == "parent" ) || ( id.empty() ) )
+		{
+			setParentSize( p );
+			return;
+		}
+
+		std::string spId;
+
+		if( p != NULL )
+			spId = p->getId() + ":" + id;
 		else
+			spId = std::string( "ui:" ) + id;
+
+		CWidgetManager::getInstance()->getParser()->addParentSizeAssociation( this, spId );
+	}
+
+	void CInterfaceElement::setSizeParent( const std::string &id )
+	{
+		// Parent or empty id simply means the group parent
+		if( ( id == "parent" ) || ( id.empty() ) )
 		{
-			if( _Parent != NULL )
+			setParentSize( getParent() );
+			return;
+		}
+
+		CInterfaceElement *pp = NULL;
+
+		// Check if it's a short Id
+		std::string::size_type idx = id.find( "ui:" );
+		if( idx == std::string::npos )
+		{
+			// If it is, find the widget in the parent group and set as posparent
+			CInterfaceGroup *p = getParent();
+			if( p != NULL )
 			{
-				idParent = _Parent->getId();
-				CWidgetManager::getInstance()->getParser()->addParentSizeAssociation( this, idParent );
+				pp = p->findFromShortId( id );
 			}
 		}
+		else
+		{
+			// If it is not, find using the widgetmanager
+			// TODO: refactor, shouldn't use a singleton
+			pp = CWidgetManager::getInstance()->getElementFromId( id );
+		}
+
+		if( pp != NULL )
+			setParentSize( pp );
+	}
+
+	void CInterfaceElement::getSizeParent( std::string &id ) const
+	{
+		CInterfaceElement *p = getParentSize();
+
+		// If there's no parent set then the size parent is the parent
+		if( p == NULL )
+		{
+			id = "parent";
+			return;
+		}
+
+		// If the size parent is the same as the group parent, then the size parent is the parent ofc
+		if( p == getParent() )
+		{
+			id = "parent";
+			return;
+		}
+
+		// If the size parent is in the parent group, use the short Id
+		if( p->isInGroup( getParent() ) )
+		{
+			id = p->getShortId();
+			return;
+		}
+
+		// Otherwise use the full Id
+		id = p->getId();
 	}
 
 	void CInterfaceElement::registerDeletionWatcher( IDeletionWatcher *watcher )
@@ -1594,6 +1728,105 @@ namespace NLGUI
 		}
 	}
 
+	void CInterfaceElement::getHSCoords( const THotSpot &hs, sint32 &x, sint32 &y ) const
+	{
+		x = _XReal;
+		y = _YReal;
+
+		if( ( hs & Hotspot_Mx ) != 0 )
+			y += _HReal / 2;
+		else
+		if( ( hs & Hotspot_Tx ) != 0 )
+			y += _HReal;
+
+
+		if( ( hs & Hotspot_xM ) != 0 )
+			x += _WReal / 2;
+		else
+		if( ( hs & Hotspot_xR ) != 0 )
+			x += _WReal;
+	}
+
+	void CInterfaceElement::getClosestHotSpot( const CInterfaceElement *other, THotSpot &hs )
+	{
+		/// Iterate over the following hotspots, calculate the distance and store the closest
+
+
+		static THotSpot hslist[] =
+		{
+			Hotspot_BL,
+			Hotspot_BR,
+			Hotspot_MM,
+			Hotspot_TL,
+			Hotspot_TR
+		};
+
+		int c = sizeof( hslist ) / sizeof( THotSpot );
+
+		int x,y,ox,oy,vx,vy;
+		float d;
+		float closestd = 9999999.0f;
+		THotSpot closestHS = Hotspot_TR;
+
+		for( int i = 0; i < c; i++ )
+		{
+			other->getHSCoords( hslist[ i ], ox, oy );
+			getHSCoords( hslist[ i ], x, y );
+
+			// Make a vector between the two hotspots
+			vx = x - ox;
+			vy = y - oy;
+
+			// Calculate length
+			d = sqrt( pow( vx, 2.0f ) + pow( vy, 2.0f ) );
+
+			// If these hotspots are the closest, store the hotspot
+			if( d < closestd )
+			{
+				closestd = d;
+				closestHS = hslist[ i ];
+			}
+		}
+
+		hs = closestHS;
+	}
+
+	void CInterfaceElement::alignTo( CInterfaceElement *other )
+	{
+		if( other == this )
+			return;
+
+		// Check which hotspot is the closest
+		THotSpot hs;
+		other->getClosestHotSpot( this, hs );
+
+		// Get the hotspot coordinates
+		sint32 x, y, ox, oy;
+		getHSCoords( hs, x, y );
+		other->getHSCoords( hs, ox, oy );
+
+		// Calculate the difference between the hotspot we found and our current position,
+		sint32 dx = ox - x;
+		sint32 dy = oy - y;
+
+		// This difference is our offset, so we remain in the same position
+		setX( -1 * dx );
+		setY( -1 * dy );
+
+		setPosRef( hs );
+		setParentPosRef( hs );
+
+		invalidateCoords();
+	}
+
+	void CInterfaceElement::onWidgetDeleted( CInterfaceElement *e )
+	{
+		if( e == getParentPos() )
+			setParentPos( NULL );
+		if( e == getParentSize() )
+			setParentSize( NULL );
+	}
+
 	CStringMapper* CStringShared::_UIStringMapper = NULL;
 
 
diff --git a/code/nel/src/gui/interface_factory.cpp b/code/nel/src/gui/interface_factory.cpp
new file mode 100644
index 000000000..ec914baa6
--- /dev/null
+++ b/code/nel/src/gui/interface_factory.cpp
@@ -0,0 +1,29 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
+
+#include "nel/gui/interface_factory.h"
+#include "nel/gui/view_base.h"
+#include "nel/misc/factory.h"
+
+namespace NLGUI
+{
+	CViewBase* CInterfaceFactory::createClass( const std::string &name )
+	{
+		return NLMISC_GET_FACTORY( CViewBase, std::string ).createObject( std::string( name ) , CViewBase::TCtorParam() );
+	}
+}
+
+
diff --git a/code/nel/src/gui/interface_group.cpp b/code/nel/src/gui/interface_group.cpp
index 5fa83e1c5..29ad75f8c 100644
--- a/code/nel/src/gui/interface_group.cpp
+++ b/code/nel/src/gui/interface_group.cpp
@@ -911,6 +911,31 @@ namespace NLGUI
 		}
 	}
 
+	// ------------------------------------------------------------------------------------------------
+	void CInterfaceGroup::addElement (CInterfaceElement *child, sint eltOrder /*= -1*/)
+	{
+		if (!child)
+		{
+			nlwarning("<CInterfaceGroup::addView> : tried to add a NULL view");
+			return;
+		}
+
+		if( child->isGroup() )
+		{
+			addGroup( static_cast< CInterfaceGroup* >( child ), eltOrder );
+		}
+		else
+		if( child->isCtrl() )
+		{
+			addCtrl( static_cast< CCtrlBase* >( child ), eltOrder );
+		}
+		else
+		if( child->isView() )
+		{
+			addView( static_cast< CViewBase* >( child ), eltOrder );
+		}
+	}
+
 	// ------------------------------------------------------------------------------------------------
 	void CInterfaceGroup::addView (CViewBase *child, sint eltOrder /*= -1*/)
 	{
@@ -1312,6 +1337,11 @@ namespace NLGUI
 			for (ite = _EltOrder.begin() ; ite != _EltOrder.end(); ite++)
 			{
 				CViewBase *pVB = *ite;
+				if( pVB->getName() == "=MARKED=" )
+				{
+					nlinfo( "=MARKED=" );
+				}
+
 				if (pVB->getActive())
 					pVB->draw();
 			}
@@ -1638,6 +1668,32 @@ namespace NLGUI
 		return delView(static_cast<CViewBase*>(pIE));
 	}
 
+	// ------------------------------------------------------------------------------------------------
+	CInterfaceElement* CInterfaceGroup::takeElement( CInterfaceElement *e )
+	{
+		bool ok = false;
+
+		if( e->isGroup() )
+		{
+			ok = delGroup( static_cast< CInterfaceGroup* >( e ), true );
+		}
+		else
+		if( e->isCtrl() )
+		{
+			ok = delCtrl( static_cast< CCtrlBase* >( e ), true );
+		}
+		else
+		if( e->isView() )
+		{
+			ok = delView( static_cast< CViewBase* >( e ), true );
+		}
+
+		if( ok )
+			return e;
+		else
+			return NULL;
+	}
+
 	// ------------------------------------------------------------------------------------------------
 	bool CInterfaceGroup::isWindowUnder (sint32 x, sint32 y)
 	{
@@ -2488,5 +2544,101 @@ namespace NLGUI
 		for( std::vector< CInterfaceGroup* >::iterator itr = _ChildrenGroups.begin(); itr != _ChildrenGroups.end(); ++itr )
 			(*itr)->onWidgetDeleted( e );
 	}
+
+	void CInterfaceGroup::moveBy( sint32 x, sint32 y )
+	{
+		CInterfaceElement::moveBy( x, y );
+
+		for( int i = 0; i < _EltOrder.size(); i++ )
+		{
+			CViewBase *v = _EltOrder[ i ];
+			v->updateCoords();
+		}
+	}
+
+	bool CInterfaceGroup::explode()
+	{
+		CInterfaceGroup *p = getParent();
+		if( p == NULL )
+			return false;
+
+		std::string oldId;
+
+		// Reparent children
+		for( sint32 i = 0; i < _EltOrder.size(); i++ )
+		{
+			CInterfaceElement *e = _EltOrder[ i ];
+
+			oldId = e->getId();
+
+			e->setW( e->getWReal() );
+			e->setH( e->getHReal() );
+			e->setSizeRef( "" );
+
+			e->setParent( p );
+			
+			e->setParentPos( p );
+			e->setParentSize( p );
+			e->alignTo( p );
+
+			p->addElement( e );
+			e->setIdRecurse( e->getShortId() );
+
+			CWidgetManager::getInstance()->onWidgetMoved( oldId, e->getId() );
+		}
+
+		_EltOrder.clear();
+		_Views.clear();
+		_Controls.clear();
+		_ChildrenGroups.clear();
+
+		return true;
+	}
+
+	void CInterfaceGroup::spanElements()
+	{
+		sint32 minx = std::numeric_limits< sint32 >::max();
+		sint32 miny = std::numeric_limits< sint32 >::max();
+		sint32 maxx = std::numeric_limits< sint32 >::min();
+		sint32 maxy = std::numeric_limits< sint32 >::min();
+
+		sint32 tlx,tly,brx,bry;
+
+		// Find the min and max coordinates of the elements
+		for( int i = 0; i < _EltOrder.size(); i++ )
+		{
+			CViewBase *v = _EltOrder[ i ];
+
+			v->getHSCoords( Hotspot_TL, tlx, tly );
+			v->getHSCoords( Hotspot_BR, brx, bry );
+
+			if( tlx < minx )
+				minx = tlx;
+			if( brx > maxx )
+				maxx = brx;
+			if( bry < miny )
+				miny = bry;
+			if( tly > maxy )
+				maxy = tly;
+		}
+
+		// Set the position and the width and height based on these coords
+		setW( maxx - minx );
+		setH( maxy - miny );
+		_WReal = getW();
+		_HReal = getH();
+		_XReal = minx;
+		_YReal = miny;
+	}
+
+	void CInterfaceGroup::alignElements()
+	{
+		for( int i = 0; i < _EltOrder.size(); i++ )
+		{
+			CViewBase *v = _EltOrder[ i ];
+			v->alignTo( this );
+		}
+	}
+
 }
 
diff --git a/code/nel/src/gui/interface_options.cpp b/code/nel/src/gui/interface_options.cpp
index 9f70ceeff..3de015d65 100644
--- a/code/nel/src/gui/interface_options.cpp
+++ b/code/nel/src/gui/interface_options.cpp
@@ -271,16 +271,25 @@ namespace NLGUI
 		//
 
 		TxId_TL_HighLight = rVR.getTextureIdFromName (getValStr("tx_tl_highlight"));
+		rVR.getTextureSizeFromId(TxId_TL_HighLight, W_TL_HighLight, H_TL_HighLight);
 		TxId_T_HighLight  = rVR.getTextureIdFromName (getValStr("tx_t_highlight"));
+		rVR.getTextureSizeFromId(TxId_T_HighLight, W_T_HighLight, H_T_HighLight);
 		TxId_TR_HighLight = rVR.getTextureIdFromName (getValStr("tx_tr_highlight"));
+		rVR.getTextureSizeFromId(TxId_TR_HighLight, W_TR_HighLight, H_TR_HighLight);
 		TxId_L_HighLight  = rVR.getTextureIdFromName (getValStr("tx_l_highlight"));
+		rVR.getTextureSizeFromId(TxId_L_HighLight, W_L_HighLight, H_L_HighLight);
 		TxId_R_HighLight  = rVR.getTextureIdFromName (getValStr("tx_r_highlight"));
+		rVR.getTextureSizeFromId(TxId_R_HighLight, W_R_HighLight, H_R_HighLight);
 		TxId_BL_HighLight = rVR.getTextureIdFromName (getValStr("tx_bl_highlight"));
+		rVR.getTextureSizeFromId(TxId_BL_HighLight, W_BL_HighLight, H_BL_HighLight);
 		TxId_B_HighLight  = rVR.getTextureIdFromName (getValStr("tx_b_highlight"));
+		rVR.getTextureSizeFromId(TxId_B_HighLight, W_B_HighLight, H_B_HighLight);
 		TxId_BR_HighLight = rVR.getTextureIdFromName (getValStr("tx_br_highlight"));
+		rVR.getTextureSizeFromId(TxId_BR_HighLight, W_BR_HighLight, H_BR_HighLight);
 
 		//
 		HeaderH = getValSInt32("header_h");
+		InsetT = getValSInt32("inset_t");
 
 		return true;
 	}
diff --git a/code/nel/src/gui/interface_parser.cpp b/code/nel/src/gui/interface_parser.cpp
index b26a403c4..a3e2c48aa 100644
--- a/code/nel/src/gui/interface_parser.cpp
+++ b/code/nel/src/gui/interface_parser.cpp
@@ -37,6 +37,7 @@
 #include "nel/gui/lua_helper.h"
 #include "nel/gui/lua_ihm.h"
 #include "nel/gui/lua_manager.h"
+#include "nel/gui/root_group.h"
 
 #ifdef LUA_NEVRAX_VERSION
 	#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
@@ -113,86 +114,6 @@ namespace NLGUI
 		return node;
 	}
 
-
-
-	// ----------------------------------------------------------------------------
-	// CRootGroup
-	// ----------------------------------------------------------------------------
-
-	class CRootGroup : public CInterfaceGroup
-	{
-	public:
-		CRootGroup(const TCtorParam &param)
-			: CInterfaceGroup(param)
-		{ }
-
-		/// Destructor
-		virtual ~CRootGroup() { }
-
-		virtual CInterfaceElement* getElement (const std::string &id)
-		{
-			if (_Id == id)
-			return this;
-
-			if (id.substr(0, _Id.size()) != _Id)
-				return NULL;
-
-			vector<CViewBase*>::const_iterator itv;
-			for (itv = _Views.begin(); itv != _Views.end(); itv++)
-			{
-				CViewBase *pVB = *itv;
-				if (pVB->getId() == id)
-					return pVB;
-			}
-
-			vector<CCtrlBase*>::const_iterator itc;
-			for (itc = _Controls.begin(); itc != _Controls.end(); itc++)
-			{
-				CCtrlBase* ctrl = *itc;
-				if (ctrl->getId() == id)
-					return ctrl;
-			}
-
-			// Accelerate
-			string sTmp = id;
-			sTmp = sTmp.substr(_Id.size()+1,sTmp.size());
-			string::size_type pos = sTmp.find(':');
-			if (pos != string::npos)
-				sTmp = sTmp.substr(0,pos);
-
-			map<string,CInterfaceGroup*>::iterator it = _Accel.find(sTmp);
-			if (it != _Accel.end())
-			{
-				CInterfaceGroup *pIG = it->second;
-				return pIG->getElement(id);
-			}
-			return NULL;
-		}
-
-		virtual void addGroup (CInterfaceGroup *child, sint eltOrder = -1)
-		{
-			string sTmp = child->getId();
-			sTmp = sTmp.substr(_Id.size()+1,sTmp.size());
-			_Accel.insert(pair<string,CInterfaceGroup*>(sTmp, child));
-			CInterfaceGroup::addGroup(child,eltOrder);
-		}
-
-		virtual bool delGroup (CInterfaceGroup *child, bool dontDelete = false)
-		{
-			string sTmp = child->getId();
-			sTmp = sTmp.substr(_Id.size()+1,sTmp.size());
-			map<string,CInterfaceGroup*>::iterator it = _Accel.find(sTmp);
-			if (it != _Accel.end())
-			{
-				_Accel.erase(it);
-			}
-			return CInterfaceGroup::delGroup(child,dontDelete);
-		}
-
-	private:
-		map<string,CInterfaceGroup*> _Accel;
-	};
-
 	// ----------------------------------------------------------------------------
 	// CInterfaceParser
 	// ----------------------------------------------------------------------------
@@ -233,6 +154,22 @@ namespace NLGUI
 		destStream.seek(0, NLMISC::IStream::begin);
 	}
 
+	std::string CInterfaceParser::lookup( const std::string &file )
+	{
+		std::string filename;
+		
+		if( editorMode && !_WorkDir.empty() )
+		{
+			std::string wdpath = CPath::standardizePath( _WorkDir ) + file;
+			if( CFile::fileExists( wdpath ) )
+				filename = wdpath;
+		}
+		if( filename.empty() )
+			filename = CPath::lookup( file );
+
+		return filename;
+	}
+
 	// ----------------------------------------------------------------------------
 	bool CInterfaceParser::parseInterface (const std::vector<std::string> & strings, bool reload, bool isFilename, bool checkInData)
 	{
@@ -270,7 +207,7 @@ namespace NLGUI
 			{
 				//get the first file document pointer
 				firstFileName = *it;
-				string filename = CPath::lookup(firstFileName);
+				string filename = lookup( firstFileName );
 				bool isInData = false;
 				string::size_type pos = filename.find ("@");
 				if (pos != string::npos)
@@ -283,7 +220,7 @@ namespace NLGUI
 						isInData = true;
 				}
 
-				if ((needCheck && !isInData) || !file.open (CPath::lookup(firstFileName)))
+				if ((needCheck && !isInData) || !file.open (lookup(firstFileName)))
 				{
 					// todo hulud interface syntax error
 					nlwarning ("could not open file %s, skipping xml parsing",firstFileName.c_str());
@@ -331,7 +268,7 @@ namespace NLGUI
 				{
 					saveParseResult = true;
 					std::string archive = CPath::lookup(nextFileName + "_compressed", false, false);
-					std::string current = CPath::lookup(nextFileName, false, false);
+					std::string current = lookup(nextFileName);
 					if (!archive.empty() && !current.empty())
 					{
 						if (CFile::getFileModificationDate(current) <= CFile::getFileModificationDate(archive))
@@ -351,7 +288,7 @@ namespace NLGUI
 				{
 					if (isFilename)
 					{
-						if (!file.open(CPath::lookup(nextFileName, false, false)))
+						if (!file.open(lookup(nextFileName)))
 						{
 							// todo hulud interface syntax error
 							nlwarning ("could not open file %s, skipping xml parsing",nextFileName.c_str());
@@ -1834,7 +1771,7 @@ namespace NLGUI
 		{
 			CInterfaceExprValue res;
 
-			if (CInterfaceExpr::eval(ptrVal2, res))
+			if (CInterfaceExpr::eval(ptrVal2.str(), res))
 			{
 				if (!res.toString())
 				{
@@ -3014,6 +2951,34 @@ namespace NLGUI
 		itr->second = linkData;
 	}
 
+	void CInterfaceParser::setVariable( const VariableData &v )
+	{
+		CInterfaceProperty prop;
+		const std::string &type = v.type;
+		const std::string &value = v.value;
+		const std::string &entry = v.entry;
+
+		if( type == "sint64" )
+			prop.readSInt64( value.c_str(), entry );
+		else
+		if( type == "sint32" )
+			prop.readSInt32( value.c_str(), entry );
+		else
+		if( type == "float" || type == "double" )
+			prop.readDouble( value.c_str(), entry );
+		else
+		if( type == "bool" )
+			prop.readBool( value.c_str(), entry );
+		else
+		if( type == "rgba" )
+			prop.readRGBA( value.c_str(), entry );
+		else
+		if( type == "hotspot" )
+			prop.readHotSpot( value.c_str(), entry );
+
+		variableCache[ entry ] = v;
+	}
+
 
 	bool CInterfaceParser::serializeVariables( xmlNodePtr parentNode ) const
 	{
diff --git a/code/nel/src/gui/libwww.cpp b/code/nel/src/gui/libwww.cpp
index 1e5f7a226..b17d1cccb 100644
--- a/code/nel/src/gui/libwww.cpp
+++ b/code/nel/src/gui/libwww.cpp
@@ -86,6 +86,7 @@ namespace NLGUI
 		HTML_ATTR(TABLE,ALIGN),
 			HTML_ATTR(TABLE,BGCOLOR),
 			HTML_ATTR(TABLE,BORDER),
+			HTML_ATTR(TABLE,BORDERCOLOR),
 			HTML_ATTR(TABLE,CELLPADDING),
 			HTML_ATTR(TABLE,CELLSPACING),
 			HTML_ATTR(TABLE,CLASS),
@@ -201,6 +202,7 @@ namespace NLGUI
 		HTML_ATTR(TEXTAREA,DISABLED),
 		HTML_ATTR(TEXTAREA,ID),
 		HTML_ATTR(TEXTAREA,LANG),
+		HTML_ATTR(TEXTAREA,MAXLENGTH),
 		HTML_ATTR(TEXTAREA,NAME),
 		HTML_ATTR(TEXTAREA,READONLY),
 		HTML_ATTR(TEXTAREA,ROWS),
diff --git a/code/nel/src/gui/libwww_nel_stream.cpp b/code/nel/src/gui/libwww_nel_stream.cpp
index f6a45cf06..b7e218b30 100644
--- a/code/nel/src/gui/libwww_nel_stream.cpp
+++ b/code/nel/src/gui/libwww_nel_stream.cpp
@@ -21,7 +21,7 @@
 extern "C"
 {
 
-	/* Library Includes */
+/* Library Includes */
 #include "wwwsys.h"
 #include "WWWUtil.h"
 #include "WWWCore.h"
@@ -41,8 +41,9 @@ using namespace NLMISC;
 extern "C"
 {
 
-	/* Final states have negative value */
-typedef enum _FileState {
+/* Final states have negative value */
+typedef enum _FileState
+{
 	FS_RETRY		= -4,
 	FS_ERROR		= -3,
 	FS_NO_DATA		= -2,
@@ -57,26 +58,29 @@ typedef enum _FileState {
 } FileState;
 
 /* This is the context structure for the this module */
-typedef struct _file_info {
-	FileState	state;		  /* Current state of the connection */
-	char *		local;		/* Local representation of file name */
-	struct stat		stat_info;	      /* Contains actual file chosen */
+typedef struct _file_info
+{
+	FileState	state;			/* Current state of the connection */
+	char *		local;			/* Local representation of file name */
+	struct stat		stat_info;	/* Contains actual file chosen */
 	HTNet *		net;
 	HTTimer *	timer;
 } file_info;
 
-struct _HTStream {
+struct _HTStream
+{
 	const HTStreamClass *	isa;
 };
 
-struct _HTInputStream {
+struct _HTInputStream
+{
 	const HTInputStreamClass *	isa;
 	HTChannel *			ch;
 	HTHost *			host;
-	char *			write;			/* Last byte written */
-	char *			read;			   /* Last byte read */
+	char *			write;						/* Last byte written */
+	char *			read;						/* Last byte read */
 	int				b_read;
-	char			data [INPUT_BUFFER_SIZE];	   /* buffer */
+	char			data [INPUT_BUFFER_SIZE];	/* buffer */
 };
 
 PRIVATE int FileCleanup (HTRequest *req, int status)
@@ -96,7 +100,7 @@ PRIVATE int FileCleanup (HTRequest *req, int status)
 	}
 
 	/*
-	**  Remove if we have registered a timer function as a callback
+	** Remove if we have registered a timer function as a callback
 	*/
 	if (file->timer)
 	{
@@ -123,10 +127,8 @@ PUBLIC int HTLoadNeLFile (SOCKET soc, HTRequest * request)
 	HTNet * net = HTRequest_net(request);
 	HTParentAnchor * anchor = HTRequest_anchor(request);
 
-	HTTRACE(PROT_TRACE, "HTLoadFile.. Looking for `%s\'\n" _
-				HTAnchor_physical(anchor));
-	if ((file = (file_info *) HT_CALLOC(1, sizeof(file_info))) == NULL)
-	HT_OUTOFMEM((char*)"HTLoadFILE");
+	HTTRACE(PROT_TRACE, "HTLoadFile.. Looking for `%s\'\n" _ HTAnchor_physical(anchor));
+	if ((file = (file_info *) HT_CALLOC(1, sizeof(file_info))) == NULL) HT_OUTOFMEM("HTLoadFILE");
 	file->state = FS_BEGIN;
 	file->net = net;
 	HTNet_setContext(net, file);
@@ -139,8 +141,8 @@ PUBLIC int HTLoadNeLFile (SOCKET soc, HTRequest * request)
 PRIVATE int ReturnEvent (HTTimer * timer, void * param, HTEventType /* type */)
 {
 	file_info * file = (file_info *) param;
-	if (timer != file->timer)
-	HTDEBUGBREAK((char*)"File timer %p not in sync\n" _ timer);
+	if (timer != file->timer) HTDEBUGBREAK("File timer %p not in sync\n" _ timer);
+
 	HTTRACE(PROT_TRACE, "HTLoadFile.. Continuing %p with timer %p\n" _ file _ timer);
 
 	/*
@@ -163,7 +165,7 @@ PUBLIC int HTNeLFileOpen (HTNet * net, char * local, HTLocalMode /* mode */)
 
 	if (!fp->open (local))
 	{
-		HTRequest_addSystemError(request, ERR_FATAL, errno, NO, (char*)"CIFile::open");
+		HTRequest_addSystemError(request, ERR_FATAL, errno, NO, "CIFile::open");
 		return HT_ERROR;
 	}
 
@@ -186,7 +188,7 @@ PRIVATE int FileEvent (SOCKET /* soc */, void * pVoid, HTEventType type)
 	{
 		/* Interrupted */
 		HTRequest_addError(request, ERR_FATAL, NO, HTERR_INTERRUPTED,
-			NULL, 0, (char*)"HTLoadFile");
+			NULL, 0, "HTLoadFile");
 		FileCleanup(request, HT_INTERRUPTED);
 		return HT_OK;
 	}
@@ -202,7 +204,7 @@ PRIVATE int FileEvent (SOCKET /* soc */, void * pVoid, HTEventType type)
 		/* We only support safe (GET, HEAD, etc) methods for the moment */
 		if (!HTMethod_isSafe(HTRequest_method(request))) {
 		HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_ALLOWED,
-				   NULL, 0, (char*)"HTLoadFile");
+				   NULL, 0, "HTLoadFile");
 		file->state = FS_ERROR;
 		break;
 		}
@@ -234,166 +236,188 @@ PRIVATE int FileEvent (SOCKET /* soc */, void * pVoid, HTEventType type)
 
 		/* Create a new host object and link it to the net object */
 		{
-		HTHost * host = NULL;
-		if ((host = HTHost_new((char*)"localhost", 0)) == NULL) return HT_ERROR;
-		HTNet_setHost(net, host);
-		if (HTHost_addNet(host, net) == HT_PENDING) {
-			HTTRACE(PROT_TRACE, "HTLoadFile.. Pending...\n");
-			/* move to the hack state */
-			file->state = FS_PENDING;
-			return HT_OK;
-		}
+			HTHost * host = NULL;
+			if ((host = HTHost_new("localhost", 0)) == NULL) return HT_ERROR;
+			HTNet_setHost(net, host);
+			if (HTHost_addNet(host, net) == HT_PENDING)
+			{
+				HTTRACE(PROT_TRACE, "HTLoadFile.. Pending...\n");
+				/* move to the hack state */
+				file->state = FS_PENDING;
+				return HT_OK;
+			}
 		}
 		file->state = FS_DO_CN;
 		break;
 
 	case FS_PENDING:
 		{
-		HTHost * host = NULL;
-		if ((host = HTHost_new((char*)"localhost", 0)) == NULL) return HT_ERROR;
-		HTNet_setHost(net, host);
-		if (HTHost_addNet(host, net) == HT_PENDING) {
-			HTTRACE(PROT_TRACE, "HTLoadFile.. Pending...\n");
-			file->state = FS_PENDING;
-			return HT_OK;
-		}
+			HTHost * host = NULL;
+			if ((host = HTHost_new((char*)"localhost", 0)) == NULL) return HT_ERROR;
+			HTNet_setHost(net, host);
+			if (HTHost_addNet(host, net) == HT_PENDING)
+			{
+				HTTRACE(PROT_TRACE, "HTLoadFile.. Pending...\n");
+				file->state = FS_PENDING;
+				return HT_OK;
+			}
 		}
 		file->state = FS_DO_CN;
 		break;
 
 	case FS_DO_CN:
 		if (HTRequest_negotiation(request) &&
-		HTMethod_isSafe(HTRequest_method(request))) {
-
-		HTAnchor_setPhysical(anchor, file->local);
-		HTTRACE(PROT_TRACE, "Load File... Found `%s\'\n" _ file->local);
-
-		} else {
-		if (HT_STAT(file->local, &file->stat_info) == -1) {
-			HTTRACE(PROT_TRACE, "Load File... Not found `%s\'\n" _ file->local);
-			HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_FOUND,
-					   NULL, 0, (char*)"HTLoadFile");
-			file->state = FS_ERROR;
-			break;
+		HTMethod_isSafe(HTRequest_method(request)))
+		{
+			HTAnchor_setPhysical(anchor, file->local);
+			HTTRACE(PROT_TRACE, "Load File... Found `%s\'\n" _ file->local);
 		}
+		else
+		{
+			if (HT_STAT(file->local, &file->stat_info) == -1)
+			{
+				HTTRACE(PROT_TRACE, "Load File... Not found `%s\'\n" _ file->local);
+				HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_FOUND, NULL, 0, "HTLoadFile");
+				file->state = FS_ERROR;
+				break;
+			}
 		}
 
-		if (((file->stat_info.st_mode) & S_IFMT) == S_IFDIR) {
-		if (HTRequest_method(request) == METHOD_GET)
-			file->state = FS_PARSE_DIR;
-		else {
-			HTRequest_addError(request, ERR_INFO, NO, HTERR_NO_CONTENT,
-					   NULL, 0, (char*)"HTLoadFile");
-			file->state = FS_NO_DATA;
-		}
-		break;
+		if (((file->stat_info.st_mode) & S_IFMT) == S_IFDIR)
+		{
+			if (HTRequest_method(request) == METHOD_GET)
+			{
+				file->state = FS_PARSE_DIR;
+			}
+			else
+			{
+				HTRequest_addError(request, ERR_INFO, NO, HTERR_NO_CONTENT, NULL, 0, "HTLoadFile");
+				file->state = FS_NO_DATA;
+			}
+			break;
 		}
 
 		{
-		BOOL editable = FALSE;
-		HTBind_getAnchorBindings(anchor);
-		if (editable) HTAnchor_appendAllow(anchor, METHOD_PUT);
+			BOOL editable = FALSE;
+			HTBind_getAnchorBindings(anchor);
+			if (editable) HTAnchor_appendAllow(anchor, METHOD_PUT);
 
-		/* Set the file size */
-		CIFile nelFile;
-		if (nelFile.open (file->local))
-		{
-			file->stat_info.st_size = nelFile.getFileSize();
-		}
-		nelFile.close();
-
-		if (file->stat_info.st_size)
-			HTAnchor_setLength(anchor, file->stat_info.st_size);
-
-		/* Set the file last modified time stamp */
-		if (file->stat_info.st_mtime > 0)
-			HTAnchor_setLastModified(anchor, file->stat_info.st_mtime);
-
-		/* Check to see if we can edit it */
-		if (!editable && !file->stat_info.st_size) {
-			HTRequest_addError(request, ERR_INFO, NO, HTERR_NO_CONTENT,
-					   NULL, 0, (char*)"HTLoadFile");
-			file->state = FS_NO_DATA;
-		} else {
-			file->state = (HTRequest_method(request)==METHOD_GET) ?
-			FS_NEED_OPEN_FILE : FS_GOT_DATA;
-		}
+			/* Set the file size */
+			CIFile nelFile;
+			if (nelFile.open (file->local))
+			{
+				file->stat_info.st_size = nelFile.getFileSize();
+			}
+			nelFile.close();
+
+			if (file->stat_info.st_size)
+				HTAnchor_setLength(anchor, file->stat_info.st_size);
+
+			/* Set the file last modified time stamp */
+			if (file->stat_info.st_mtime > 0)
+				HTAnchor_setLastModified(anchor, file->stat_info.st_mtime);
+
+			/* Check to see if we can edit it */
+			if (!editable && !file->stat_info.st_size)
+			{
+				HTRequest_addError(request, ERR_INFO, NO, HTERR_NO_CONTENT, NULL, 0, "HTLoadFile");
+				file->state = FS_NO_DATA;
+			}
+			else
+			{
+				file->state = (HTRequest_method(request)==METHOD_GET) ? FS_NEED_OPEN_FILE : FS_GOT_DATA;
+			}
 		}
 		break;
 
 	  case FS_NEED_OPEN_FILE:
 		status = HTNeLFileOpen(net, file->local, HT_FB_RDONLY);
-		if (status == HT_OK) {
+		if (status == HT_OK)
 		{
-			HTStream * rstream = HTStreamStack(HTAnchor_format(anchor),
-							   HTRequest_outputFormat(request),
-							   HTRequest_outputStream(request),
-							   request, YES);
-			HTNet_setReadStream(net, rstream);
-			HTRequest_setOutputConnected(request, YES);
-		}
+			{
+				HTStream * rstream = HTStreamStack(HTAnchor_format(anchor),
+					HTRequest_outputFormat(request),
+					HTRequest_outputStream(request),
+					request, YES);
+				HTNet_setReadStream(net, rstream);
+				HTRequest_setOutputConnected(request, YES);
+			}
 
-		{
-			HTOutputStream * output = HTNet_getOutput(net, NULL, 0);
-			HTRequest_setInputStream(request, (HTStream *) output);
-		}
+			{
+				HTOutputStream * output = HTNet_getOutput(net, NULL, 0);
+				HTRequest_setInputStream(request, (HTStream *) output);
+			}
 
-		if (HTRequest_isSource(request) && !HTRequest_destinationsReady(request))
-			return HT_OK;
-		HTRequest_addError(request, ERR_INFO, NO, HTERR_OK, NULL, 0,
-				   (char*)"HTLoadFile");
-		file->state = FS_NEED_BODY;
-
-		if (HTEvent_isCallbacksRegistered()) {
-			if (!HTRequest_preemptive(request)) {
-			if (!HTNet_preemptive(net)) {
-				HTTRACE(PROT_TRACE, "HTLoadFile.. Returning\n");
-				HTHost_register(HTNet_host(net), net, HTEvent_READ);
-			} else if (!file->timer) {
-				HTTRACE(PROT_TRACE, "HTLoadFile.. Returning\n");
-				file->timer =
-				HTTimer_new(NULL, ReturnEvent, file, 1, YES, NO);
+			if (HTRequest_isSource(request) && !HTRequest_destinationsReady(request)) return HT_OK;
+
+			HTRequest_addError(request, ERR_INFO, NO, HTERR_OK, NULL, 0, "HTLoadFile");
+			file->state = FS_NEED_BODY;
+
+			if (HTEvent_isCallbacksRegistered())
+			{
+				if (!HTRequest_preemptive(request))
+				{
+					if (!HTNet_preemptive(net))
+					{
+						HTTRACE(PROT_TRACE, "HTLoadFile.. Returning\n");
+						HTHost_register(HTNet_host(net), net, HTEvent_READ);
+					}
+					else if (!file->timer)
+					{
+						HTTRACE(PROT_TRACE, "HTLoadFile.. Returning\n");
+						file->timer = HTTimer_new(NULL, ReturnEvent, file, 1, YES, NO);
+					}
+					return HT_OK;
+				}
 			}
+		}
+		else if (status == HT_WOULD_BLOCK || status == HT_PENDING)
+		{
 			return HT_OK;
-			}
 		}
-		} else if (status == HT_WOULD_BLOCK || status == HT_PENDING)
-		return HT_OK;
-		else {
-		HTRequest_addError(request, ERR_INFO, NO, HTERR_INTERNAL,
-				   NULL, 0, (char*)"HTLoadFile");
-		file->state = FS_ERROR;		       /* Error or interrupt */
+		else
+		{
+			HTRequest_addError(request, ERR_INFO, NO, HTERR_INTERNAL, NULL, 0, "HTLoadFile");
+			file->state = FS_ERROR;		       /* Error or interrupt */
 		}
 		break;
 
-	  case FS_NEED_BODY:
+	case FS_NEED_BODY:
 		status = HTHost_read(HTNet_host(net), net);
 		if (status == HT_WOULD_BLOCK)
-		return HT_OK;
-		else if (status == HT_LOADED || status == HT_CLOSED) {
-		file->state = FS_GOT_DATA;
-		} else {
-		HTRequest_addError(request, ERR_INFO, NO, HTERR_FORBIDDEN,
-				   NULL, 0, (char*)"HTLoadFile");
-		file->state = FS_ERROR;
+		{
+			return HT_OK;
+		}
+		else if (status == HT_LOADED || status == HT_CLOSED)
+		{
+			file->state = FS_GOT_DATA;
+		}
+		else
+		{
+			HTRequest_addError(request, ERR_INFO, NO, HTERR_FORBIDDEN, NULL, 0, "HTLoadFile");
+			file->state = FS_ERROR;
 		}
 		break;
 
 	  case FS_TRY_FTP:
 		{
-		char *url = HTAnchor_physical(anchor);
-		HTAnchor *anchor;
-		char *newname = NULL;
-		StrAllocCopy(newname, "ftp:");
-		if (!strncmp(url, "file:", 5))
-			StrAllocCat(newname, url+5);
-		else
-			StrAllocCat(newname, url);
-		anchor = HTAnchor_findAddress(newname);
-		HTRequest_setAnchor(request, anchor);
-		HT_FREE(newname);
-		FileCleanup(request, HT_IGNORE);
-		return HTLoad(request, YES);
+			char *url = HTAnchor_physical(anchor);
+			HTAnchor *anchor;
+			char *newname = NULL;
+			StrAllocCopy(newname, "ftp:");
+			if (!strncmp(url, "file:", 5))
+			{
+				StrAllocCat(newname, url+5);
+			}
+			else
+			{
+				StrAllocCat(newname, url);
+			}
+			anchor = HTAnchor_findAddress(newname);
+			HTRequest_setAnchor(request, anchor);
+			HT_FREE(newname);
+			FileCleanup(request, HT_IGNORE);
+			return HTLoad(request, YES);
 		}
 		break;
 
@@ -461,7 +485,8 @@ PRIVATE int HTNeLReader_read (HTInputStream * me)
 		{
 			HTAlertCallback * cbf = HTAlert_find(HT_PROG_READ);
 			HTNet_addBytesRead(net, me->b_read);
-			if (cbf) {
+			if (cbf)
+			{
 				int tr = HTNet_bytesRead(net);
 				(*cbf)(net->request, HT_PROG_READ, HT_MSG_NULL, NULL, &tr, NULL);
 			}
@@ -472,18 +497,28 @@ PRIVATE int HTNeLReader_read (HTInputStream * me)
 
 		/* Now push the data down the stream */
 		if ((status = (*net->readStream->isa->put_block)
-			(net->readStream, me->data, me->b_read)) != HT_OK) {
-			if (status == HT_WOULD_BLOCK) {
+			(net->readStream, me->data, me->b_read)) != HT_OK)
+		{
+			if (status == HT_WOULD_BLOCK)
+			{
 				HTTRACE(PROT_TRACE, "ANSI read... Target WOULD BLOCK\n");
 				return HT_WOULD_BLOCK;
-			} else if (status == HT_PAUSE) {
+			}
+			else if (status == HT_PAUSE)
+			{
 				HTTRACE(PROT_TRACE, "ANSI read... Target PAUSED\n");
 				return HT_PAUSE;
-			} else if (status > 0) {	      /* Stream specific return code */
+			}
+			else if (status > 0)
+			{
+				/* Stream specific return code */
 				HTTRACE(PROT_TRACE, "ANSI read... Target returns %d\n" _ status);
 				me->write = me->data + me->b_read;
 				return status;
-			} else {				     /* We have a real error */
+			}
+			else
+			{
+				/* We have a real error */
 				HTTRACE(PROT_TRACE, "ANSI read... Target ERROR\n");
 				return status;
 			}
@@ -506,13 +541,15 @@ PRIVATE int HTNeLReader_close (HTInputStream * me)
 	HTNet * net = HTHost_getReadNet(me->host);
 
 
-	if (net && net->readStream) {
-	if ((status = (*net->readStream->isa->_free)(net->readStream))==HT_WOULD_BLOCK)
-		return HT_WOULD_BLOCK;
-	net->readStream = NULL;
+	if (net && net->readStream)
+	{
+		if ((status = (*net->readStream->isa->_free)(net->readStream))==HT_WOULD_BLOCK) return HT_WOULD_BLOCK;
+		net->readStream = NULL;
 	}
+
 	HTTRACE(STREAM_TRACE, "Socket read. FREEING....\n");
 	HT_FREE(me);
+
 	return status;
 }
 
@@ -540,7 +577,8 @@ PRIVATE int HTNeLReader_free (HTInputStream * me)
 	}
 
 	HTNet * net = HTHost_getReadNet(me->host);
-	if (net && net->readStream) {
+	if (net && net->readStream)
+	{
 		int status = (*net->readStream->isa->_free)(net->readStream);
 		if (status == HT_OK) net->readStream = NULL;
 		return status;
@@ -551,7 +589,8 @@ PRIVATE int HTNeLReader_free (HTInputStream * me)
 PRIVATE int HTNeLReader_abort (HTInputStream * me, HTList * /* e */)
 {
 	HTNet * net = HTHost_getReadNet(me->host);
-	if (net && net->readStream) {
+	if (net && net->readStream)
+	{
 		int status = (*net->readStream->isa->abort)(net->readStream, NULL);
 		if (status != HT_IGNORE) net->readStream = NULL;
 	}
@@ -560,7 +599,7 @@ PRIVATE int HTNeLReader_abort (HTInputStream * me, HTList * /* e */)
 
 PRIVATE const HTInputStreamClass HTNeLReader =
 {
-	(char*)"SocketReader",
+	"SocketReader",
 	HTNeLReader_flush,
 	HTNeLReader_free,
 	HTNeLReader_abort,
@@ -569,20 +608,20 @@ PRIVATE const HTInputStreamClass HTNeLReader =
 	HTNeLReader_consumed
 };
 
-PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch,
-					 void * /* param */, int /* mode */)
+PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch, void * /* param */, int /* mode */)
 {
-	if (host && ch) {
-	HTInputStream * me = HTChannel_input(ch);
-	if (me == NULL) {
-		if ((me=(HTInputStream *) HT_CALLOC(1, sizeof(HTInputStream))) == NULL)
-		HT_OUTOFMEM((char*)"HTNeLReader_new");
-		me->isa = &HTNeLReader;
-		me->ch = ch;
-		me->host = host;
-		HTTRACE(STREAM_TRACE, "Reader...... Created reader stream %p\n" _ me);
-	}
-	return me;
+	if (host && ch)
+	{
+		HTInputStream * me = HTChannel_input(ch);
+		if (me == NULL)
+		{
+			if ((me=(HTInputStream *) HT_CALLOC(1, sizeof(HTInputStream))) == NULL) HT_OUTOFMEM("HTNeLReader_new");
+			me->isa = &HTNeLReader;
+			me->ch = ch;
+			me->host = host;
+			HTTRACE(STREAM_TRACE, "Reader...... Created reader stream %p\n" _ me);
+		}
+		return me;
 	}
 	return NULL;
 }
diff --git a/code/nel/src/gui/link_hack.cpp b/code/nel/src/gui/link_hack.cpp
index 06a8c23e8..3ecc6fb0a 100644
--- a/code/nel/src/gui/link_hack.cpp
+++ b/code/nel/src/gui/link_hack.cpp
@@ -20,6 +20,7 @@
 #include "nel/gui/dbview_number.h"
 #include "nel/gui/dbview_quantity.h"
 #include "nel/gui/view_pointer.h"
+#include "nel/gui/group_editbox_decor.h"
 
 namespace NLGUI
 {
@@ -39,5 +40,6 @@ namespace NLGUI
 		force_link_dbgroup_select_number_cpp();
 		force_link_dbgroup_combo_box_cpp();
 		force_link_group_wheel_cpp();
+		CGroupEditBoxDecor::forceLink();
 	}
 }
\ No newline at end of file
diff --git a/code/nel/src/gui/root_group.cpp b/code/nel/src/gui/root_group.cpp
new file mode 100644
index 000000000..bffdd5579
--- /dev/null
+++ b/code/nel/src/gui/root_group.cpp
@@ -0,0 +1,94 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
+
+
+#include "nel/gui/root_group.h"
+#include <vector>
+
+namespace NLGUI
+{
+
+	CRootGroup::CRootGroup(const TCtorParam &param) :
+	CInterfaceGroup(param)
+	{
+	}
+
+	CRootGroup::~CRootGroup()
+	{
+	}
+
+	CInterfaceElement* CRootGroup::getElement (const std::string &id)
+	{
+		if (_Id == id)
+		return this;
+
+		if (id.substr(0, _Id.size()) != _Id)
+			return NULL;
+
+		std::vector<CViewBase*>::const_iterator itv;
+		for (itv = _Views.begin(); itv != _Views.end(); itv++)
+		{
+			CViewBase *pVB = *itv;
+			if (pVB->getId() == id)
+				return pVB;
+		}
+
+		std::vector<CCtrlBase*>::const_iterator itc;
+		for (itc = _Controls.begin(); itc != _Controls.end(); itc++)
+		{
+			CCtrlBase* ctrl = *itc;
+			if (ctrl->getId() == id)
+				return ctrl;
+		}
+
+		// Accelerate
+		std::string sTmp = id;
+		sTmp = sTmp.substr(_Id.size()+1,sTmp.size());
+		std::string::size_type pos = sTmp.find(':');
+		if (pos != std::string::npos)
+			sTmp = sTmp.substr(0,pos);
+
+		std::map<std::string,CInterfaceGroup*>::iterator it = _Accel.find(sTmp);
+		if (it != _Accel.end())
+		{
+			CInterfaceGroup *pIG = it->second;
+			return pIG->getElement(id);
+		}
+		return NULL;
+	}
+
+	void CRootGroup::addGroup (CInterfaceGroup *child, sint eltOrder)
+	{
+		std::string sTmp = child->getId();
+		sTmp = sTmp.substr(_Id.size()+1,sTmp.size());
+		_Accel.insert(std::pair<std::string,CInterfaceGroup*>(sTmp, child));
+		CInterfaceGroup::addGroup(child,eltOrder);
+	}
+
+	bool CRootGroup::delGroup (CInterfaceGroup *child, bool dontDelete)
+	{
+		std::string sTmp = child->getId();
+		sTmp = sTmp.substr(_Id.size()+1,sTmp.size());
+		std::map<std::string,CInterfaceGroup*>::iterator it = _Accel.find(sTmp);
+		if (it != _Accel.end())
+		{
+			_Accel.erase(it);
+		}
+		return CInterfaceGroup::delGroup(child,dontDelete);
+	}
+
+}
+
diff --git a/code/nel/src/gui/stdpch.h b/code/nel/src/gui/stdpch.h
index bb983f77c..3270e6482 100644
--- a/code/nel/src/gui/stdpch.h
+++ b/code/nel/src/gui/stdpch.h
@@ -18,6 +18,7 @@
 #define NELGUI_H
 
 #include <string>
+#include <limits>
 
 #include "nel/misc/types_nl.h"
 #include "nel/misc/algo.h"
diff --git a/code/nel/src/gui/view_base.cpp b/code/nel/src/gui/view_base.cpp
index 05d958d3e..2b09061a9 100644
--- a/code/nel/src/gui/view_base.cpp
+++ b/code/nel/src/gui/view_base.cpp
@@ -57,7 +57,7 @@ namespace NLGUI
 			{
 				if( editorMode )
 				{
-					CWidgetManager::getInstance()->setCurrentEditorSelection( getId() );
+					CWidgetManager::getInstance()->selectWidget( getId() );
 					return true;
 				}
 			}
diff --git a/code/nel/src/gui/view_text.cpp b/code/nel/src/gui/view_text.cpp
index 6ff1930af..db069a29d 100644
--- a/code/nel/src/gui/view_text.cpp
+++ b/code/nel/src/gui/view_text.cpp
@@ -28,8 +28,6 @@
 #include "nel/gui/lua_ihm.h"
 #include "nel/gui/view_pointer_base.h"
 
-#include <limits>
-
 using namespace std;
 using namespace NLMISC;
 using namespace NL3D;
@@ -62,6 +60,7 @@ namespace NLGUI
 			CWidgetManager::getInstance()->getSystemOption( CWidgetManager::OptionAddCoefFont ).getValSInt32();
 		_Color = CRGBA(255,255,255,255);
 		_Shadow = false;
+		_ShadowOutline = false;
 		_ShadowColor = CRGBA(0,0,0,255);
 
 		_MultiLine = false;
@@ -111,7 +110,7 @@ namespace NLGUI
 	///constructor
 	// ***************************************************************************
 	CViewText::	CViewText (const std::string& id, const std::string Text, sint FontSize,
-							NLMISC::CRGBA Color, bool Shadow)
+							NLMISC::CRGBA Color, bool Shadow, bool ShadowOutline)
 							:CViewBase(TCtorParam())
 	{
 		_Id = id;
@@ -120,6 +119,7 @@ namespace NLGUI
 		_FontSize = FontSize + CWidgetManager::getInstance()->getSystemOption( CWidgetManager::OptionAddCoefFont).getValSInt32();
 		_Color = Color;
 		_Shadow = Shadow;
+		_ShadowOutline = ShadowOutline;
 		setText(Text);
 		computeFontSize ();
 	}
@@ -159,6 +159,7 @@ namespace NLGUI
 		_FontSize = vt._FontSize;
 		_Color = vt._Color;
 		_Shadow = vt._Shadow;
+		_ShadowOutline = vt._ShadowOutline;
 		_ShadowColor = vt._ShadowColor;
 
 		_MultiLine = false;
@@ -225,6 +226,11 @@ namespace NLGUI
 			return toString( _Shadow );
 		}
 		else
+		if( name == "shadow_outline" )
+		{
+			return toString( _ShadowOutline );
+		}
+		else
 		if( name == "shadow_color" )
 		{
 			return toString( _ShadowColor );
@@ -360,6 +366,14 @@ namespace NLGUI
 			return true;
 		}
 		else
+		if( name == "shadow_outline" )
+		{
+			bool b;
+			if( fromString( value, b ) )
+				_ShadowOutline = b;
+			return true;
+		}
+		else
 		if( name == "shadow_color" )
 		{
 			CRGBA c;
@@ -520,6 +534,7 @@ namespace NLGUI
 			).c_str() );
 
 		xmlSetProp( node, BAD_CAST "shadow", BAD_CAST toString( _Shadow ).c_str() );
+		xmlSetProp( node, BAD_CAST "shadow_outline", BAD_CAST toString( _ShadowOutline ).c_str() );
 		xmlSetProp( node, BAD_CAST "shadow_color", BAD_CAST toString( _ShadowColor ).c_str() );
 		xmlSetProp( node, BAD_CAST "multi_line", BAD_CAST toString( _MultiLine ).c_str() );
 
@@ -604,6 +619,11 @@ namespace NLGUI
 		if (prop)
 			_Shadow = convertBool(prop);
 
+		prop = (char*) xmlGetProp( cur, (xmlChar*)"shadow_outline" );
+		_ShadowOutline = false;
+		if (prop)
+			_ShadowOutline = convertBool(prop);
+
 		prop= (char*) xmlGetProp( cur, (xmlChar*)"shadow_color" );
 		_ShadowColor = CRGBA(0,0,0,255);
 		if (prop)
@@ -864,6 +884,7 @@ namespace NLGUI
 
 			TextContext->setHotSpot (UTextContext::BottomLeft);
 			TextContext->setShaded (_Shadow);
+			TextContext->setShadeOutline (_ShadowOutline);
 			TextContext->setShadeColor (shcol);
 			TextContext->setFontSize (_FontSize);
 
@@ -978,6 +999,7 @@ namespace NLGUI
 
 			TextContext->setHotSpot (UTextContext::BottomLeft);
 			TextContext->setShaded (_Shadow);
+			TextContext->setShadeOutline (_ShadowOutline);
 			TextContext->setShadeColor (shcol);
 			TextContext->setFontSize (_FontSize);
 
@@ -1146,6 +1168,14 @@ namespace NLGUI
 		invalidateContent();
 	}
 
+	// ***************************************************************************
+	void CViewText::setShadowOutline (bool bShadowOutline)
+	{
+		_ShadowOutline = bShadowOutline;
+		computeFontSize ();
+		invalidateContent();
+	}
+
 	// ***************************************************************************
 	void CViewText::setShadowColor(const NLMISC::CRGBA & color)
 	{
@@ -1647,6 +1677,7 @@ namespace NLGUI
 
 		TextContext->setHotSpot (UTextContext::BottomLeft);
 		TextContext->setShaded (_Shadow);
+		TextContext->setShadeOutline (_ShadowOutline);
 		TextContext->setFontSize (_FontSize);
 
 		// default state
@@ -1814,9 +1845,18 @@ namespace NLGUI
 		if (_AutoClamp)
 		{
 			CViewBase::updateCoords ();
-			if (_Parent)
+
+			// If there's no parent, try the parent of the parent element.
+			// Since we will be under the same group
+			CInterfaceGroup *parent = _Parent;
+			if( parent == NULL )
+			{
+				if( _ParentElm != NULL )
+					parent = _ParentElm->getParent();
+			}
+
+			if (parent)
 			{
-				CInterfaceGroup *parent = _Parent;
 				// avoid resizing parents to compute the limiter
 				while (parent && (parent->getResizeFromChildW() || parent->isGroupList() ))
 				{
@@ -1958,6 +1998,7 @@ namespace NLGUI
 		NL3D::UTextContext *TextContext = CViewRenderer::getTextContext();
 		TextContext->setHotSpot (UTextContext::BottomLeft);
 		TextContext->setShaded (_Shadow);
+		TextContext->setShadeOutline (_ShadowOutline);
 		TextContext->setFontSize (_FontSize);
 	//	CViewRenderer &rVR = *CViewRenderer::getInstance();
 		height = getFontHeight();
@@ -2089,6 +2130,7 @@ namespace NLGUI
 		// setup the text context
 		TextContext->setHotSpot (UTextContext::BottomLeft);
 		TextContext->setShaded (_Shadow);
+		TextContext->setShadeOutline (_ShadowOutline);
 		TextContext->setFontSize (_FontSize);
 		 // find the line where the character is
 	//	CViewRenderer &rVR = *CViewRenderer::getInstance();
@@ -2363,6 +2405,7 @@ namespace NLGUI
 		NL3D::UTextContext *TextContext = CViewRenderer::getTextContext();
 		TextContext->setHotSpot (UTextContext::BottomLeft);
 		TextContext->setShaded (_Shadow);
+		TextContext->setShadeOutline (_ShadowOutline);
 		TextContext->setFontSize (_FontSize);
 
 		TCharPos linePos = 0;
@@ -2447,6 +2490,7 @@ namespace NLGUI
 			NL3D::UTextContext *TextContext = CViewRenderer::getTextContext();
 			TextContext->setHotSpot (UTextContext::BottomLeft);
 			TextContext->setShaded (_Shadow);
+			TextContext->setShadeOutline (_ShadowOutline);
 			TextContext->setFontSize (_FontSize);
 
 			// Current position in text
@@ -2498,12 +2542,13 @@ namespace NLGUI
 		NL3D::UTextContext *TextContext = CViewRenderer::getTextContext();
 		TextContext->setHotSpot (UTextContext::BottomLeft);
 		TextContext->setShaded (_Shadow);
+		TextContext->setShadeOutline (_ShadowOutline);
 		TextContext->setFontSize (_FontSize);
 
 		// Letter size
 		UTextContext::CStringInfo si = TextContext->getStringInfo(ucstring("|")); // for now we can't now that directly from UTextContext
-		_FontHeight = (uint) si.StringHeight + (_Shadow?1:0);
-		_FontLegHeight = (uint) si.StringLine + (_Shadow?1:0);
+		_FontHeight = (uint) si.StringHeight; // + (_Shadow?(_ShadowOutline?2:1):0);
+		_FontLegHeight = (uint) si.StringLine; // + (_Shadow?(_ShadowOutline?2:1):0);
 
 		// Space width
 		si = TextContext->getStringInfo(ucstring(" "));
@@ -2789,7 +2834,8 @@ namespace NLGUI
 				pTooltip->setId(_Id+"_tt"+toString(i));
 				pTooltip->setAvoidResizeParent(avoidResizeParent());
 				pTooltip->setRenderLayer(getRenderLayer());
-				pTooltip->setDefaultContextHelp(CI18N::get(tempTooltips[i].toString()));
+				bool isI18N = tempTooltips[i].size() >= 2 && tempTooltips[i][0] == 'u' && tempTooltips[i][1] == 'i';
+				pTooltip->setDefaultContextHelp(isI18N ? CI18N::get(tempTooltips[i].toString()) : tempTooltips[i]);
 				pTooltip->setParentPos(this);
 				pTooltip->setParentPosRef(Hotspot_BR);
 				pTooltip->setPosRef(Hotspot_BR);
@@ -2960,6 +3006,7 @@ namespace NLGUI
 		f.serial(_SpaceWidth);
 		f.serial(_Color);
 		f.serial(_Shadow);
+		f.serial(_ShadowOutline);
 		f.serialEnum(_CaseMode);
 		f.serial(_ShadowColor);
 		f.serial(_LineMaxW);
diff --git a/code/nel/src/gui/widget_manager.cpp b/code/nel/src/gui/widget_manager.cpp
index 16357d373..b9efd50d5 100644
--- a/code/nel/src/gui/widget_manager.cpp
+++ b/code/nel/src/gui/widget_manager.cpp
@@ -34,8 +34,8 @@
 #include "nel/gui/interface_expr.h"
 #include "nel/gui/reflect_register.h"
 #include "nel/gui/editor_selection_watcher.h"
-#include "nel/gui/widget_addition_watcher.h"
 #include "nel/misc/events.h"
+#include "nel/gui/root_group.h"
 
 namespace NLGUI
 {
@@ -1036,12 +1036,14 @@ namespace NLGUI
 		setCapturePointerLeft(NULL);
 		setCapturePointerRight(NULL);
 		_CapturedView = NULL;
-		
+
 		resetColorProps();
 		resetAlphaRolloverSpeedProps();
 		resetGlobalAlphasProps();
 
 		activeAnims.clear();
+
+		editorSelection.clear();
 	}
 
 
@@ -1186,6 +1188,7 @@ namespace NLGUI
 					vtDst->setColor (vtSrc->getColor());
 					vtDst->setModulateGlobalColor(vtSrc->getModulateGlobalColor());
 					vtDst->setShadow(vtSrc->getShadow());
+					vtDst->setShadowOutline(vtSrc->getShadowOutline());
 					vtDst->setShadowColor(vtSrc->getShadowColor());
 					vtDst->setCaseMode(vtSrc->getCaseMode());
 					vtDst->setUnderlined(vtSrc->getUnderlined());
@@ -2039,6 +2042,12 @@ namespace NLGUI
 						}
 					}
 
+					if( draggedElement != NULL )
+					{
+						CInterfaceElement *e = draggedElement;
+						static_cast< CViewBase* >( e )->draw();
+					}
+
 					if ( (nPriority == WIN_PRIORITY_WORLD_SPACE) && !camera.empty())
 					{
 						driver->setMatrixMode2D11();
@@ -2072,9 +2081,9 @@ namespace NLGUI
 
 		if( CInterfaceElement::getEditorMode() )
 		{
-			if( !currentEditorSelection.empty() )
+			for( int i = 0; i < editorSelection.size(); i++ )
 			{
-				CInterfaceElement *e = getElementFromId( currentEditorSelection );
+				CInterfaceElement *e = getElementFromId( editorSelection[ i ] );
 				if( e != NULL )
 					e->drawHighlight();
 			}
@@ -2096,276 +2105,328 @@ namespace NLGUI
 			if( activeAnims[i]->isDisableButtons() )
 				return false;
 
+		bool handled = false;
+
+		CViewPointer *_Pointer = static_cast< CViewPointer* >( getPointer() );
+
 		if( evnt.getType() == CEventDescriptor::system )
 		{
-			const CEventDescriptorSystem &systemEvent = reinterpret_cast< const CEventDescriptorSystem& >( evnt );
-			if( systemEvent.getEventTypeExtended() == CEventDescriptorSystem::setfocus )
+			handleSystemEvent( evnt );
+		}
+		else
+		if (evnt.getType() == CEventDescriptor::key)
+		{
+			handled = handleKeyboardEvent( evnt );
+		}
+		else if (evnt.getType() == CEventDescriptor::mouse )
+		{
+			handled = handleMouseEvent( evnt );
+		}
+
+		CDBManager::getInstance()->flushObserverCalls();
+
+		return handled;
+	}
+
+	bool CWidgetManager::handleSystemEvent( const CEventDescriptor &evnt )
+	{
+		const CEventDescriptorSystem &systemEvent = reinterpret_cast< const CEventDescriptorSystem& >( evnt );
+		if( systemEvent.getEventTypeExtended() == CEventDescriptorSystem::setfocus )
+		{
+			if( getCapturePointerLeft() != NULL )
 			{
-				if( getCapturePointerLeft() != NULL )
-				{
-					getCapturePointerLeft()->handleEvent( evnt );
-					setCapturePointerLeft( NULL );
-				}
+				getCapturePointerLeft()->handleEvent( evnt );
+				setCapturePointerLeft( NULL );
+			}
 
-				if( getCapturePointerRight() != NULL )
-				{
-					getCapturePointerRight()->handleEvent( evnt );
-					setCapturePointerRight( NULL );
-				}
+			if( getCapturePointerRight() != NULL )
+			{
+				getCapturePointerRight()->handleEvent( evnt );
+				setCapturePointerRight( NULL );
+			}
 
-				if( _CapturedView != NULL )
-				{
-					_CapturedView->handleEvent( evnt );
-					_CapturedView = NULL;
-				}
+			if( _CapturedView != NULL )
+			{
+				_CapturedView->handleEvent( evnt );
+				_CapturedView = NULL;
 			}
 		}
 
-		bool handled = false;
+		return true;
+	}
 
-		CViewPointer *_Pointer = static_cast< CViewPointer* >( getPointer() );
+	bool CWidgetManager::handleKeyboardEvent( const CEventDescriptor &evnt )
+	{
+		bool handled = false;
+		
+		CEventDescriptorKey &eventDesc = (CEventDescriptorKey&)evnt;
 
-		if (evnt.getType() == CEventDescriptor::key)
-		{
-			CEventDescriptorKey &eventDesc = (CEventDescriptorKey&)evnt;
-			//_LastEventKeyDesc = eventDesc;
+		//_LastEventKeyDesc = eventDesc;
 
-			// Any Key event disable the ContextHelp
-			disableContextHelp();
+		// Any Key event disable the ContextHelp
+		disableContextHelp();
 
-			// Hide menu if the key is pushed
-	//		if ((eventDesc.getKeyEventType() == CEventDescriptorKey::keydown) && !_ModalStack.empty() && !eventDesc.getKeyAlt() && !eventDesc.getKeyCtrl() && !eventDesc.getKeyShift())
-			// Hide menu (or popup menu) is ESCAPE pressed
-			if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyESCAPE )
+		// Hide menu if the key is pushed
+//		if ((eventDesc.getKeyEventType() == CEventDescriptorKey::keydown) && !_ModalStack.empty() && !eventDesc.getKeyAlt() && !eventDesc.getKeyCtrl() && !eventDesc.getKeyShift())
+		// Hide menu (or popup menu) is ESCAPE pressed
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyESCAPE )
+		{
+			if( hasModal() )
 			{
-				if( hasModal() )
-				{
-					SModalWndInfo mwi = getModal();
-					if (mwi.ModalExitKeyPushed)
-						disableModalWindow();
-				}
+				SModalWndInfo mwi = getModal();
+				if (mwi.ModalExitKeyPushed)
+					disableModalWindow();
 			}
+		}
 
-			// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
-			if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyESCAPE )
+		// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyESCAPE )
+		{
+			// Get the last escapable active top window. NB: this is ergonomically better.
+			CInterfaceGroup	*win= getLastEscapableTopWindow();
+			if( win )
 			{
-				// Get the last escapable active top window. NB: this is ergonomically better.
-				CInterfaceGroup	*win= getLastEscapableTopWindow();
-				if( win )
+				// If the window is a modal, must pop it.
+				if( dynamic_cast<CGroupModal*>(win) )
 				{
-					// If the window is a modal, must pop it.
-					if( dynamic_cast<CGroupModal*>(win) )
-					{
-						if(!win->getAHOnEscape().empty())
-							CAHManager::getInstance()->runActionHandler(win->getAHOnEscape(), win, win->getAHOnEscapeParams());
-						popModalWindow();
-						handled= true;
-					}
-					// else just disable it.
-					// Special case: leave the escape Key to the CaptureKeyboard .
-					else if( !getCaptureKeyboard() )
-					{
-						if(!win->getAHOnEscape().empty())
-							CAHManager::getInstance()->runActionHandler(win->getAHOnEscape(), win, win->getAHOnEscapeParams());
-						win->setActive(false);
-						handled= true;
-					}
+					if(!win->getAHOnEscape().empty())
+						CAHManager::getInstance()->runActionHandler(win->getAHOnEscape(), win, win->getAHOnEscapeParams());
+					popModalWindow();
+					handled= true;
+				}
+				// else just disable it.
+				// Special case: leave the escape Key to the CaptureKeyboard .
+				else if( !getCaptureKeyboard() )
+				{
+					if(!win->getAHOnEscape().empty())
+						CAHManager::getInstance()->runActionHandler(win->getAHOnEscape(), win, win->getAHOnEscapeParams());
+					win->setActive(false);
+					handled= true;
 				}
 			}
+		}
 
-			// Manage complex "Enter"
-			if (eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyRETURN)
+		// Manage complex "Enter"
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyRETURN && !eventDesc.getKeyCtrl() )
+		{
+			// If the  top window has Enter AH
+			CInterfaceGroup	*tw= getTopWindow();
+			if(tw && !tw->getAHOnEnter().empty())
 			{
-				// If the  top window has Enter AH
-				CInterfaceGroup	*tw= getTopWindow();
-				if(tw && !tw->getAHOnEnter().empty())
+				// if the captured keyboard is in this Modal window, then must handle him in priority
+				if( getCaptureKeyboard() && getCaptureKeyboard()->getRootWindow()==tw)
 				{
-					// if the captured keyboard is in this Modal window, then must handle him in priority
-					if( getCaptureKeyboard() && getCaptureKeyboard()->getRootWindow()==tw)
-					{
-						bool result = getCaptureKeyboard()->handleEvent(evnt);
-						CDBManager::getInstance()->flushObserverCalls();
-						return result;
-					}
-					else
-					{
-						// The window or modal control the OnEnter. Execute, and don't go to the chat.
-						CAHManager::getInstance()->runActionHandler(tw->getAHOnEnter(), tw, tw->getAHOnEnterParams());
-						handled= true;
-					}
+					bool result = getCaptureKeyboard()->handleEvent(evnt);
+					CDBManager::getInstance()->flushObserverCalls();
+					return result;
 				}
+				else
+				{
+					// The window or modal control the OnEnter. Execute, and don't go to the chat.
+					CAHManager::getInstance()->runActionHandler(tw->getAHOnEnter(), tw, tw->getAHOnEnterParams());
+					handled= true;
+				}
+			}
 
-				// else the 'return' key bring back to the last edit box (if possible)
-				CCtrlBase *oldCapture = getOldCaptureKeyboard() ? getOldCaptureKeyboard() : getDefaultCaptureKeyboard();
-				if ( getCaptureKeyboard() == NULL && oldCapture && !handled)
+			// else the 'return' key bring back to the last edit box (if possible)
+			CCtrlBase *oldCapture = getOldCaptureKeyboard() ? getOldCaptureKeyboard() : getDefaultCaptureKeyboard();
+			if ( getCaptureKeyboard() == NULL && oldCapture && !handled)
+			{
+				/* If the editbox does not want to recover focus, then abort. This possibility is normaly avoided
+					through setCaptureKeyboard() which already test getRecoverFocusOnEnter(), but it is still possible
+					for the default capture (main chat) or the old captured window to not want to recover
+					(temporary Read Only chat for instance)
+				*/
+				if(!dynamic_cast<CGroupEditBoxBase*>(oldCapture) ||
+					dynamic_cast<CGroupEditBoxBase*>(oldCapture)->getRecoverFocusOnEnter())
 				{
-					/* If the editbox does not want to recover focus, then abort. This possibility is normaly avoided
-						through setCaptureKeyboard() which already test getRecoverFocusOnEnter(), but it is still possible
-						for the default capture (main chat) or the old captured window to not want to recover
-						(temporary Read Only chat for instance)
-					*/
-					if(!dynamic_cast<CGroupEditBoxBase*>(oldCapture) ||
-						dynamic_cast<CGroupEditBoxBase*>(oldCapture)->getRecoverFocusOnEnter())
+					setCaptureKeyboard( oldCapture );
+					notifyElementCaptured(getCaptureKeyboard() );
+					// make sure all parent windows are active
+					CCtrlBase *cb = getCaptureKeyboard();
+					CGroupContainer *lastContainer = NULL;
+					for(;;)
 					{
-						setCaptureKeyboard( oldCapture );
-						notifyElementCaptured(getCaptureKeyboard() );
-						// make sure all parent windows are active
-						CCtrlBase *cb = getCaptureKeyboard();
-						CGroupContainer *lastContainer = NULL;
-						for(;;)
+						CGroupContainer *gc = dynamic_cast<CGroupContainer *>(cb);
+						if (gc) lastContainer = gc;
+						cb->forceOpen();
+						if (cb->getParent())
 						{
-							CGroupContainer *gc = dynamic_cast<CGroupContainer *>(cb);
-							if (gc) lastContainer = gc;
-							cb->forceOpen();
-							if (cb->getParent())
-							{
-								cb = cb->getParent();
-							}
-							else
-							{
-								cb->invalidateCoords();
-								break;
-							}
+							cb = cb->getParent();
 						}
-						if (lastContainer)
+						else
 						{
-							setTopWindow(lastContainer);
-							lastContainer->enableBlink(1);
+							cb->invalidateCoords();
+							break;
 						}
-						handled= true;
 					}
+					if (lastContainer)
+					{
+						setTopWindow(lastContainer);
+						lastContainer->enableBlink(1);
+					}
+					handled= true;
 				}
 			}
+		}
 
-			// General case: handle it in the Captured keyboard
-			if ( getCaptureKeyboard() != NULL && !handled)
-			{
-				bool result = getCaptureKeyboard()->handleEvent(evnt);
-				CDBManager::getInstance()->flushObserverCalls();
-				return result;
-			}
-
-			lastKeyEvent = eventDesc;
+		// General case: handle it in the Captured keyboard
+		if ( getCaptureKeyboard() != NULL && !handled)
+		{
+			bool result = getCaptureKeyboard()->handleEvent(evnt);
+			CDBManager::getInstance()->flushObserverCalls();
+			return result;
 		}
 
-		//////////////////////////////////////////////// Keyboard handling ends here ////////////////////////////////////
+		lastKeyEvent = eventDesc;
 
-		else if (evnt.getType() == CEventDescriptor::mouse )
-		{
-			CEventDescriptorMouse &eventDesc = (CEventDescriptorMouse&)evnt;
+		return handled;
+	}
 
-			if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown )
-				_Pointer->setButtonState( static_cast< NLMISC::TMouseButton >( _Pointer->getButtonState() | NLMISC::leftButton ) );
-			else
-			if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown )
-				_Pointer->setButtonState( static_cast< NLMISC::TMouseButton >( _Pointer->getButtonState() | NLMISC::rightButton ) );
-			else
-			if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftup )
-				_Pointer->setButtonState( static_cast< NLMISC::TMouseButton >( _Pointer->getButtonState() & ~NLMISC::leftButton ) );
-			if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightup )
-				_Pointer->setButtonState( static_cast< NLMISC::TMouseButton >( _Pointer->getButtonState() & ~NLMISC::rightButton ) );
+	bool CWidgetManager::handleMouseEvent( const CEventDescriptor &evnt )
+	{
+		bool handled = false;
 
-			if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mousemove )
-				handleMouseMoveEvent( eventDesc );
+		CEventDescriptorMouse &eventDesc = (CEventDescriptorMouse&)evnt;
 
-			eventDesc.setX( _Pointer->getX() );
-			eventDesc.setY( _Pointer->getY() );
+		if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown )
+			_Pointer->setButtonState( static_cast< NLMISC::TMouseButton >( _Pointer->getButtonState() | NLMISC::leftButton ) );
+		else
+		if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown )
+			_Pointer->setButtonState( static_cast< NLMISC::TMouseButton >( _Pointer->getButtonState() | NLMISC::rightButton ) );
+		else
+		if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftup )
+			_Pointer->setButtonState( static_cast< NLMISC::TMouseButton >( _Pointer->getButtonState() & ~NLMISC::leftButton ) );
+		if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightup )
+			_Pointer->setButtonState( static_cast< NLMISC::TMouseButton >( _Pointer->getButtonState() & ~NLMISC::rightButton ) );
 
-			if( isMouseHandlingEnabled() )
-			{
-				// First thing to do : Capture handling
-				if ( getCapturePointerLeft() != NULL)
-					handled|= getCapturePointerLeft()->handleEvent(evnt);
+		if( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mousemove )
+			handleMouseMoveEvent( eventDesc );
 
-				if ( getCapturePointerRight() != NULL &&
-					getCapturePointerLeft() != getCapturePointerRight() )
-					handled|= getCapturePointerRight()->handleEvent(evnt);
+		eventDesc.setX( _Pointer->getX() );
+		eventDesc.setY( _Pointer->getY() );
 
-				if( _CapturedView != NULL )
-					_CapturedView->handleEvent( evnt );
+		if( CInterfaceElement::getEditorMode() )
+		{
+			// Let's pretend we've handled the event... or actually we have!
+			if( ( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown ) ||
+				( eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightup ) )
+				return true;
+		}
 
-				CInterfaceGroup *ptr = getWindowUnder (eventDesc.getX(), eventDesc.getY());
-				setCurrentWindowUnder( ptr );
+		if( isMouseHandlingEnabled() )
+		{
+			// First thing to do : Capture handling
+			if ( getCapturePointerLeft() != NULL)
+				handled|= getCapturePointerLeft()->handleEvent(evnt);
 
-				// Any Mouse event but move disable the ContextHelp
-				if(eventDesc.getEventTypeExtended() != CEventDescriptorMouse::mousemove)
-				{
-					disableContextHelp();
-				}
+			if ( getCapturePointerRight() != NULL &&
+				getCapturePointerLeft() != getCapturePointerRight() )
+				handled|= getCapturePointerRight()->handleEvent(evnt);
+
+			if( _CapturedView != NULL &&
+				_CapturedView != getCapturePointerLeft() &&
+				_CapturedView != getCapturePointerRight() )
+				_CapturedView->handleEvent( evnt );
+
+			CInterfaceGroup *ptr = getWindowUnder (eventDesc.getX(), eventDesc.getY());
+			setCurrentWindowUnder( ptr );
 
-				// get the group under the mouse
-				CInterfaceGroup *pNewCurrentWnd = getCurrentWindowUnder();
-				setMouseOverWindow( pNewCurrentWnd != NULL );
+			// Any Mouse event but move disable the ContextHelp
+			if(eventDesc.getEventTypeExtended() != CEventDescriptorMouse::mousemove)
+			{
+				disableContextHelp();
+			}
 
+			// get the group under the mouse
+			CInterfaceGroup *pNewCurrentWnd = getCurrentWindowUnder();
+			setMouseOverWindow( pNewCurrentWnd != NULL );
 
-				NLMISC::CRefPtr<CGroupModal>	clickedOutModalWindow;
 
-				// modal special features
-				if ( hasModal() )
+			NLMISC::CRefPtr<CGroupModal>	clickedOutModalWindow;
+
+			// modal special features
+			if ( hasModal() )
+			{
+				CWidgetManager::SModalWndInfo mwi = getModal();
+				if(mwi.ModalWindow)
 				{
-					CWidgetManager::SModalWndInfo mwi = getModal();
-					if(mwi.ModalWindow)
+					// If we are not in "click out" mode so we dont handle controls other than those of the modal
+					if (pNewCurrentWnd != mwi.ModalWindow && !mwi.ModalExitClickOut)
 					{
-						// If we are not in "click out" mode so we dont handle controls other than those of the modal
-						if (pNewCurrentWnd != mwi.ModalWindow && !mwi.ModalExitClickOut)
-						{
-							pNewCurrentWnd = NULL;
-						}
-						else
+						pNewCurrentWnd = NULL;
+					}
+					else
+					{
+						// If there is a handler on click out launch it
+						if (pNewCurrentWnd != mwi.ModalWindow)
+							if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown ||
+								(eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown))
+								if (!mwi.ModalHandlerClickOut.empty())
+									CAHManager::getInstance()->runActionHandler(mwi.ModalHandlerClickOut,NULL,mwi.ModalClickOutParams);
+
+						// If the current window is not the modal and if must quit on click out
+						if(pNewCurrentWnd != mwi.ModalWindow && mwi.ModalExitClickOut)
 						{
-							// If there is a handler on click out launch it
-							if (pNewCurrentWnd != mwi.ModalWindow)
-								if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown ||
-									(eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown))
-									if (!mwi.ModalHandlerClickOut.empty())
-										CAHManager::getInstance()->runActionHandler(mwi.ModalHandlerClickOut,NULL,mwi.ModalClickOutParams);
-
-							// If the current window is not the modal and if must quit on click out
-							if(pNewCurrentWnd != mwi.ModalWindow && mwi.ModalExitClickOut)
-							{
-								// NB: don't force handle==true because to quit a modal does not avoid other actions
+							// NB: don't force handle==true because to quit a modal does not avoid other actions
 
-								// quit if click outside
-								if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown ||
-									(eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown))
+							// quit if click outside
+							if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown ||
+								(eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown))
+							{
+								clickedOutModalWindow = dynamic_cast<CGroupModal *>((CInterfaceGroup*)mwi.ModalWindow);
+								// disable the modal
+								popModalWindow();
+								if ( hasModal() )
 								{
-									clickedOutModalWindow = dynamic_cast<CGroupModal *>((CInterfaceGroup*)mwi.ModalWindow);
-									// disable the modal
-									popModalWindow();
-									if ( hasModal() )
-									{
-										// don't handle event unless it is a previous modal window
-										if( !isPreviousModal( pNewCurrentWnd ) )
-											pNewCurrentWnd = NULL; // can't handle event before we have left all modal windows
-									}
-									movePointer (0,0); // Reget controls under pointer
+									// don't handle event unless it is a previous modal window
+									if( !isPreviousModal( pNewCurrentWnd ) )
+										pNewCurrentWnd = NULL; // can't handle event before we have left all modal windows
 								}
+								movePointer (0,0); // Reget controls under pointer
 							}
 						}
 					}
 				}
+			}
+
+			// Manage LeftClick.
+			if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown)
+			{
+				if ((pNewCurrentWnd != NULL) && (!hasModal()) && (pNewCurrentWnd->getOverlappable()))
+				{
+					CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(pNewCurrentWnd);
+					if (pGC != NULL)
+					{
+						if (!pGC->isGrayed()) setTopWindow(pNewCurrentWnd);
+					}
+					else
+					{
+						setTopWindow(pNewCurrentWnd);
+					}
+				}
 
-				// Manage LeftClick.
-				if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown)
+				bool captured = false;
+
+				// must not capture a new element if a sheet is currentlty being dragged.
+				// This may happen when alt-tab has been used => the sheet is dragged but the left button is up
+				if (!CCtrlDraggable::getDraggedSheet())
 				{
-					if ((pNewCurrentWnd != NULL) && (!hasModal()) && (pNewCurrentWnd->getOverlappable()))
+					if( CInterfaceElement::getEditorMode() && _GroupSelection )
 					{
-						CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(pNewCurrentWnd);
-						if (pGC != NULL)
+						for( sint32 i = _GroupsUnderPointer.size() - 1; i >= 0; i-- )
 						{
-							if (!pGC->isGrayed()) setTopWindow(pNewCurrentWnd);
-						}
-						else
-						{
-							setTopWindow(pNewCurrentWnd);
+							CInterfaceGroup *g = _GroupsUnderPointer[ i ];
+							if( ( g != NULL ) && ( g->isInGroup( pNewCurrentWnd ) ) )
+							{
+								_CapturedView = g;
+								captured = true;
+								break;
+							}
 						}
 					}
 
-					bool captured = false;
-
-					// must not capture a new element if a sheet is currentlty being dragged.
-					// This may happen when alt-tab has been used => the sheet is dragged but the left button is up
-					if (!CCtrlDraggable::getDraggedSheet())
+					if( !captured )
 					{
 						// Take the top most control.
 						uint nMaxDepth = 0;
@@ -2375,6 +2436,9 @@ namespace NLGUI
 							CCtrlBase	*ctrl= _CtrlsUnderPointer[i];
 							if (ctrl && ctrl->isCapturable() && ctrl->isInGroup( pNewCurrentWnd ) )
 							{
+								if( CInterfaceElement::getEditorMode() && !ctrl->isEditorSelectable() )
+									continue;
+
 								uint d = ctrl->getDepth( pNewCurrentWnd );
 								if (d > nMaxDepth)
 								{
@@ -2384,168 +2448,184 @@ namespace NLGUI
 								}
 							}
 						}
+					}
 
-						if( CInterfaceElement::getEditorMode() && !captured )
+					if( CInterfaceElement::getEditorMode() && !captured )
+					{
+						for( sint32 i = _ViewsUnderPointer.size()-1; i >= 0; i-- )
 						{
-							for( sint32 i = _ViewsUnderPointer.size()-1; i >= 0; i-- )
+							CViewBase *v = _ViewsUnderPointer[i];
+							if( ( v != NULL ) && v->isInGroup( pNewCurrentWnd ) )
 							{
-								CViewBase *v = _ViewsUnderPointer[i];
-								if( ( v != NULL ) && v->isInGroup( pNewCurrentWnd ) )
-								{
-									_CapturedView = v;
-									captured = true;
-									break;
-								}
-							}
-						}
+								if( CInterfaceElement::getEditorMode() && !v->isEditorSelectable() )
+									continue;
 
-						notifyElementCaptured( getCapturePointerLeft() );
-						if (clickedOutModalWindow && !clickedOutModalWindow->OnPostClickOut.empty())
-						{
-							CAHManager::getInstance()->runActionHandler(clickedOutModalWindow->OnPostClickOut, getCapturePointerLeft(), clickedOutModalWindow->OnPostClickOutParams);
+								_CapturedView = v;
+								captured = true;
+								break;
+							}
 						}
 					}
-					//if found
-					if ( captured )
-					{
-						// consider clicking on a control implies handling of the event.
-						handled= true;
 
-						// handle the capture
-						if( getCapturePointerLeft() != NULL )
-							getCapturePointerLeft()->handleEvent(evnt);
-						else
-							_CapturedView->handleEvent( evnt );
+					notifyElementCaptured( getCapturePointerLeft() );
+					if (clickedOutModalWindow && !clickedOutModalWindow->OnPostClickOut.empty())
+					{
+						CAHManager::getInstance()->runActionHandler(clickedOutModalWindow->OnPostClickOut, getCapturePointerLeft(), clickedOutModalWindow->OnPostClickOutParams);
 					}
 				}
+				//if found
+				if ( captured )
+				{
+					// consider clicking on a control implies handling of the event.
+					handled= true;
+
+					if( getCapturePointerLeft() != NULL )
+						_CapturedView = getCapturePointerLeft();
+
+					// handle the capture
+					_CapturedView->handleEvent( evnt );
+				}
+				else
+				{
+					if( CInterfaceElement::getEditorMode() )
+						clearEditorSelection();
+				}
+			}
 
-				// Manage RightClick
-				if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown)
+			// Manage RightClick
+			if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightdown)
+			{
+				if ((pNewCurrentWnd != NULL) && (!hasModal()) && (pNewCurrentWnd->getOverlappable()))
 				{
-					if ((pNewCurrentWnd != NULL) && (!hasModal()) && (pNewCurrentWnd->getOverlappable()))
+					CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(pNewCurrentWnd);
+					if (pGC != NULL)
 					{
-						CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(pNewCurrentWnd);
-						if (pGC != NULL)
-						{
-							if (!pGC->isGrayed()) setTopWindow(pNewCurrentWnd);
-						}
-						else
-						{
-							setTopWindow(pNewCurrentWnd);
-						}
+						if (!pGC->isGrayed()) setTopWindow(pNewCurrentWnd);
 					}
+					else
+					{
+						setTopWindow(pNewCurrentWnd);
+					}
+				}
 
-					// Take the top most control.
+				// Take the top most control.
+				{
+					uint nMaxDepth = 0;
+					const std::vector< CCtrlBase* >& _CtrlsUnderPointer = getCtrlsUnderPointer();
+					for (sint32 i = (sint32)_CtrlsUnderPointer.size()-1; i >= 0; i--)
 					{
-						uint nMaxDepth = 0;
-						const std::vector< CCtrlBase* >& _CtrlsUnderPointer = getCtrlsUnderPointer();
-						for (sint32 i = (sint32)_CtrlsUnderPointer.size()-1; i >= 0; i--)
+						CCtrlBase	*ctrl= _CtrlsUnderPointer[i];
+						if (ctrl && ctrl->isCapturable() && ctrl->isInGroup( pNewCurrentWnd ) )
 						{
-							CCtrlBase	*ctrl= _CtrlsUnderPointer[i];
-							if (ctrl && ctrl->isCapturable() && ctrl->isInGroup( pNewCurrentWnd ) )
+							uint d = ctrl->getDepth( pNewCurrentWnd );
+							if (d > nMaxDepth)
 							{
-								uint d = ctrl->getDepth( pNewCurrentWnd );
-								if (d > nMaxDepth)
-								{
-									nMaxDepth = d;
-									setCapturePointerRight( ctrl );
-								}
+								nMaxDepth = d;
+								setCapturePointerRight( ctrl );
 							}
 						}
-						notifyElementCaptured( getCapturePointerRight() );
-						if (clickedOutModalWindow && !clickedOutModalWindow->OnPostClickOut.empty())
-						{
-							CAHManager::getInstance()->runActionHandler(clickedOutModalWindow->OnPostClickOut, getCapturePointerRight(), clickedOutModalWindow->OnPostClickOutParams);
-						}
 					}
-					//if found
-					if ( getCapturePointerRight() != NULL)
+					notifyElementCaptured( getCapturePointerRight() );
+					if (clickedOutModalWindow && !clickedOutModalWindow->OnPostClickOut.empty())
 					{
-						// handle the capture
-						handled |= getCapturePointerRight()->handleEvent(evnt);
+						CAHManager::getInstance()->runActionHandler(clickedOutModalWindow->OnPostClickOut, getCapturePointerRight(), clickedOutModalWindow->OnPostClickOutParams);
 					}
 				}
+				//if found
+				if ( getCapturePointerRight() != NULL)
+				{
+					// handle the capture
+					handled |= getCapturePointerRight()->handleEvent(evnt);
+				}
+			}
 
 
-				if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightup)
-				{			
-					if (!handled)
-						if (pNewCurrentWnd != NULL)
-							pNewCurrentWnd->handleEvent(evnt);
-					if ( getCapturePointerRight() != NULL)
-					{
-						setCapturePointerRight(NULL);
-						handled= true;
-					}
+			if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightup)
+			{			
+				if (!handled)
+					if (pNewCurrentWnd != NULL)
+						pNewCurrentWnd->handleEvent(evnt);
+				if ( getCapturePointerRight() != NULL)
+				{
+					setCapturePointerRight(NULL);
+					handled= true;
 				}
+			}
 
-				// window handling. if not handled by a control
-				if (!handled)
+			// window handling. if not handled by a control
+			if (!handled)
+			{
+				if (((pNewCurrentWnd != NULL) && !hasModal()) ||
+					((hasModal() && getModal().ModalWindow == pNewCurrentWnd)))
 				{
-					if (((pNewCurrentWnd != NULL) && !hasModal()) ||
-						((hasModal() && getModal().ModalWindow == pNewCurrentWnd)))
+					CEventDescriptorMouse ev2 = eventDesc;
+					sint32 x= eventDesc.getX(), y = eventDesc.getY();
+					if (pNewCurrentWnd)
 					{
-						CEventDescriptorMouse ev2 = eventDesc;
-						sint32 x= eventDesc.getX(), y = eventDesc.getY();
-						if (pNewCurrentWnd)
-						{
-							pNewCurrentWnd->absoluteToRelative (x, y);
-							ev2.setX (x); ev2.setY (y);
-							handled|= pNewCurrentWnd->handleEvent (ev2);
-						}
-
-						// After handle event of a left click, may set window Top if movable (infos etc...)
-						//if( (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown) && pNewCurrentWnd->isMovable() )
-						//	setTopWindow(pNewCurrentWnd);
+						pNewCurrentWnd->absoluteToRelative (x, y);
+						ev2.setX (x); ev2.setY (y);
+						handled|= pNewCurrentWnd->handleEvent (ev2);
 					}
+
+					// After handle event of a left click, may set window Top if movable (infos etc...)
+					//if( (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftdown) && pNewCurrentWnd->isMovable() )
+					//	setTopWindow(pNewCurrentWnd);
 				}
+			}
 
-				// Put here to let a chance to the window to handle if the capture dont
-				if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftup)
+			// Put here to let a chance to the window to handle if the capture dont
+			if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftup)
+			{
+				if ( getCapturePointerLeft() != NULL)
 				{
-					if ( getCapturePointerLeft() != NULL)
+					if( !handled )
 					{
-						setCapturePointerLeft(NULL);
-						handled = true;
+						CCtrlBase *c = getCapturePointerLeft();
+						c->handleEvent( evnt );
 					}
+
+					setCapturePointerLeft(NULL);
+					handled = true;
 				}
 
+				_CapturedView = NULL;
+				
+				if( CInterfaceElement::getEditorMode() )
+					stopDragging();
+			}
+
 
-				// If the current window is the modal, may Modal quit. Do it after standard event handle
-				if(hasModal() && pNewCurrentWnd == getModal().ModalWindow)
+			// If the current window is the modal, may Modal quit. Do it after standard event handle
+			if(hasModal() && pNewCurrentWnd == getModal().ModalWindow)
+			{
+				// NB: don't force handle==true because to quit a modal does not avoid other actions
+				CWidgetManager::SModalWndInfo mwi = getModal();
+				//  and if must quit on click right
+				if(mwi.ModalExitClickR)
 				{
-					// NB: don't force handle==true because to quit a modal does not avoid other actions
-					CWidgetManager::SModalWndInfo mwi = getModal();
-					//  and if must quit on click right
-					if(mwi.ModalExitClickR)
-					{
-						// quit if click right
-						if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightup)
-							// disable the modal
-							disableModalWindow();
-					}
-
-					//  and if must quit on click left
-					if(mwi.ModalExitClickL)
-					{
-						// quit if click right
-						if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftup)
-							// disable the modal
-							disableModalWindow();
-					}
+					// quit if click right
+					if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouserightup)
+						// disable the modal
+						disableModalWindow();
 				}
 
-				// If the mouse is over a window, always consider the event is taken (avoid click behind)
-				handled|= isMouseOverWindow();
+				//  and if must quit on click left
+				if(mwi.ModalExitClickL)
+				{
+					// quit if click right
+					if (eventDesc.getEventTypeExtended() == CEventDescriptorMouse::mouseleftup)
+						// disable the modal
+						disableModalWindow();
+				}
 			}
-		}
 
-		CDBManager::getInstance()->flushObserverCalls();
+			// If the mouse is over a window, always consider the event is taken (avoid click behind)
+			handled|= isMouseOverWindow();
+		}
 
 		return handled;
 	}
 
-
 	bool CWidgetManager::handleMouseMoveEvent( const CEventDescriptor &eventDesc )
 	{
 		if( getPointer() == NULL )
@@ -2580,8 +2660,76 @@ namespace NLGUI
 			ve.setY( getPointer()->getY() );
 		}
 
+		if( CInterfaceElement::getEditorMode() )
+		{
+			if( ( _CapturedView != NULL ) && ( draggedElement == NULL ) )
+			{
+				startDragging();
+			}
+			else
+			if( draggedElement != NULL )
+			{
+				sint32 dx = newX - oldX;
+				sint32 dy = newY - oldY;
+
+				draggedElement->moveBy( dx, dy );
+			}
+		}
+
+		return true;
+	}
+
+	// ------------------------------------------------------------------------------------------------
+	bool CWidgetManager::startDragging()
+	{
+		CInterfaceElement *e = NULL;
+
+		CInterfaceGroup *g = _CapturedView->getParent();
+		if( g != NULL )
+		{
+			e = g->takeElement( _CapturedView );
+			if( e == NULL )
+			{
+				nlinfo( "Something went horribly wrong :(" );
+				return false;
+			}
+		}
+		else
+			e = _CapturedView;
+
+		e->setParent( NULL );
+		draggedElement = e;
+				
 		return true;
 	}
+
+	void CWidgetManager::stopDragging()
+	{
+		if( draggedElement != NULL )
+		{
+			CInterfaceGroup *g = getGroupUnder( draggedElement->getXReal(), draggedElement->getYReal() );
+			CInterfaceElement *e = draggedElement;
+			CInterfaceGroup *tw = getTopWindow();
+
+			if( g == NULL )
+				g = tw;
+
+			std::string oldid = e->getId();
+			
+			e->setParent( g );
+			e->setIdRecurse( e->getShortId() );
+			e->setParentPos( g );
+			e->setParentSize( g );
+			g->addElement( e );
+
+			e->alignTo( g );
+			//e->setName( "==MARKED==" );
+
+			draggedElement = NULL;
+
+			onWidgetMoved( oldid, e->getId() );
+		}
+	}
 	
 	// ------------------------------------------------------------------------------------------------
 	void CWidgetManager::movePointer (sint32 dx, sint32 dy)
@@ -3211,25 +3359,53 @@ namespace NLGUI
 		}
 	}
 
+	void CWidgetManager::getEditorSelection( std::vector< std::string > &selection )
+	{
+		selection.clear();
+		for( int i = 0; i < editorSelection.size(); i++ )
+			selection.push_back( editorSelection[ i ] );
+	}
 
-	void CWidgetManager::setCurrentEditorSelection( const std::string &name )
+	void CWidgetManager::selectWidget( const std::string &name )
 	{
+		std::vector< std::string >::iterator itr 
+			= std::find( editorSelection.begin(), editorSelection.end(), name );
+
 		CInterfaceElement *e = getElementFromId( name );
-		if( e != NULL )
+		
+		if( itr != editorSelection.end() )
 		{
-			if( !currentEditorSelection.empty() )
+			// If multiselection is on unselect if already selected
+			if( multiSelection )
 			{
-				CInterfaceElement *prev = getElementFromId( currentEditorSelection );
-				if( prev != NULL )
-					prev->setEditorSelected( false );
+				editorSelection.erase( itr );
+				if( e != NULL )
+					e->setEditorSelected( false );
 			}
-			e->setEditorSelected( true );
 		}
 		else
-		if( !name.empty() )
-			return;
-		
-		currentEditorSelection = name;
+		{
+			// Select if not yet selected
+			if( e != NULL )
+			{
+				// If multiselection is off, we can only have 1 widget selected
+				if( !multiSelection )
+				{
+					editorSelection.clear();
+				}
+
+				e->setEditorSelected( true );
+				editorSelection.push_back( name );
+			}
+				
+		}
+
+		notifySelectionWatchers();
+	}
+
+	void CWidgetManager::clearEditorSelection()
+	{
+		editorSelection.clear();
 		notifySelectionWatchers();
 	}
 
@@ -3238,7 +3414,7 @@ namespace NLGUI
 		std::vector< IEditorSelectionWatcher* >::iterator itr = selectionWatchers.begin();
 		while( itr != selectionWatchers.end() )
 		{
-			(*itr)->selectionChanged( currentEditorSelection );
+			(*itr)->selectionChanged();	
 			++itr;
 		}
 	}
@@ -3267,36 +3443,46 @@ namespace NLGUI
 		selectionWatchers.erase( itr );
 	}
 
-	void CWidgetManager::notifyAdditionWatchers( const std::string &widgetName )
+	void CWidgetManager::onWidgetAdded( const std::string &id )
+	{
+		std::vector< IWidgetWatcher* >::const_iterator itr = widgetWatchers.begin();
+		while( itr != widgetWatchers.end() )
+		{
+			(*itr)->onWidgetAdded( id );
+			++itr;
+		}
+	}
+
+	void CWidgetManager::onWidgetMoved( const std::string &oldid, const std::string &newid )
 	{
-		std::vector< IWidgetAdditionWatcher* >::const_iterator itr = additionWatchers.begin();
-		while( itr != additionWatchers.end() )
+		std::vector< IWidgetWatcher* >::const_iterator itr = widgetWatchers.begin();
+		while( itr != widgetWatchers.end() )
 		{
-			(*itr)->widgetAdded( widgetName );
+			(*itr)->onWidgetMoved( oldid, newid );
 			++itr;
 		}
 	}
 
-	void CWidgetManager::registerAdditionWatcher( IWidgetAdditionWatcher *watcher )
+	void CWidgetManager::registerWidgetWatcher( IWidgetWatcher *watcher )
 	{
-		std::vector< IWidgetAdditionWatcher* >::const_iterator itr 
-			= std::find( additionWatchers.begin(), additionWatchers.end(), watcher );
+		std::vector< IWidgetWatcher* >::const_iterator itr 
+			= std::find( widgetWatchers.begin(), widgetWatchers.end(), watcher );
 		// already exists
-		if( itr != additionWatchers.end() )
+		if( itr != widgetWatchers.end() )
 			return;
 
-		additionWatchers.push_back( watcher );
+		widgetWatchers.push_back( watcher );
 	}
 
-	void CWidgetManager::unregisterAdditionWatcher( IWidgetAdditionWatcher *watcher )
+	void CWidgetManager::unregisterWidgetWatcher( IWidgetWatcher *watcher )
 	{
-		std::vector< IWidgetAdditionWatcher* >::iterator itr
-			= std::find( additionWatchers.begin(), additionWatchers.end(), watcher );
+		std::vector< IWidgetWatcher* >::iterator itr
+			= std::find( widgetWatchers.begin(), widgetWatchers.end(), watcher );
 		// doesn't exist
-		if( itr == additionWatchers.end() )
+		if( itr == widgetWatchers.end() )
 			return;
 
-		additionWatchers.erase( itr );
+		widgetWatchers.erase( itr );
 	}
 
 	CInterfaceElement* CWidgetManager::addWidgetToGroup( std::string &group, std::string &widgetClass, std::string &widgetName )
@@ -3329,11 +3515,165 @@ namespace NLGUI
 		else
 			g->addView( v );
 
-		notifyAdditionWatchers( v->getId() );
+		onWidgetAdded( v->getId() );
 		
 		return v;
 	}
 
+	bool CWidgetManager::groupSelection()
+	{
+		std::vector< CInterfaceElement* > elms;
+
+		// Resolve the widget names
+		for( int i = 0; i < editorSelection.size(); i++ )
+		{
+			CInterfaceElement *e = getElementFromId( editorSelection[ i ] );
+			if( e != NULL )
+				elms.push_back( e );
+		}
+
+		editorSelection.clear();
+
+		if( elms.empty() )
+			return false;
+
+		// Create the group as the subgroup of the top window
+		CInterfaceGroup *g = static_cast< CInterfaceGroup* >( getParser()->createClass( "interface_group" ) );
+		getTopWindow()->addGroup( g );
+		g->setParent( getTopWindow() );
+		g->setIdRecurse( std::string( "group" ) + NLMISC::toString( _WidgetCount ) );
+		_WidgetCount++;
+		onWidgetAdded( g->getId() );
+
+		std::string oldId;
+
+		// Reparent the widgets to the new group
+		for( int i = 0; i < elms.size(); i++ )
+		{
+			CInterfaceElement *e = elms[ i ];
+			oldId = e->getId();
+			CInterfaceGroup *p = e->getParent();
+			if( p != NULL )
+				p->takeElement( e );
+
+			g->addElement( e );
+			e->setParent( g );
+			e->setParentPos( g );
+			e->setParentSize( g );
+			e->setIdRecurse( e->getShortId() );	
+
+			onWidgetMoved( oldId, e->getId() );
+		}
+		elms.clear();
+
+		// Make sure widgets aren't clipped because the group isn't big enough
+		g->spanElements();
+		// Make sure widgets are aligned
+		g->alignElements();
+		// Align the new group to the top window
+		g->alignTo( getTopWindow() );
+		
+		g->setActive( true );
+		
+		return true;
+	}
+
+	bool CWidgetManager::unGroupSelection()
+	{
+		if( editorSelection.size() != 1 )
+			return false;
+
+		// Does the element exist?
+		CInterfaceElement *e = getElementFromId( editorSelection[ 0 ] );
+		if( e == NULL )
+			return false;
+
+		// Is the element a group?
+		CInterfaceGroup *g = dynamic_cast< CInterfaceGroup* >( e );
+		if( g == NULL )
+			return false;
+
+		// Can't blow up a root group :(
+		CInterfaceGroup *p = g->getParent();
+		if( p == NULL )
+			return false;
+
+		// KABOOM!
+		bool ok = g->explode();
+		if( !ok )
+			return false;
+
+		p->delElement( g );
+
+		clearEditorSelection();
+
+		p->updateCoords();
+
+		return true;
+	}
+
+
+	bool CWidgetManager::createNewGUI( const std::string &project, const std::string &window )
+	{
+		reset();
+
+		for( int i = 0; i < _MasterGroups.size(); i++ )
+			delete _MasterGroups[i].Group;
+		_MasterGroups.clear();
+
+		// First create the master group
+		CRootGroup *root = new CRootGroup( CViewBase::TCtorParam() );
+
+		SMasterGroup mg;
+		mg.Group = root;
+		
+		root->setIdRecurse( project );
+		root->setW( 1024 );
+		root->setH( 768 );
+		root->setActive( true );
+
+		// Create the first / main window
+		CInterfaceGroup *wnd = new CInterfaceGroup( CViewBase::TCtorParam() );
+		wnd->setW( 1024 );
+		wnd->setH( 768 );
+		wnd->setParent( root );
+		wnd->setParentPos( root );
+		wnd->setParentSize( root );
+		wnd->setPosRef( Hotspot_MM );
+		wnd->setParentPosRef( Hotspot_MM );
+		wnd->setIdRecurse( window );
+		wnd->setActive( true );
+
+		// Add the window
+		root->addElement( wnd );
+		mg.addWindow( wnd, wnd->getPriority() );
+		_MasterGroups.push_back( mg );
+
+		_Pointer = new CViewPointer( CViewBase::TCtorParam() );
+
+		IParser *parser = getParser();
+
+
+		// Set base color to white		
+		VariableData v;
+		v.type = "sint32";
+		v.value = "255";
+		
+		v.entry = "UI:SAVE:COLOR:R";
+		parser->setVariable( v );
+
+		v.entry = "UI:SAVE:COLOR:G";
+		parser->setVariable( v );
+
+		v.entry = "UI:SAVE:COLOR:B";
+		parser->setVariable( v );
+
+		v.entry = "UI:SAVE:COLOR:A";
+		parser->setVariable( v );
+			
+		return true;
+	}
+
 
 	CWidgetManager::CWidgetManager()
 	{
@@ -3372,7 +3712,9 @@ namespace NLGUI
 
 		setScreenWH( 0, 0 );
 
-		currentEditorSelection = "";
+		_GroupSelection = false;
+		multiSelection = false;
+		_WidgetCount = 0;
 	}
 
 	CWidgetManager::~CWidgetManager()
@@ -3386,6 +3728,8 @@ namespace NLGUI
 		curContextHelp = NULL;
 
 		CStringShared::deleteStringMapper();
+
+		editorSelection.clear();
 	}
 
 }
diff --git a/code/nel/src/ligo/primitive.cpp b/code/nel/src/ligo/primitive.cpp
index 9cf7df13f..ba9b69435 100644
--- a/code/nel/src/ligo/primitive.cpp
+++ b/code/nel/src/ligo/primitive.cpp
@@ -2738,8 +2738,17 @@ CPrimitiveContext::CPrimitiveContext():
 }
 
 
+static bool LIGORegistered = false;
+
+
 void Register ()
 {
+    if( LIGORegistered )
+    {
+        nlinfo( "LIGO classes have already been registered." );
+        return;
+    }
+
 	NLMISC_REGISTER_CLASS(CPropertyString);
 	NLMISC_REGISTER_CLASS(CPropertyStringArray);
 	NLMISC_REGISTER_CLASS(CPropertyColor);
@@ -2748,6 +2757,8 @@ void Register ()
 	NLMISC_REGISTER_CLASS(CPrimPath);
 	NLMISC_REGISTER_CLASS(CPrimZone);
 	NLMISC_REGISTER_CLASS(CPrimAlias);
+
+    LIGORegistered = true;
 }
 
 // ***************************************************************************
diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt
index 2d3ef9066..f40517f5b 100644
--- a/code/nel/src/misc/CMakeLists.txt
+++ b/code/nel/src/misc/CMakeLists.txt
@@ -1,6 +1,176 @@
 FILE(GLOB SRC *.cpp *.h config_file/*.cpp config_file/*.h)
 FILE(GLOB HEADERS ../../include/nel/misc/*.h)
 
+FILE(GLOB NLMISC_CDB
+	cdb.cpp ../../include/nel/misc/cdb.h
+	cdb_*.cpp ../../include/nel/misc/cdb_*.h
+)
+
+FILE(GLOB NLMISC_EVENT
+	events.cpp ../../include/nel/misc/events.h
+	event_*.cpp ../../include/nel/misc/event_*.h
+	*_event_*.cpp ../../include/nel/misc/*_event_*.h
+)
+
+FILE(GLOB NLMISC_DEBUG
+	debug.cpp ../../include/nel/misc/debug.h
+	report.cpp ../../include/nel/misc/report.h
+	log.cpp ../../include/nel/misc/log.h
+)
+
+FILE(GLOB NLMISC_FILESYSTEM
+	async_file_manager.cpp ../../include/nel/misc/async_file_manager.h
+	file.cpp ../../include/nel/misc/file.h
+	path.cpp ../../include/nel/misc/path.h
+	big_file.cpp ../../include/nel/misc/big_file.h
+	*_xml.cpp ../../include/nel/misc/*_xml.h
+	xml_*.cpp ../../include/nel/misc/xml_*.h
+)
+
+FILE(GLOB NLMISC_STREAM
+	*_stream.cpp ../../include/nel/misc/*_stream.h
+	stream.cpp ../../include/nel/misc/stream.h
+	stream_*.cpp ../../include/nel/misc/stream_*.h
+)
+
+FILE(GLOB NLMISC_DISPLAYER
+	displayer.cpp ../../include/nel/misc/displayer.h
+	*_displayer.cpp ../../include/nel/misc/*_displayer.h
+)
+
+FILE(GLOB NLMISC_MATH
+	plane.cpp ../../include/nel/misc/plane.h
+	../../include/nel/misc/plane_inline.h
+	polygon.cpp ../../include/nel/misc/polygon.h
+	quad.cpp ../../include/nel/misc/quad.h
+	quat.cpp ../../include/nel/misc/quat.h
+	rect.cpp ../../include/nel/misc/rect.h
+	rgba.cpp ../../include/nel/misc/rgba.h
+	triangle.cpp ../../include/nel/misc/triangle.h
+	uv.cpp ../../include/nel/misc/uv.h
+	vector*.cpp ../../include/nel/misc/vector*.h
+	aabbox.cpp ../../include/nel/misc/aabbox.h
+	algo.cpp ../../include/nel/misc/algo.h
+	bsphere.cpp ../../include/nel/misc/bsphere.h
+	fast_floor.cpp ../../include/nel/misc/fast_floor.h
+	geom_ext.cpp ../../include/nel/misc/geom_ext.h
+	line.cpp ../../include/nel/misc/line.h
+	matrix.cpp ../../include/nel/misc/matrix.h
+)
+
+FILE(GLOB NLMISC_PLATFORM
+	*_nl.cpp ../../include/nel/misc/*_nl.h
+	common.cpp ../../include/nel/misc/common.h
+	app_context.cpp ../../include/nel/misc/app_context.h
+	check_fpu.cpp ../../include/nel/misc/check_fpu.h
+	cpu_time_stat.cpp ../../include/nel/misc/cpu_time_stat.h
+	dummy_window.cpp ../../include/nel/misc/dummy_window.h
+	dynloadlib.cpp ../../include/nel/misc/dynloadlib.h
+	fast_mem.cpp ../../include/nel/misc/fast_mem.h
+	inter_window_msg_queue.cpp ../../include/nel/misc/inter_window_msg_queue.h
+	system_*.cpp ../../include/nel/misc/system_*.h
+	win32_util.cpp ../../include/nel/misc/win32_util.h
+	win_tray.cpp ../../include/nel/misc/win_tray.h
+)
+
+FILE(GLOB NLMISC_GENERIC
+	../../include/nel/misc/array_2d.h
+	*_memory.cpp ../../include/nel/misc/*_memory.h
+	buf_fifo.cpp ../../include/nel/misc/buf_fifo.h
+	../../include/nel/misc/callback.h
+	*_allocator.cpp ../../include/nel/misc/*_allocator.h
+	../../include/nel/misc/enum_bitset.h
+	fast_id_map.cpp ../../include/nel/misc/fast_id_map.h
+	hierarchical_timer.cpp ../../include/nel/misc/hierarchical_timer.h
+	../../include/nel/misc/historic.h
+	../../include/nel/misc/mutable_container.h
+	../../include/nel/misc/random.h
+	smart_ptr.cpp ../../include/nel/misc/smart_ptr.h
+	../../include/nel/misc/smart_ptr_inline.h
+	../../include/nel/misc/resource_ptr.h
+	../../include/nel/misc/resource_ptr_inline.h
+	bit_set.cpp ../../include/nel/misc/bit_set.h
+	stop_watch.cpp ../../include/nel/misc/stop_watch.h
+	../../include/nel/misc/twin_map.h
+	object_vector.cpp ../../include/nel/misc/object_vector.h
+	../../include/nel/misc/singleton.h
+	speaker_listener.cpp ../../include/nel/misc/speaker_listener.h
+	../../include/nel/misc/static_map.h
+	stl_block_list.cpp ../../include/nel/misc/stl_block_list.h
+)
+
+FILE(GLOB NLMISC_UTILITY
+	config_file.cpp ../../include/nel/misc/config_file.h
+	cf_*.cpp ../../include/nel/misc/cf_*.h
+	config_file/config_file.cpp config_file/config_file.h
+	config_file/cf_*.cpp config_file/cf_*.h
+	class_id.cpp ../../include/nel/misc/class_id.h
+	class_registry.cpp ../../include/nel/misc/class_registry.h
+	cmd_args.cpp ../../include/nel/misc/cmd_args.h
+	command.cpp ../../include/nel/misc/command.h
+	eid_translator.cpp ../../include/nel/misc/eid_translator.h
+	entity_id.cpp ../../include/nel/misc/entity_id.h
+	eval_num_expr.cpp ../../include/nel/misc/eval_num_expr.h
+	factory.cpp ../../include/nel/misc/factory.h
+	grid_traversal.cpp ../../include/nel/misc/grid_traversal.h
+	mouse_smoother.cpp ../../include/nel/misc/mouse_smoother.h
+	noise_value.cpp ../../include/nel/misc/noise_value.h
+	progress_callback.cpp ../../include/nel/misc/progress_callback.h
+	sheet_id.cpp ../../include/nel/misc/sheet_id.h
+	variable.cpp ../../include/nel/misc/variable.h
+	value_smoother.cpp ../../include/nel/misc/value_smoother.h
+)
+
+FILE(GLOB NLMISC_STRING
+	string_*.cpp ../../include/nel/misc/string_*.h
+	../../include/nel/misc/ucstring.h
+	unicode.cpp
+	sstring.cpp ../../include/nel/misc/sstring.h
+)
+
+FILE(GLOB NLMISC_I18N
+	diff_tool.cpp ../../include/nel/misc/diff_tool.h
+	i18n.cpp ../../include/nel/misc/i18n.h
+	words_dictionary.cpp ../../include/nel/misc/words_dictionary.h
+)
+
+FILE(GLOB NLMISC_THREAD
+	co_task.cpp ../../include/nel/misc/co_task.h
+	mutex.cpp ../../include/nel/misc/mutex.h
+	*_thread.cpp ../../include/nel/misc/*_thread.h
+	task_*.cpp ../../include/nel/misc/task_*.h
+	reader_writer.cpp ../../include/nel/misc/reader_writer.h
+	tds.cpp ../../include/nel/misc/tds.h
+	thread.cpp ../../include/nel/misc/thread.h
+)
+
+FILE(GLOB NLMISC_BITMAP
+	bitmap.cpp ../../include/nel/misc/bitmap.h
+	bitmap_*.cpp
+)
+
+FILE(GLOB NLMISC_CRYPT
+	md5.cpp ../../include/nel/misc/md5.h
+	sha1.cpp ../../include/nel/misc/sha1.h
+)
+
+SOURCE_GROUP("" FILES ${SRC} ${HEADERS})
+SOURCE_GROUP("cdb" FILES ${NLMISC_CDB})
+SOURCE_GROUP("event" FILES ${NLMISC_EVENT})
+SOURCE_GROUP("debug" FILES ${NLMISC_DEBUG})
+SOURCE_GROUP("platform" FILES ${NLMISC_PLATFORM})
+SOURCE_GROUP("filesystem" FILES ${NLMISC_FILESYSTEM})
+SOURCE_GROUP("stream" FILES ${NLMISC_STREAM})
+SOURCE_GROUP("displayer" FILES ${NLMISC_DISPLAYER})
+SOURCE_GROUP("math" FILES ${NLMISC_MATH})
+SOURCE_GROUP("generic" FILES ${NLMISC_GENERIC})
+SOURCE_GROUP("utility" FILES ${NLMISC_UTILITY})
+SOURCE_GROUP("bitmap" FILES ${NLMISC_BITMAP})
+SOURCE_GROUP("thread" FILES ${NLMISC_THREAD})
+SOURCE_GROUP("i18n" FILES ${NLMISC_I18N})
+SOURCE_GROUP("crypt" FILES ${NLMISC_CRYPT})
+SOURCE_GROUP("string" FILES ${NLMISC_STRING})
+
 NL_TARGET_LIB(nelmisc ${HEADERS} ${SRC})
 
 IF(WITH_GTK)
diff --git a/code/nel/src/misc/app_context.cpp b/code/nel/src/misc/app_context.cpp
index 32b981bb3..2383fcda5 100644
--- a/code/nel/src/misc/app_context.cpp
+++ b/code/nel/src/misc/app_context.cpp
@@ -114,6 +114,7 @@ CApplicationContext::CApplicationContext()
 	DebugNeedAssert = false;
 	NoAssert = false;
 	AlreadyCreateSharedAmongThreads = false;
+	WindowedApplication = false;
 
 	contextReady();
 }
@@ -242,6 +243,16 @@ void CApplicationContext::setAlreadyCreateSharedAmongThreads(bool b)
 	AlreadyCreateSharedAmongThreads = b;
 }
 
+bool CApplicationContext::isWindowedApplication()
+{
+	return WindowedApplication;
+}
+
+void CApplicationContext::setWindowedApplication(bool b)
+{
+	WindowedApplication = b;
+}
+
 CLibraryContext::CLibraryContext(INelContext &applicationContext)
 : _ApplicationContext(&applicationContext)
 {
@@ -430,6 +441,16 @@ void CLibraryContext::setAlreadyCreateSharedAmongThreads(bool b)
 	_ApplicationContext->setAlreadyCreateSharedAmongThreads(b);
 }
 
+bool CLibraryContext::isWindowedApplication()
+{
+	return _ApplicationContext->isWindowedApplication();
+}
+
+void CLibraryContext::setWindowedApplication(bool b)
+{
+	_ApplicationContext->setWindowedApplication(b);
+}
+
 void initNelLibrary(NLMISC::CLibrary &lib)
 {
 	nlassert(lib.isLibraryLoaded());
diff --git a/code/nel/src/misc/co_task.cpp b/code/nel/src/misc/co_task.cpp
index d238b4853..97a9e1e23 100644
--- a/code/nel/src/misc/co_task.cpp
+++ b/code/nel/src/misc/co_task.cpp
@@ -43,20 +43,7 @@
 #else //NL_USE_THREAD_COTASK
 // some platform specifics
 #if defined (NL_OS_WINDOWS)
-//# define _WIN32_WINNT 0x0500
-# define NL_WIN_CALLBACK CALLBACK
-// Visual .NET won't allow Fibers for a Windows version older than 2000. However the basic features are sufficient for us, we want to compile them for all Windows >= 95
-# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0400)
-#  ifdef _WIN32_WINNT
-#   undef _WIN32_WINNT
-#  endif
-#  define _WIN32_WINNT 0x0400
-# endif
-
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
+#	define NL_WIN_CALLBACK CALLBACK
 #elif defined (NL_OS_UNIX)
 #	define NL_WIN_CALLBACK
 #	include <ucontext.h>
diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp
index 31ad7edb0..671879f2e 100644
--- a/code/nel/src/misc/common.cpp
+++ b/code/nel/src/misc/common.cpp
@@ -20,10 +20,7 @@
 #include "nel/misc/common.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
+#	include <ShellAPI.h>
 #	include <io.h>
 #	include <tchar.h>
 #elif defined NL_OS_UNIX
diff --git a/code/nel/src/misc/config_file/cf_bison.simple b/code/nel/src/misc/config_file/cf_bison.simple
index 3ab0e5b1a..64e930f27 100644
--- a/code/nel/src/misc/config_file/cf_bison.simple
+++ b/code/nel/src/misc/config_file/cf_bison.simple
@@ -328,7 +328,7 @@ yynewstate:
 #endif
 
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      int size = (int)(yyssp - yyss + 1);
 
 #ifdef yyoverflow
       /* Each stack pointer address is followed by the size of
diff --git a/code/nel/src/misc/config_file/cf_flex.skl b/code/nel/src/misc/config_file/cf_flex.skl
index 5da2aa3f6..b69bed057 100644
--- a/code/nel/src/misc/config_file/cf_flex.skl
+++ b/code/nel/src/misc/config_file/cf_flex.skl
@@ -1000,7 +1000,7 @@ int yyFlexLexer::yyinput()
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
+			int offset = (int)(yy_c_buf_p - yytext_ptr);
 			++yy_c_buf_p;
 
 			switch ( yy_get_next_buffer() )
diff --git a/code/nel/src/misc/config_file/cf_gramatical.cpp b/code/nel/src/misc/config_file/cf_gramatical.cpp
index c6a50934f..1d8c568b7 100644
--- a/code/nel/src/misc/config_file/cf_gramatical.cpp
+++ b/code/nel/src/misc/config_file/cf_gramatical.cpp
@@ -1499,7 +1499,7 @@ void cf_setVar (NLMISC::CConfigFile::CVar &Var, cf_value Val)
 			switch (Val.Type)
 			{
 			case NLMISC::CConfigFile::CVar::T_REAL:		Var.IntValues.push_back ((int)Val.Real); break;
-			case NLMISC::CConfigFile::CVar::T_STRING:	Var.IntValues.push_back (atoi(Val.String)); break;
+			case NLMISC::CConfigFile::CVar::T_STRING:	{ int val = 0; NLMISC::fromString(Val.String, val); Var.IntValues.push_back(val); break; }
 			default: break;
 			}
 			break;
@@ -1507,7 +1507,7 @@ void cf_setVar (NLMISC::CConfigFile::CVar &Var, cf_value Val)
 			switch (Val.Type)
 			{
 			case NLMISC::CConfigFile::CVar::T_INT:		Var.RealValues.push_back ((double)Val.Int); break;
-			case NLMISC::CConfigFile::CVar::T_STRING:	Var.RealValues.push_back (atof(Val.String)); break;
+			case NLMISC::CConfigFile::CVar::T_STRING:	{ double val = 0.0; NLMISC::fromString(Val.String, val); Var.RealValues.push_back(val); break; }
 			default: break;
 			}
 			break;
diff --git a/code/nel/src/misc/config_file/cf_gramatical.ypp b/code/nel/src/misc/config_file/cf_gramatical.ypp
index 199f3df9a..578bf53bf 100644
--- a/code/nel/src/misc/config_file/cf_gramatical.ypp
+++ b/code/nel/src/misc/config_file/cf_gramatical.ypp
@@ -517,7 +517,7 @@ void cf_setVar (NLMISC::CConfigFile::CVar &Var, cf_value Val)
 			switch (Val.Type)
 			{
 			case NLMISC::CConfigFile::CVar::T_REAL:		Var.IntValues.push_back ((int)Val.Real); break;
-			case NLMISC::CConfigFile::CVar::T_STRING:	Var.IntValues.push_back (atoi(Val.String)); break;
+			case NLMISC::CConfigFile::CVar::T_STRING:	{ int val = 0; NLMISC::fromString(Val.String, val); Var.RealValues.push_back(val); break; }
 			default: break;
 			}
 			break;
@@ -525,7 +525,7 @@ void cf_setVar (NLMISC::CConfigFile::CVar &Var, cf_value Val)
 			switch (Val.Type)
 			{
 			case NLMISC::CConfigFile::CVar::T_INT:		Var.RealValues.push_back ((double)Val.Int); break;
-			case NLMISC::CConfigFile::CVar::T_STRING:	Var.RealValues.push_back (atof(Val.String)); break;
+			case NLMISC::CConfigFile::CVar::T_STRING:	{ double val = 0.0; NLMISC::fromString(Val.String, val); Var.RealValues.push_back(val); break; }
 			default: break;
 			}
 			break;
diff --git a/code/nel/src/misc/config_file/cf_lexical.cpp b/code/nel/src/misc/config_file/cf_lexical.cpp
index f47696ff9..8c39112a6 100644
--- a/code/nel/src/misc/config_file/cf_lexical.cpp
+++ b/code/nel/src/misc/config_file/cf_lexical.cpp
@@ -2337,7 +2337,7 @@ YY_RULE_SETUP
 				if (!cf_Ignore)
 				{
 					cflval.Val.Type = T_REAL;
-					cflval.Val.Real = atof (yytext);
+					NLMISC::fromString(yytext, cflval.Val.Real);
 					DEBUG_PRINTF("lex: real '%s' '%f\n", yytext, cflval.Val.Real);
 					return REAL;
 				}
@@ -2773,7 +2773,7 @@ static int input()
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
+			int offset = (int)(yy_c_buf_p - yytext_ptr);
 			++yy_c_buf_p;
 
 			switch ( yy_get_next_buffer() )
diff --git a/code/nel/src/misc/config_file/config_file.cpp b/code/nel/src/misc/config_file/config_file.cpp
index 6113a7a2c..c969f614d 100644
--- a/code/nel/src/misc/config_file/config_file.cpp
+++ b/code/nel/src/misc/config_file/config_file.cpp
@@ -85,8 +85,12 @@ double CConfigFile::CVar::asDouble (int index) const
 		if (index >= (int)IntValues.size () || index < 0) throw EBadSize (Name, (int)IntValues.size (), index);
 		return (double)IntValues[index];
 	case T_STRING:
+	{
 		if (index >= (int)StrValues.size () || index < 0) throw EBadSize (Name, (int)StrValues.size (), index);
-		return atof(StrValues[index].c_str());
+		double val;
+		NLMISC::fromString(StrValues[index], val);
+		return val;
+	}
 	default:
 		if (index >= (int)RealValues.size () || index < 0) throw EBadSize (Name, (int)RealValues.size (), index);
 		return RealValues[index];
diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp
index c7667acc2..747d12129 100644
--- a/code/nel/src/misc/debug.cpp
+++ b/code/nel/src/misc/debug.cpp
@@ -17,28 +17,8 @@
 #include "stdmisc.h"
 
 #include "nel/misc/types_nl.h"
-#include "nel/misc/debug.h"
-
-#ifdef HAVE_NELCONFIG_H
-#  include "nelconfig.h"
-#endif // HAVE_NELCONFIG_H
-
-#include "nel/misc/log.h"
-#include "nel/misc/displayer.h"
-#include "nel/misc/mem_displayer.h"
-#include "nel/misc/command.h"
-#include "nel/misc/report.h"
-#include "nel/misc/path.h"
-#include "nel/misc/variable.h"
-#include "nel/misc/system_info.h"
 
 #ifdef NL_OS_WINDOWS
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#	define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <direct.h>
 #	include <tchar.h>
 #	include <imagehlp.h>
@@ -59,6 +39,21 @@
 #	include <errno.h>
 #endif
 
+#include "nel/misc/debug.h"
+
+#ifdef HAVE_NELCONFIG_H
+#  include "nelconfig.h"
+#endif // HAVE_NELCONFIG_H
+
+#include "nel/misc/log.h"
+#include "nel/misc/displayer.h"
+#include "nel/misc/mem_displayer.h"
+#include "nel/misc/command.h"
+#include "nel/misc/report.h"
+#include "nel/misc/path.h"
+#include "nel/misc/variable.h"
+#include "nel/misc/system_info.h"
+
 #define NL_NO_DEBUG_FILES 1
 
 using namespace std;
@@ -83,7 +78,8 @@ using namespace std;
 #define LOG_IN_FILE NEL_LOG_IN_FILE
 
 // If true, debug system will trap crash even if the application is in debugger
-static const bool TrapCrashInDebugger = false;
+//static const bool TrapCrashInDebugger = false;
+static const bool TrapCrashInDebugger = true;
 
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
@@ -552,8 +548,8 @@ public:
 			{
 				// yoyo: allow only to send the crash report once. Because users usually click ignore,
 				// which create noise into list of bugs (once a player crash, it will surely continues to do it).
-				bool i = false;
-				report (progname+shortExc, "", subject, _Reason, true, 1, true, 1, !isCrashAlreadyReported(), i, NL_CRASH_DUMP_FILE);
+				report(progname + shortExc, subject, _Reason, NL_CRASH_DUMP_FILE, true, !isCrashAlreadyReported(), ReportAbort);
+				// TODO: Does this need to be synchronous? Why does this not handle the report result?
 
 				// no more sent mail for crash
 				setCrashAlreadyReported(true);
@@ -1196,10 +1192,10 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
 
 #ifdef NL_OS_WINDOWS
 		if (TrapCrashInDebugger || !IsDebuggerPresent ())
+#endif
 		{
 			DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
 		}
-#endif
 
 #if LOG_IN_FILE
 		if (logInFile)
@@ -1227,6 +1223,11 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
 #endif // LOG_IN_FILE
 		DefaultMemDisplayer = new CMemDisplayer ("DEFAULT_MD");
 
+#ifdef NL_OS_WINDOWS
+		if (GetConsoleWindow() == NULL)
+			INelContext::getInstance().setWindowedApplication(true);
+#endif
+
 		initDebug2(logInFile);
 
 		INelContext::getInstance().setAlreadyCreateSharedAmongThreads(true);
diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp
index d48c44d02..57b3e09d4 100644
--- a/code/nel/src/misc/displayer.cpp
+++ b/code/nel/src/misc/displayer.cpp
@@ -18,6 +18,10 @@
 
 #include "nel/misc/types_nl.h"
 
+#ifndef NL_OS_WINDOWS
+#	define IsDebuggerPresent() false
+#endif
+
 #ifdef NL_OS_WINDOWS
 #	include <io.h>
 #	include <fcntl.h>
@@ -35,19 +39,6 @@
 
 #include "nel/misc/debug.h"
 
-#ifdef NL_OS_WINDOWS
-// these defines is for IsDebuggerPresent(). it'll not compile on windows 95
-// just comment this and the IsDebuggerPresent to compile on windows 95
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#		define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
-#else
-#	define IsDebuggerPresent() false
-#endif
-
 #include "nel/misc/displayer.h"
 
 using namespace std;
@@ -529,7 +520,7 @@ void CFileDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mes
 //                           in release "<Msg>"
 void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message)
 {
-#ifdef NL_OS_WINDOWS
+//#ifdef NL_OS_WINDOWS
 
 	bool needSpace = false;
 //	stringstream ss;
@@ -688,39 +679,35 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
 			// yoyo: allow only to send the crash report once. Because users usually click ignore,
 			// which create noise into list of bugs (once a player crash, it will surely continues to do it).
 			std::string filename = getLogDirectory() + NL_CRASH_DUMP_FILE;
+			
+			TReportResult reportResult = report(args.ProcessName + " NeL " + toString(logTypeToString(args.LogType, true)),
+				subject, body, filename, NL_REPORT_SYNCHRONOUS, !isCrashAlreadyReported(), NL_REPORT_DEFAULT);
 
-			if  (ReportDebug == report (args.ProcessName + " NeL " + toString(logTypeToString(args.LogType, true)), "", subject, body, true, 2, true, 1, !isCrashAlreadyReported(), IgnoreNextTime, filename.c_str()))
+			switch (reportResult)
 			{
+			case ReportAlwaysIgnore:
+				IgnoreNextTime = true;
+				break;
+			case ReportBreak:
 				INelContext::getInstance().setDebugNeedAssert(true);
+				break;
+			case ReportAbort:
+#		ifdef NL_OS_WINDOWS
+#		ifndef NL_COMP_MINGW
+				// disable the Windows popup telling that the application aborted and disable the dr watson report.
+				_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+#		endif
+#		endif
+				abort();
+				break;
 			}
 
 			// no more sent mail for crash
 			setCrashAlreadyReported(true);
 		}
+	}
 
-/*		// Check the envvar NEL_IGNORE_ASSERT
-		if (getenv ("NEL_IGNORE_ASSERT") == NULL)
-		{
-			// Ask the user to continue, debug or ignore
-			int result = MessageBox (NULL, ss2.str().c_str (), logTypeToString(args.LogType, true), MB_ABORTRETRYIGNORE | MB_ICONSTOP);
-			if (result == IDABORT)
-			{
-				// Exit the program now
-				exit (EXIT_FAILURE);
-			}
-			else if (result == IDRETRY)
-			{
-				// Give the debugger a try
-				DebugNeedAssert = true;
- 			}
-			else if (result == IDIGNORE)
-			{
-				// Continue, do nothing
-			}
-		}
-*/	}
-
-#endif
+//#endif
 }
 
 
diff --git a/code/nel/src/misc/gtk_displayer.cpp b/code/nel/src/misc/gtk_displayer.cpp
index c2e04e67e..0c581b2e5 100644
--- a/code/nel/src/misc/gtk_displayer.cpp
+++ b/code/nel/src/misc/gtk_displayer.cpp
@@ -32,6 +32,7 @@
 #pragma comment(lib, "gthread-1.3.lib")
 #endif
 
+#include "nel/misc/app_context.h"
 #include "nel/misc/path.h"
 #include "nel/misc/command.h"
 #include "nel/misc/thread.h"
@@ -59,6 +60,14 @@ static GtkWidget *hrootbox = NULL, *scrolled_win2 = NULL;
 // Functions
 //
 
+CGtkDisplayer (const char *displayerName) : CWindowDisplayer(displayerName)
+{
+	needSlashR = false;
+	createLabel ("@Clear|CLEAR");
+
+	INelContext::getInstance().setWindowedApplication(true);
+}
+
 CGtkDisplayer::~CGtkDisplayer ()
 {
 	if (_Init)
diff --git a/code/nel/src/misc/log.cpp b/code/nel/src/misc/log.cpp
index 478a5e338..f0e3e36f8 100644
--- a/code/nel/src/misc/log.cpp
+++ b/code/nel/src/misc/log.cpp
@@ -19,11 +19,7 @@
 #include "nel/misc/log.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
 #	include <process.h>
-#	include <windows.h>
 #else
 #	include <unistd.h>
 #endif
diff --git a/code/nel/src/misc/mem_displayer.cpp b/code/nel/src/misc/mem_displayer.cpp
index 49431097d..0aaac26cc 100644
--- a/code/nel/src/misc/mem_displayer.cpp
+++ b/code/nel/src/misc/mem_displayer.cpp
@@ -24,10 +24,6 @@
 #include "nel/misc/debug.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <imagehlp.h>
 #	pragma comment(lib, "imagehlp.lib")
 #	ifdef NL_OS_WIN64
@@ -103,7 +99,7 @@ static string getFuncInfo (DWORD_TYPE funcAddr, DWORD_TYPE stackAddr)
 		if (stop==0 && (parse[i] == ',' || parse[i] == ')'))
 		{
 			char tmp[32];
-			sprintf (tmp, "=0x%p", *((ULONG*)(stackAddr) + 2 + pos++));
+			sprintf(tmp, "=0x%p", *((DWORD_TYPE*)(stackAddr) + 2 + pos++));
 			str += tmp;
 		}
 		str += parse[i];
diff --git a/code/nel/src/misc/mutex.cpp b/code/nel/src/misc/mutex.cpp
index 3c86e2b29..8135d954f 100644
--- a/code/nel/src/misc/mutex.cpp
+++ b/code/nel/src/misc/mutex.cpp
@@ -41,15 +41,6 @@ using namespace std;
 
 #ifdef NL_OS_WINDOWS
 
-// these defines are for IsDebuggerPresent(). It'll not compile on windows 95
-// just comment this and the IsDebuggerPresent to compile on windows 95
-#define _WIN32_WINDOWS	0x0410
-#ifndef NL_COMP_MINGW
-#	define WINVER			0x0400
-#	define NOMINMAX
-#endif
-#include <windows.h>
-
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
 #endif
@@ -406,13 +397,21 @@ void CUnfairMutex::leave()
  */
 CFairMutex::CFairMutex()
 {
+#ifdef NL_OS_MAC
+	_Sem = dispatch_semaphore_create(1);
+#else
 	sem_init( const_cast<sem_t*>(&_Sem), 0, 1 );
+#endif
 }
 
 
 CFairMutex::CFairMutex(	const std::string &name )
 {
+#ifdef NL_OS_MAC
+	_Sem = dispatch_semaphore_create(1);
+#else
 	sem_init( const_cast<sem_t*>(&_Sem), 0, 1 );
+#endif
 }
 
 
@@ -421,7 +420,11 @@ CFairMutex::CFairMutex(	const std::string &name )
  */
 CFairMutex::~CFairMutex()
 {
+#ifdef NL_OS_MAC
+	dispatch_release(_Sem);
+#else
 	sem_destroy( const_cast<sem_t*>(&_Sem) ); // needs that no thread is waiting on the semaphore
+#endif
 }
 
 
@@ -430,7 +433,11 @@ CFairMutex::~CFairMutex()
  */
 void CFairMutex::enter()
 {
+#ifdef NL_OS_MAC
+	dispatch_semaphore_wait(_Sem, DISPATCH_TIME_FOREVER);
+#else
 	sem_wait( const_cast<sem_t*>(&_Sem) );
+#endif
 }
 
 
@@ -439,7 +446,11 @@ void CFairMutex::enter()
  */
 void CFairMutex::leave()
 {
+#ifdef NL_OS_MAC
+	dispatch_semaphore_signal(_Sem);
+#else
 	sem_post( const_cast<sem_t*>(&_Sem) );
+#endif
 }
 
 
diff --git a/code/nel/src/misc/p_thread.cpp b/code/nel/src/misc/p_thread.cpp
index a24029b3c..e71f56611 100644
--- a/code/nel/src/misc/p_thread.cpp
+++ b/code/nel/src/misc/p_thread.cpp
@@ -17,8 +17,8 @@
 
 #include "stdmisc.h"
 
-#include <nel/misc/types_nl.h>
-#include <nel/misc/debug.h>
+#include "nel/misc/types_nl.h"
+#include "nel/misc/debug.h"
 
 #ifdef NL_OS_UNIX
 
diff --git a/code/nel/src/misc/path.cpp b/code/nel/src/misc/path.cpp
index d47b8ce4a..71d57104a 100644
--- a/code/nel/src/misc/path.cpp
+++ b/code/nel/src/misc/path.cpp
@@ -25,10 +25,6 @@
 #include "nel/misc/xml_pack.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <sys/types.h>
 #	include <sys/stat.h>
 #	include <direct.h>
@@ -858,6 +854,8 @@ string getname (dirent *de)
 void CPath::getPathContent (const string &path, bool recurse, bool wantDir, bool wantFile, vector<string> &result, class IProgressCallback *progressCallBack, bool showEverything)
 {
 	getInstance()->_FileContainer.getPathContent(path, recurse, wantDir, wantFile, result, progressCallBack, showEverything);
+
+	sort(result.begin(), result.end());
 }
 
 void CFileContainer::getPathContent (const string &path, bool recurse, bool wantDir, bool wantFile, vector<string> &result, class IProgressCallback *progressCallBack, bool showEverything)
@@ -960,8 +958,6 @@ void CFileContainer::getPathContent (const string &path, bool recurse, bool want
 			progressCallBack->popCropedValues ();
 		}
 	}
-
-	sort(result.begin(), result.end());
 }
 
 void CPath::removeAllAlternativeSearchPath ()
@@ -2544,6 +2540,57 @@ bool CPath::makePathRelative (const char *basePath, std::string &relativePath)
 	return false;
 }
 
+std::string CPath::makePathAbsolute( const std::string &relativePath, const std::string &directory )
+{
+	if( relativePath.empty() )
+		return "";
+	if( directory.empty() )
+		return "";
+
+#ifdef NL_OS_WINDOWS
+	// Windows network address. Eg.: \\someshare\path
+	if( ( relativePath[ 0 ] == '\\' ) && ( relativePath[ 1 ] == '\\' ) )
+		return relativePath;
+
+	// Normal Windows absolute path. Eg.: C:\something
+	//
+	if( isalpha( relativePath[ 0 ] ) && ( relativePath[ 1 ] == ':' ) && ( ( relativePath[ 2 ] == '\\' ) || ( relativePath[ 2 ] == '/' ) ) )
+		return relativePath;
+#else
+	// Unix filesystem absolute path
+	if( relativePath[ 0 ] == '/' )
+		return relativePath;
+
+#endif
+
+	// Add a slash to the directory if necessary.
+	// If the relative path starts with dots we need a slash.
+	// If the relative path starts with a slash we don't.
+	// If it starts with neither, we need a slash.
+	bool needSlash = true;
+	char c = relativePath[ 0 ];
+	if( ( c == '\\' ) || ( c == '/' ) )
+		needSlash = false;
+	
+	bool hasSlash = false;
+	std::string npath = directory;
+	c = npath[ npath.size() - 1 ];
+	if( ( c == '\\' ) || ( c == '/' ) )
+		hasSlash = true;
+
+	if( needSlash && !hasSlash )
+		npath += '/';
+	else
+	if( hasSlash && !needSlash )
+		npath.resize( npath.size() - 1 );
+	
+	// Now build the new absolute path
+	npath += relativePath;
+	npath = standardizePath( npath, false );
+
+	return npath;
+}
+
 bool CFile::setRWAccess(const std::string &filename)
 {
 #ifdef NL_OS_WINDOWS
diff --git a/code/nel/src/misc/report.cpp b/code/nel/src/misc/report.cpp
index 20b2b1c11..b388dfb31 100644
--- a/code/nel/src/misc/report.cpp
+++ b/code/nel/src/misc/report.cpp
@@ -16,346 +16,206 @@
 
 #include "stdmisc.h"
 
+#include <stdlib.h>
+#include <sstream>
+
 #include "nel/misc/common.h"
 #include "nel/misc/ucstring.h"
 
 #include "nel/misc/report.h"
 #include "nel/misc/path.h"
-
-#ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
-#	include <windowsx.h>
-#	include <winuser.h>
-#endif // NL_OS_WINDOWS
-
-#define NL_NO_DEBUG_FILES 1
-
-using namespace std;
+#include "nel/misc/file.h"
 
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
 #endif
 
+#define NL_REPORT_POST_URL_ENVVAR "NL_REPORT_POST_URL"
+#ifdef NL_OS_WINDOWS
+#define NL_CRASH_REPORT_TOOL "crash_report.exe"
+#else
+#define NL_CRASH_REPORT_TOOL "crash_report"
+#endif
+#define NL_DEBUG_REPORT 0
+// Set to 1 if you want command line report tool
+#define NL_REPORT_CONSOLE 0
+// Set to 1 if you want command line report tool even when the debugger is present
+#define NL_REPORT_CONSOLE_DEBUGGER 1
+
 namespace NLMISC
 {
 
+void setReportPostUrl(const char *postUrl)
+{
+#if NL_DEBUG_REPORT
+	if (INelContext::isContextInitialised())
+		nldebug("Set report post url to '%s'", postUrl);
+#endif
 #ifdef NL_OS_WINDOWS
-static HWND sendReport=NULL;
+	SetEnvironmentVariableA(NL_REPORT_POST_URL_ENVVAR, postUrl);
+#else
+	setenv(NL_REPORT_POST_URL_ENVVAR, postUrl, 1);
 #endif
+}
 
-//old doesn't work on visual c++ 7.1 due to default parameter typedef bool (*TEmailFunction) (const std::string &smtpServer, const std::string &from, const std::string &to, const std::string &subject, const std::string &body, const std::string &attachedFile = "", bool onlyCheck = false);
-typedef bool (*TEmailFunction) (const std::string &smtpServer, const std::string &from, const std::string &to, const std::string &subject, const std::string &body, const std::string &attachedFile, bool onlyCheck);
-
-#define DELETE_OBJECT(a) if((a)!=NULL) { DeleteObject (a); a = NULL; }
-
-static TEmailFunction EmailFunction = NULL;
-
-void setReportEmailFunction (void *emailFunction)
+inline const char *getReportPostURL()
 {
-	EmailFunction = (TEmailFunction)emailFunction;
-
 #ifdef NL_OS_WINDOWS
-	if (sendReport)
-		EnableWindow(sendReport, FALSE);
+	static char buf[512];
+	buf[0] = '\0';
+	int res = GetEnvironmentVariableA(NL_REPORT_POST_URL_ENVVAR, buf, sizeof(buf));
+	if (res <= 0 || res > 511) return NULL;
+	if (buf[0] == '\0') return NULL;
+	return buf;
+#else
+	char *res = getenv(NL_REPORT_POST_URL_ENVVAR);
+	if (res == NULL || res[0] == '\0') return NULL;
+	return res;
 #endif
 }
 
-#ifndef NL_OS_WINDOWS
+TReportResult report(const std::string &title, const std::string &subject, const std::string &body, const std::string &attachment, bool synchronous, bool sendReport, TReportResult defaultResult)
+{
+	std::string reportPath;
+	if (!body.empty())
+	{
+		std::stringstream reportFile;
+		reportFile << getLogDirectory();
+		reportFile << "nel_report_";
+		reportFile << (int)time(NULL);
+		reportFile << ".log";
+		reportPath = CFile::findNewFile(reportFile.str());
+		std::ofstream f;
+		f.open(reportPath.c_str());
+		if (!f.good())
+		{
+#if NL_DEBUG_REPORT
+			if (INelContext::isContextInitialised())
+				nldebug("Failed to write report log to '%s'", reportPath.c_str());
+#endif
+			reportPath.clear();
+		}
+		else
+		{
+			f << body;
+			f.close();
+		}
+	}
 
-// GNU/Linux, do nothing
+	if (INelContext::isContextInitialised()
+		&& INelContext::getInstance().isWindowedApplication()
+		&& CFile::isExists(NL_CRASH_REPORT_TOOL))
+	{
+		std::stringstream params;
+		params << NL_CRASH_REPORT_TOOL;
 
-void report ()
-{
-}
+		if (!reportPath.empty())
+			params << " -log \"" << reportPath << "\"";
 
-#else
+		if (!subject.empty())
+			params << " -attachment \"" << attachment << "\"";
 
-// Windows specific version
+		if (!title.empty())
+			params << " -title \"" << title << "\"";
 
-static string Body;
-static string Subject;
-static string AttachedFile;
+		if (!subject.empty())
+			params << " -subject \"" << subject << "\"";
 
-static HWND checkIgnore=NULL;
-static HWND debug=NULL;
-static HWND ignore=NULL;
-static HWND quit=NULL;
-static HWND dialog=NULL;
+		const char *reportPostUrl = getReportPostURL();
+		if (reportPostUrl)
+			params << " -host \"" << reportPostUrl << "\"";
 
-static bool NeedExit;
-static TReportResult Result;
-static bool IgnoreNextTime;
-static bool CanSendMailReport= false;
+		if (synchronous)
+			params << " -dev";
 
-static bool DebugDefaultBehavior, QuitDefaultBehavior;
+		if (sendReport)
+			params << " -sendreport";
 
-static void sendEmail()
-{
-	if (CanSendMailReport && SendMessage(sendReport, BM_GETCHECK, 0, 0) != BST_CHECKED)
-	{
-		bool res = EmailFunction ("", "", "", Subject, Body, AttachedFile, false);
-		if (res)
+		std::string paramsStr = params.str();
+
+		if (synchronous)
 		{
-			// EnableWindow(sendReport, FALSE);
-			// MessageBox (dialog, "The email was successfully sent", "email", MB_OK);
-#ifndef NL_NO_DEBUG_FILES
-			CFile::createEmptyFile(getLogDirectory() + "report_sent");
+			TReportResult result = (TReportResult)::system(paramsStr.c_str());
+			if (result != ReportAlwaysIgnore
+				&& result != ReportIgnore
+				&& result != ReportAbort
+				&& result != ReportBreak)
+			{
+#if NL_DEBUG_REPORT
+				if (INelContext::isContextInitialised())
+					nldebug("Return default result, invalid return code %i", (int)result);
 #endif
+				return defaultResult;
+			}
+			return result;
 		}
 		else
 		{
-#ifndef NL_NO_DEBUG_FILES
-			CFile::createEmptyFile(getLogDirectory() + "report_failed");
-#endif
-			// MessageBox (dialog, "Failed to send the email", "email", MB_OK | MB_ICONERROR);
+			NLMISC::launchProgram(NL_CRASH_REPORT_TOOL, paramsStr); // FIXME: Don't use this function, it uses logging, etc, so may loop infinitely!
+			return defaultResult;
 		}
 	}
 	else
 	{
-#ifndef NL_NO_DEBUG_FILES
-		CFile::createEmptyFile(getLogDirectory() + "report_refused");
+#if NL_DEBUG_REPORT
+		if (INelContext::isContextInitialised() && !CFile::isExists(NL_CRASH_REPORT_TOOL))
+			nldebug("Crash report tool '%s' does not exist", NL_CRASH_REPORT_TOOL);
 #endif
-	}
-}
-
-static LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-	//MSGFILTER *pmf;
-
-	if (message == WM_COMMAND && HIWORD(wParam) == BN_CLICKED)
-	{
-		if ((HWND) lParam == checkIgnore)
+#if defined(NL_OS_WINDOWS) && !FINAL_VERSION && !NL_REPORT_CONSOLE_DEBUGGER
+		if (IsDebuggerPresent())
 		{
-			IgnoreNextTime = !IgnoreNextTime;
-		}
-		else if ((HWND) lParam == debug)
-		{
-			sendEmail();
-			NeedExit = true;
-			Result = ReportDebug;
-			if (DebugDefaultBehavior)
-			{
-				NLMISC_BREAKPOINT;
-			}
+			return defaultResult;
 		}
-		else if ((HWND) lParam == ignore)
-		{
-			sendEmail();
-			NeedExit = true;
-			Result = ReportIgnore;
-		}
-		else if ((HWND) lParam == quit)
-		{
-			sendEmail();
-			NeedExit = true;
-			Result = ReportQuit;
-
-			if (QuitDefaultBehavior)
-			{
-				// ace: we cannot call exit() because it's call the static object dtor and can crash the application
-				// if the dtor call order is not good.
-				//exit(EXIT_SUCCESS);
-#ifdef NL_OS_WINDOWS
-#ifndef NL_COMP_MINGW
-				// disable the Windows popup telling that the application aborted and disable the dr watson report.
-				_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
-#endif
+		else
 #endif
-				// quit without calling atexit or static object dtors.
-				abort();
-			}
-		}
-		/*else if ((HWND) lParam == sendReport)
+		if (synchronous)
 		{
-			if (EmailFunction != NULL)
+#if NL_REPORT_CONSOLE
+			// An interactive console based report
+			printf("\n");
+			if (!title.empty())
+				printf("%s\n", title.c_str());
+			else
+				printf("NeL report\n");
+			printf("\n");
+			if (!subject.empty())
+				printf("\tsubject: '%s'\n", subject.c_str());
+			if (!body.empty())
+				printf("\tbody: '%s'\n", reportPath.c_str());
+			if (!attachment.empty())
+				printf("\tattachment: '%s'\n", attachment.c_str());
+			for (;;)
 			{
-				bool res = EmailFunction ("", "", "", Subject, Body, AttachedFile, false);
-				if (res)
-				{
-					EnableWindow(sendReport, FALSE);
-					MessageBox (dialog, "The email was successfully sent", "email", MB_OK);
-					CFile::createEmptyFile(getLogDirectory() + "report_sent");
-				}
-				else
+				printf("\n");
+				printf("Always Ignore (S), Ignore (I), Abort (A), Break (B)?\n"); // S for Surpress
+				printf("> ");
+				int c = getchar();
+				getchar();
+				switch (c)
 				{
-					MessageBox (dialog, "Failed to send the email", "email", MB_OK | MB_ICONERROR);
+				case 'S':
+				case 's':
+					return ReportAlwaysIgnore;
+				case 'I':
+				case 'i':
+					return ReportIgnore;
+				case 'A':
+				case 'a':
+					return ReportAbort;
+				case 'B':
+				case 'b':
+					return ReportBreak;
 				}
 			}
-		}*/
-	}
-	else if (message == WM_CHAR)
-	{
-		if (wParam == 27)
-		{
-			// ESC -> ignore
-			sendEmail();
-			NeedExit = true;
-			Result = ReportIgnore;
-		}
-	}
-
-	return DefWindowProc (hWnd, message, wParam, lParam);
-}
-
-TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const string &attachedFile)
-{
-	// register the window
-	static bool AlreadyRegister = false;
-	if(!AlreadyRegister)
-	{
-		WNDCLASSW wc;
-		memset (&wc,0,sizeof(wc));
-		wc.style			= CS_HREDRAW | CS_VREDRAW;
-		wc.lpfnWndProc		= (WNDPROC)WndProc;
-		wc.cbClsExtra		= 0;
-		wc.cbWndExtra		= 0;
-		wc.hInstance		= GetModuleHandle(NULL);
-		wc.hIcon			= NULL;
-		wc.hCursor			= LoadCursor(NULL,IDC_ARROW);
-		wc.hbrBackground	= (HBRUSH)COLOR_WINDOW;
-		wc.lpszClassName	= L"NLReportWindow";
-		wc.lpszMenuName		= NULL;
-		if (!RegisterClassW(&wc)) return ReportError;
-		AlreadyRegister = true;
-	}
-
-	ucstring formatedTitle = title.empty() ? ucstring("NeL report") : ucstring(title);
-
-
-	// create the window
-	dialog = CreateWindowW (L"NLReportWindow", (LPCWSTR)formatedTitle.c_str(), WS_DLGFRAME | WS_CAPTION /*| WS_THICKFRAME*/, CW_USEDEFAULT, CW_USEDEFAULT, 456, 400,  NULL, NULL, GetModuleHandle(NULL), NULL);
-
-	// create the font
-	HFONT font = CreateFont (-12, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, "Arial");
-
-	Subject = subject;
-	AttachedFile = attachedFile;
-
-	// create the edit control
-	HWND edit = CreateWindowW (L"EDIT", NULL, WS_BORDER | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL | ES_READONLY | ES_LEFT | ES_MULTILINE, 7, 70, 429, 212, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (edit, WM_SETFONT, (WPARAM) font, TRUE);
-
-	// set the edit text limit to lot of :)
-	SendMessage (edit, EM_LIMITTEXT, ~0U, 0);
-
-	Body = addSlashR (body);
-
-	// set the message in the edit text
-	SendMessage (edit, WM_SETTEXT, (WPARAM)0, (LPARAM)Body.c_str());
-
-	if (enableCheckIgnore)
-	{
-		// create the combo box control
-		checkIgnore = CreateWindowW (L"BUTTON", L"Don't display this report again", WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX | BS_CHECKBOX, 7, 290, 429, 18, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-		SendMessage (checkIgnore, WM_SETFONT, (WPARAM) font, TRUE);
-
-		if(ignoreNextTime)
-		{
-			SendMessage (checkIgnore, BM_SETCHECK, BST_CHECKED, 0);
+#else
+			return defaultResult;
+#endif
 		}
-	}
-
-	// create the debug button control
-	debug = CreateWindowW (L"BUTTON", L"Debug", WS_CHILD | WS_VISIBLE, 7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (debug, WM_SETFONT, (WPARAM) font, TRUE);
-
-	if (debugButton == 0)
-		EnableWindow(debug, FALSE);
-
-	// create the ignore button control
-	ignore = CreateWindowW (L"BUTTON", L"Ignore", WS_CHILD | WS_VISIBLE, 75+7+7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (ignore, WM_SETFONT, (WPARAM) font, TRUE);
-
-	if (ignoreButton == 0)
-		EnableWindow(ignore, FALSE);
-
-	// create the quit button control
-	quit = CreateWindowW (L"BUTTON", L"Quit", WS_CHILD | WS_VISIBLE, 75+75+7+7+7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (quit, WM_SETFONT, (WPARAM) font, TRUE);
-
-	if (quitButton == 0)
-		EnableWindow(quit, FALSE);
-
-	// create the debug button control
-	sendReport = CreateWindowW (L"BUTTON", L"Don't send the report", WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 7, 315+32, 429, 18, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (sendReport, WM_SETFONT, (WPARAM) font, TRUE);
-
-	string formatedHeader;
-	if (header.empty())
-	{
-		formatedHeader = "This application stopped to display this report.";
-	}
-	else
-	{
-		formatedHeader = header;
-	}
-
-	// ace don't do that because it s slow to try to send a mail
-	//CanSendMailReport  = sendReportButton && EmailFunction != NULL && EmailFunction("", "", "", "", "", true);
-	CanSendMailReport  = sendReportButton && EmailFunction != NULL;
-
-	if (CanSendMailReport)
-		formatedHeader += " Send report will only email the contents of the box below. Please, send it to help us (it could take few minutes to send the email, be patient).";
-	else
-		EnableWindow(sendReport, FALSE);
-
-	ucstring uc = ucstring::makeFromUtf8(formatedHeader);
-
-	// create the label control
-	HWND label = CreateWindowW (L"STATIC", (LPCWSTR)uc.c_str(), WS_CHILD | WS_VISIBLE /*| SS_WHITERECT*/, 7, 7, 429, 51, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (label, WM_SETFONT, (WPARAM) font, TRUE);
-
-
-	DebugDefaultBehavior = debugButton==1;
-	QuitDefaultBehavior = quitButton==1;
-
-	IgnoreNextTime = ignoreNextTime;
-
-	// show until the cursor really show :)
-	while (ShowCursor(TRUE) < 0)
-		;
-
-	SetWindowPos (dialog, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
-
-	SetFocus(dialog);
-	SetForegroundWindow(dialog);
-
-	NeedExit = false;
-
-	while(!NeedExit)
-	{
-		MSG	msg;
-		while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
+		else
 		{
-			TranslateMessage(&msg);
-			DispatchMessageW(&msg);
+			return defaultResult;
 		}
-		nlSleep (1);
 	}
-
-	// set the user result
-	ignoreNextTime = IgnoreNextTime;
-
-	ShowWindow(dialog, SW_HIDE);
-
-
-
-	DELETE_OBJECT(sendReport)
-	DELETE_OBJECT(quit)
-	DELETE_OBJECT(ignore)
-	DELETE_OBJECT(debug)
-	DELETE_OBJECT(checkIgnore)
-	DELETE_OBJECT(edit)
-	DELETE_OBJECT(label)
-	DELETE_OBJECT(dialog)
-
-	return Result;
 }
 
-#endif
-
-
 } // NLMISC
diff --git a/code/nel/src/misc/shared_memory.cpp b/code/nel/src/misc/shared_memory.cpp
index 7b11fea52..3afe795f1 100644
--- a/code/nel/src/misc/shared_memory.cpp
+++ b/code/nel/src/misc/shared_memory.cpp
@@ -19,12 +19,7 @@
 #include "nel/misc/shared_memory.h"
 #include "nel/misc/debug.h"
 
-#ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
-#else
+#ifndef NL_OS_WINDOWS
 #	include <sys/types.h>
 #	include <sys/ipc.h>
 #	include <sys/shm.h>
diff --git a/code/nel/src/misc/sheet_id.cpp b/code/nel/src/misc/sheet_id.cpp
index 83dd4be89..690d09ab1 100644
--- a/code/nel/src/misc/sheet_id.cpp
+++ b/code/nel/src/misc/sheet_id.cpp
@@ -217,7 +217,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
 			return true;
 		}
 	}
-	
+
 #ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
 	if (a_NoSoundSheetId && sheetName.find(".sound") != std::string::npos)
 	{
@@ -236,7 +236,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
 		return true;
 	}
 #endif
-	
+
 	return false;
 }
 
@@ -417,10 +417,10 @@ void CSheetId::initWithoutSheet()
 		nlassert(_DontHaveSheetKnowledge);
 		return;
 	}
-	
+
 	_Initialised = true;
 	_DontHaveSheetKnowledge = true;
-	
+
 	// Initialize id 0,0 as unknown.unknown
 	CSheetId unknownunknown = CSheetId("unknown.unknown");
 	nlassert(unknownunknown == CSheetId::Unknown);
@@ -525,7 +525,7 @@ bool CSheetId::operator < (const CSheetId& sheetRef ) const
 string CSheetId::toString(bool ifNotFoundUseNumericId) const
 {
 	if (!_Initialised) init(false);
-	
+
 	if (_DontHaveSheetKnowledge)
 	{
 		// FIXME: When someone punches in a fake sheet id this will 
@@ -564,7 +564,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
 void CSheetId::serial(NLMISC::IStream	&f) throw(NLMISC::EStream)
 {
 	nlassert(!_DontHaveSheetKnowledge);
-	
+
 	f.serial( _Id.Id );
 
 #ifdef NL_DEBUG_SHEET_ID
diff --git a/code/nel/src/misc/sstring.cpp b/code/nel/src/misc/sstring.cpp
index fe9332328..833553f21 100644
--- a/code/nel/src/misc/sstring.cpp
+++ b/code/nel/src/misc/sstring.cpp
@@ -1731,7 +1731,9 @@ namespace NLMISC
 
 	double CSString::atof() const
 	{
-		return ::atof(c_str());
+		double val;
+		NLMISC::fromString(*this, val);
+		return val;
 	}
 
 	bool CSString::readFromFile(const CSString& fileName)
diff --git a/code/nel/src/misc/stdmisc.h b/code/nel/src/misc/stdmisc.h
index b98d92d2a..b24a74616 100644
--- a/code/nel/src/misc/stdmisc.h
+++ b/code/nel/src/misc/stdmisc.h
@@ -42,12 +42,20 @@
 #include <utility>
 #include <vector>
 
-#ifdef _WIN32
-#	ifndef __MINGW32__
-		#define NOMINMAX
+#include <nel/misc/types_nl.h>
+
+#ifdef NL_OS_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	define _WIN32_WINDOWS 0x0410
+#	ifndef _WIN32_WINNT
+#		define _WIN32_WINNT 0x0400
+#	endif
+#	ifndef NL_COMP_MINGW
+#		define WINVER 0x0400
+#		define NOMINMAX
 #	endif
 #	include <WinSock2.h>
-#	include <windows.h>
+#	include <Windows.h>
 #endif
 
 #endif // NL_STDMISC_H
diff --git a/code/nel/src/misc/system_info.cpp b/code/nel/src/misc/system_info.cpp
index 31cde5283..8524939c8 100644
--- a/code/nel/src/misc/system_info.cpp
+++ b/code/nel/src/misc/system_info.cpp
@@ -19,10 +19,6 @@
 #include "nel/misc/system_info.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <WinNT.h>
 #	include <tchar.h>
 #	include <intrin.h>
diff --git a/code/nel/src/misc/system_utils.cpp b/code/nel/src/misc/system_utils.cpp
index a66eed02f..e298f941c 100644
--- a/code/nel/src/misc/system_utils.cpp
+++ b/code/nel/src/misc/system_utils.cpp
@@ -18,16 +18,12 @@
 #include "nel/misc/system_utils.h"
 
 #ifdef NL_OS_WINDOWS
-	#ifndef NL_COMP_MINGW
-		#define NOMINMAX
-	#endif
-	#include <windows.h>
-
-	#ifdef _WIN32_WINNT_WIN7
+#	include <ObjBase.h>
+#	ifdef _WIN32_WINNT_WIN7
 		// only supported by Windows 7 Platform SDK
-		#include <ShObjIdl.h>
-		#define TASKBAR_PROGRESS 1
-	#endif
+#		include <ShObjIdl.h>
+#		define TASKBAR_PROGRESS 1
+#	endif
 #endif
 
 #ifdef DEBUG_NEW
diff --git a/code/nel/src/misc/time_nl.cpp b/code/nel/src/misc/time_nl.cpp
index 8aacbd002..70b7b3807 100644
--- a/code/nel/src/misc/time_nl.cpp
+++ b/code/nel/src/misc/time_nl.cpp
@@ -21,10 +21,7 @@
 #include "nel/misc/thread.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
+#	include <MMSystem.h>
 #elif defined (NL_OS_UNIX)
 #	include <sys/time.h>
 #	include <unistd.h>
diff --git a/code/nel/src/misc/win32_util.cpp b/code/nel/src/misc/win32_util.cpp
index 63315e1b2..6085e98e5 100644
--- a/code/nel/src/misc/win32_util.cpp
+++ b/code/nel/src/misc/win32_util.cpp
@@ -20,8 +20,6 @@
 
 #ifdef NL_OS_WINDOWS
 
-#include <windows.h>
-
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
 #endif
diff --git a/code/nel/src/misc/win_displayer.cpp b/code/nel/src/misc/win_displayer.cpp
index 95b6b34cf..5da7db65b 100644
--- a/code/nel/src/misc/win_displayer.cpp
+++ b/code/nel/src/misc/win_displayer.cpp
@@ -18,10 +18,6 @@
 #include "nel/misc/win_displayer.h"
 
 #ifdef NL_OS_WINDOWS
-#ifndef NL_COMP_MINGW
-#	define NOMINMAX
-#endif
-#include <windows.h>
 #include <windowsx.h>
 #include <winuser.h>
 #include <cstring>
@@ -30,6 +26,7 @@
 #include <commctrl.h>
 #include <ctime>
 
+#include "nel/misc/app_context.h"
 #include "nel/misc/path.h"
 #include "nel/misc/command.h"
 #include "nel/misc/thread.h"
@@ -45,6 +42,13 @@ namespace NLMISC {
 
 static CHARFORMAT2 CharFormat;
 
+CWinDisplayer::CWinDisplayer(const char *displayerName) : CWindowDisplayer(displayerName), Exit(false)
+{
+	needSlashR = true;
+	createLabel("@Clear|CLEAR");
+
+	INelContext::getInstance().setWindowedApplication(true);
+}
 
 CWinDisplayer::~CWinDisplayer ()
 {
diff --git a/code/nel/src/misc/win_event_emitter.cpp b/code/nel/src/misc/win_event_emitter.cpp
index 01da89564..67e426f1e 100644
--- a/code/nel/src/misc/win_event_emitter.cpp
+++ b/code/nel/src/misc/win_event_emitter.cpp
@@ -22,10 +22,6 @@
 #include "nel/misc/event_server.h"
 
 #ifdef NL_OS_WINDOWS
-#ifndef NL_COMP_MINGW
-#define NOMINMAX
-#endif
-#include <windows.h>
 #include <windowsx.h>
 
 /**
diff --git a/code/nel/src/misc/win_thread.cpp b/code/nel/src/misc/win_thread.cpp
index f556779ba..4178b7a58 100644
--- a/code/nel/src/misc/win_thread.cpp
+++ b/code/nel/src/misc/win_thread.cpp
@@ -198,7 +198,7 @@ void CWinThread::start ()
 {
 	if (isRunning())
 		throw EThread("Starting a thread that is already started, existing thread will continue running, this should not happen");	
-	
+
 //	ThreadHandle = (void *) ::CreateThread (NULL, _StackSize, ProxyFunc, this, 0, (DWORD *)&ThreadId);
 	ThreadHandle = (void *) ::CreateThread (NULL, 0, ProxyFunc, this, 0, (DWORD *)&ThreadId);
 //	nldebug("NLMISC: thread %x started for runnable '%x'", typeid( Runnable ).name());
diff --git a/code/nel/src/misc/words_dictionary.cpp b/code/nel/src/misc/words_dictionary.cpp
index e2113e62d..4d5057dd7 100644
--- a/code/nel/src/misc/words_dictionary.cpp
+++ b/code/nel/src/misc/words_dictionary.cpp
@@ -251,7 +251,7 @@ void CWordsDictionary::exactLookupByKey( const CSString& key, CVectorSString& re
  */
 inline CSString CWordsDictionary::makeResult( const CSString &key, const CSString &word )
 {
-	return key + CSString(": ") + word;
+	return key + ": " + word.c_str();
 }
 
 
diff --git a/code/nel/src/net/service.cpp b/code/nel/src/net/service.cpp
index f42806245..1f3436d1c 100644
--- a/code/nel/src/net/service.cpp
+++ b/code/nel/src/net/service.cpp
@@ -23,12 +23,6 @@
 #ifdef NL_OS_WINDOWS
 // these defines is for IsDebuggerPresent(). it'll not compile on windows 95
 // just comment this and the IsDebuggerPresent to compile on windows 95
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#		define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <direct.h>
 #elif defined NL_OS_UNIX
 #	include <unistd.h>
@@ -606,7 +600,7 @@ sint IService::main (const char *serviceShortName, const char *serviceLongName,
 
 		ListeningPort = servicePort;
 
-		setReportEmailFunction ((void*)sendEmail);
+		// setReportEmailFunction ((void*)sendEmail);
 		// setDefaultEmailParams ("gw.nevrax.com", "", "cado@nevrax.com");
 
 
diff --git a/code/nel/src/net/stdnet.h b/code/nel/src/net/stdnet.h
index d18db3222..df2bc931d 100644
--- a/code/nel/src/net/stdnet.h
+++ b/code/nel/src/net/stdnet.h
@@ -17,7 +17,9 @@
 #include "nel/misc/types_nl.h"
 
 #ifdef NL_OS_WINDOWS
+#	define _WIN32_WINDOWS	0x0410
 #	ifndef NL_COMP_MINGW
+#		define WINVER			0x0400
 #		define NOMINMAX
 #	endif
 #	include <winsock2.h>
diff --git a/code/nel/src/pacs/local_retriever.cpp b/code/nel/src/pacs/local_retriever.cpp
index 7158cee0a..c17709c70 100644
--- a/code/nel/src/pacs/local_retriever.cpp
+++ b/code/nel/src/pacs/local_retriever.cpp
@@ -2253,7 +2253,7 @@ bool	NLPACS::CLocalRetriever::checkSurfaceIntegrity(uint surf, NLMISC::CVector t
 
 				for (k=0; k+1<ochain.getVertices().size(); ++k)
 				{
-					edges.push_back(make_pair<CVector2s, CVector2s>(ochain[k], ochain[k+1]));
+					edges.push_back(std::pair<CVector2s, CVector2s>(ochain[k], ochain[k+1]));
 				}
 			}
 		}
diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt
index 2cf570f69..6b0dc285d 100644
--- a/code/nel/src/sound/CMakeLists.txt
+++ b/code/nel/src/sound/CMakeLists.txt
@@ -86,6 +86,7 @@ NL_TARGET_LIB(nelsound ${HEADERS} ${SRC})
 
 
 INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nelsound ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
 
diff --git a/code/nel/src/sound/driver/dsound/source_dsound.h b/code/nel/src/sound/driver/dsound/source_dsound.h
index 81174c1a0..1aa2d5625 100644
--- a/code/nel/src/sound/driver/dsound/source_dsound.h
+++ b/code/nel/src/sound/driver/dsound/source_dsound.h
@@ -80,7 +80,7 @@ enum TSourceDSoundEndState
 class CSourceDSound : public ISource
 {
 	friend class CSoundDriverDSound;
-	
+
 public:
 	/// Constructor
 	CSourceDSound(uint sourcename = 0);
@@ -446,7 +446,7 @@ private:
 	
 	// Set the 'used' state of the source. Managed by the driver.
 	void					setUsed(bool v) { _IsUsed = v; }
-	
+
 	// Return the 'used' state of the source
 	bool					isUsed() { return _IsUsed; }
 */
diff --git a/code/nel/src/sound/driver/fmod/source_fmod.cpp b/code/nel/src/sound/driver/fmod/source_fmod.cpp
index c5c6e8266..6026ce2f5 100644
--- a/code/nel/src/sound/driver/fmod/source_fmod.cpp
+++ b/code/nel/src/sound/driver/fmod/source_fmod.cpp
@@ -419,7 +419,7 @@ void CSourceFMod::setMinMaxDistances( float mindist, float maxdist, bool /* defe
 		nlwarning("SOUND_DEV (FMod): Ridiculously high max distance set on source");
 		maxdist = maxSqrt;
 	}
-	
+
 	_MinDist= mindist;
 	_MaxDist= maxdist;
 	if(_FModChannel!=-1)
diff --git a/code/nel/src/sound/driver/openal/buffer_al.cpp b/code/nel/src/sound/driver/openal/buffer_al.cpp
index b63e39fa2..352128c3e 100644
--- a/code/nel/src/sound/driver/openal/buffer_al.cpp
+++ b/code/nel/src/sound/driver/openal/buffer_al.cpp
@@ -121,7 +121,7 @@ bool CBufferAL::unlock(uint size)
 	// Error handling
 	if (alGetError() == AL_NO_ERROR)
 		_IsLoaded = true; // ->lock() set it to false
-	
+
 	return _IsLoaded;
 }
 
@@ -162,7 +162,7 @@ bool CBufferAL::fill(const uint8 *src, uint size)
 
 	// Error handling
 	_IsLoaded = (alGetError() == AL_NO_ERROR);
-	
+
 	return _IsLoaded;
 }
 
diff --git a/code/nel/src/sound/simple_source.cpp b/code/nel/src/sound/simple_source.cpp
index 2c9dda86c..9b9ee5950 100644
--- a/code/nel/src/sound/simple_source.cpp
+++ b/code/nel/src/sound/simple_source.cpp
@@ -176,7 +176,7 @@ void CSimpleSource::play()
 		
 		// and play the sound
 		bool play = pSource->play();		
-		
+
 #ifdef NL_DEBUG
 		nlassert(play);
 #else
diff --git a/code/nel/src/sound/sound_animation.cpp b/code/nel/src/sound/sound_animation.cpp
index 5a6f1c256..1d1f9093a 100644
--- a/code/nel/src/sound/sound_animation.cpp
+++ b/code/nel/src/sound/sound_animation.cpp
@@ -176,7 +176,10 @@ void CSoundAnimation::load()
 				throw NLMISC::Exception("Invalid sound animation marker");
 			}
 
-			marker->setTime((float) atof(time));
+			float val;
+			NLMISC::fromString(time, val);
+
+			marker->setTime(val);
 			xmlFree ((void*)time);
 
 
diff --git a/code/nel/tools/3d/ligo/plugin_max/script.cpp b/code/nel/tools/3d/ligo/plugin_max/script.cpp
index 41740bcbe..8a88136c5 100644
--- a/code/nel/tools/3d/ligo/plugin_max/script.cpp
+++ b/code/nel/tools/3d/ligo/plugin_max/script.cpp
@@ -1739,14 +1739,14 @@ bool MakeSnapShot (NLMISC::CBitmap &snapshot, const NL3D::CTileBank &tileBank, c
 		float posY = config.CellSize * (float)ymin;
 
 		// Use NELU
-		if (CNELU::init (oversampledWidth, oversampledHeight, CViewport(), 32, true, NULL, true))
+		if (CNELU::init (oversampledWidth, oversampledHeight, CViewport(), 32, true, NULL, false, true)) // FIXME: OpenGL not working correctly, offscreen not available in Direct3D
 		{
 			// Setup the camera
 			CNELU::Camera->setTransformMode (ITransformable::DirectMatrix);
 			CMatrix view;
 			view.setPos (CVector (width/2 + posX, height/2 + posY, width));
 			view.setRot (CVector::I, -CVector::K, CVector::J);
-			CNELU::Camera->setFrustum (width, height, 0.1f, 1000.f, false);
+			CNELU::Camera->setFrustum (width, height, 0.1f, 10000.f, false);
 			CNELU::Camera->setMatrix (view);
 
 			// Create a Landscape.
@@ -1766,12 +1766,17 @@ bool MakeSnapShot (NLMISC::CBitmap &snapshot, const NL3D::CTileBank &tileBank, c
 			theLand->enableAdditive (true);
 			theLand->Landscape.setRefineMode (true);
 
+			// theLand->Landscape.setupStaticLight(CRGBA(255, 255, 255), CRGBA(0, 0, 0), 1.0f);
+			// theLand->Landscape.setThreshold(0.0005);
+
 			// Enbable automatique lighting
 	#ifndef NL_DEBUG
-			theLand->Landscape.enableAutomaticLighting (true);
-			theLand->Landscape.setupAutomaticLightDir (CVector (0, 0, -1));
+			// theLand->Landscape.enableAutomaticLighting (true);
+			// theLand->Landscape.setupAutomaticLightDir (CVector (0, 0, -1));
 	#endif // NL_DEBUG
 
+			// theLand->Landscape.updateLightingAll();
+
 			// Clear the backbuffer and the alpha
 			CNELU::clearBuffers(CRGBA(255,0,255,0));
 
@@ -1851,7 +1856,7 @@ bool MakeSnapShot (NLMISC::CBitmap &snapshot, const NL3D::CTileBank &tileBank, c
 Value* make_snapshot_cf (Value** arg_list, int count)
 {
 	// Make sure we have the correct number of arguments (7)
-	check_arg_count(check_zone_with_template, 7, count);
+	check_arg_count(NeLLigoMakeSnapShot, 7, count);
 
 	// Check to see if the arguments match up to what we expect
 	char *message = "NeLLigoMakeSnapShot [Object] [Snapshot filename] [xMin] [xMax] [yMin] [yMax] [Error in dialog]";
@@ -1903,11 +1908,11 @@ Value* make_snapshot_cf (Value** arg_list, int count)
 			else
 			{
 				// Build a filename
-				char drive[512];
-				char path[512];
-				char name[512];
-				char ext[512];
-				_splitpath (fileName.c_str(), drive, path, name, ext);
+				char drivetga[512];
+				char pathtga[512];
+				char nametga[512];
+				char exttga[512];
+				_splitpath (fileName.c_str(), drivetga, pathtga, nametga, exttga);
 
 				// Build the zone
 				CZone zone;
@@ -1970,7 +1975,7 @@ Value* make_snapshot_cf (Value** arg_list, int count)
 								{
 									// Build the snap shot filename
 									char outputFilenameSnapShot[512];
-									_makepath (outputFilenameSnapShot, drive, path, name, ".tga");
+									_makepath (outputFilenameSnapShot, drivetga, pathtga, nametga, ".tga");
 
 									// Output the snap shot
 									COFile outputSnapShot;
@@ -2011,10 +2016,10 @@ Value* make_snapshot_cf (Value** arg_list, int count)
 
 										// Write the zone
 										COFile outputLigoZone;
-										_makepath (outputFilenameSnapShot, drive, path, name, ".ligozone");
+										_makepath (outputFilenameSnapShot, drivetga, pathtga, nametga, ".ligozone");
 
 										// Catch exception
-										try
+										/*try
 										{
 											// Open the selected zone file
 											if (outputLigoZone.open (outputFilenameSnapShot))
@@ -2043,7 +2048,7 @@ Value* make_snapshot_cf (Value** arg_list, int count)
 											char tmp[512];
 											smprintf (tmp, 512, "Error while loading the file %s : %s", fileName, e.what());
 											CMaxToLigo::errorMessage (tmp, "NeL Ligo export zone", *MAXScript_interface, errorInDialog);
-										}
+										}*/
 									}
 									else
 									{
diff --git a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
index af026b3df..4d0936a1a 100644
--- a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
+++ b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
@@ -185,7 +185,7 @@ namespace NLQT
 
 		NL3D::CBloomEffect::instance().setDriver(_Driver);
 		NL3D::CBloomEffect::instance().setScene(_Scene);
-		NL3D::CBloomEffect::instance().init(!_Direct3D);
+		NL3D::CBloomEffect::instance().init();
 		//NL3D::CBloomEffect::instance().setDensityBloom(Modules::config().getConfigFile().getVar("BloomDensity").asInt());
 		//NL3D::CBloomEffect::instance().setSquareBloom(Modules::config().getConfigFile().getVar("BloomSquare").asBool());
 	}
@@ -366,7 +366,7 @@ namespace NLQT
 		// Render the scene.
 		if((NL3D::CBloomEffect::instance().getDriver() != NULL) && (_BloomEffect))
 		{
-			NL3D::CBloomEffect::instance().initBloom();
+			NL3D::CBloomEffect::instance().init();
 		}
 		_Driver->clearBuffers(_BackgroundColor);
 	}
@@ -378,8 +378,7 @@ namespace NLQT
 
 		if((NL3D::CBloomEffect::instance().getDriver() != NULL) && (_BloomEffect))
 		{
-			NL3D::CBloomEffect::instance().endBloom();
-			NL3D::CBloomEffect::instance().endInterfacesDisplayBloom();
+			NL3D::CBloomEffect::instance().applyBloom();
 		}
 	}
 
diff --git a/code/nel/tools/3d/panoply_maker/color_modifier.cpp b/code/nel/tools/3d/panoply_maker/color_modifier.cpp
index 3c4b1814d..a55936b7c 100644
--- a/code/nel/tools/3d/panoply_maker/color_modifier.cpp
+++ b/code/nel/tools/3d/panoply_maker/color_modifier.cpp
@@ -70,7 +70,6 @@ void CColorModifier::convertBitmap(NLMISC::CBitmap &destBitmap, const NLMISC::CB
 
 			// blend to the destination by using the mask alpha			
 			result.blendFromui(*dest, result, mask->R);
-			
 
 			/// keep alpha from the source			
 			dest->R = result.R;
@@ -78,7 +77,6 @@ void CColorModifier::convertBitmap(NLMISC::CBitmap &destBitmap, const NLMISC::CB
 			dest->B = result.B;
 			dest->A = src->A;
 
-						
 			++ mask;
 			++ src;
 			++ dest;
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
index 57edca682..d01762618 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
@@ -575,8 +575,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 10, 0, 0
- PRODUCTVERSION 0, 10, 0, 0
+ FILEVERSION 0, 11, 0, 0
+ PRODUCTVERSION 0, 11, 0, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -593,14 +593,14 @@ BEGIN
         BEGIN
             VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
             VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.10.0\0"
+            VALUE "FileVersion", "0.11.0\0"
             VALUE "InternalName", "CNelExport\0"
             VALUE "LegalCopyright", "\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "CNelExport.dlu\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.10.0\0"
+            VALUE "ProductVersion", "0.11.0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp
index d6bdbb690..d82e2a394 100644
--- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp
@@ -2144,6 +2144,8 @@ void appendLightmapLog (COFile &outputLog, const char *lightmapName, const vecto
 bool CExportNel::calculateLM( CMesh::CMeshBuild *pZeMeshBuild, CMeshBase::CMeshBaseBuild *pZeMeshBaseBuild, INode& ZeNode, 
 							TimeValue tvTime, uint firstMaterial, bool outputLightmapLog)
 {
+	nldebug("Calculate LM: '%s'", ZeNode.GetName());
+
 	DWORD t = timeGetTime();
 
 	uint32 i, j;
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
index aa8749a3e..b6eea41a6 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
@@ -85,8 +85,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 10, 0, 0
- PRODUCTVERSION 0, 10, 0, 0
+ FILEVERSION 0, 11, 0, 0
+ PRODUCTVERSION 0, 11, 0, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -103,12 +103,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "http://www.ryzomcore.org/"
             VALUE "FileDescription", "PatchMesh to RykolPatchMesh"
-            VALUE "FileVersion", "0.10.0"
+            VALUE "FileVersion", "0.11.0"
             VALUE "InternalName", "PatchMesh to RykolPatchMesh"
             VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd."
             VALUE "OriginalFilename", "nel_convert_patch.dlm"
             VALUE "ProductName", "NeL Patch Converter"
-            VALUE "ProductVersion", "0.10.0"
+            VALUE "ProductVersion", "0.11.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
index 8acae94bd..80e715f21 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
@@ -338,6 +338,8 @@ get_selected_tile_cf(Value** arg_list, int count)
 				if (tri->rpatch->tileSel[i])
 					array->append(Integer::intern(i+1));
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -383,6 +385,8 @@ get_selected_patch_cf(Value** arg_list, int count)
 				if (tri->patch.patchSel[i])
 					array->append(Integer::intern(i+1));
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -428,6 +432,8 @@ get_selected_vertex_cf(Value** arg_list, int count)
 				if (tri->patch.vertSel[i])
 					array->append(Integer::intern(i+1));
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -617,6 +623,8 @@ set_vertex_count_cf(Value** arg_list, int count)
 		{
 			nRet=tri->patch.numVerts;
 		}
+		if (os.obj != tri)
+			delete tri;
 	}
 
 	return Integer::intern(nRet);
@@ -655,6 +663,8 @@ set_vector_count_cf(Value** arg_list, int count)
 		{
 			nRet=tri->patch.numVecs;
 		}
+		if (os.obj != tri)
+			delete tri;
 	}
 
 	return Integer::intern(nRet);
@@ -702,6 +712,8 @@ set_vertex_pos_cf(Value** arg_list, int count)
 				node->NotifyDependents(FOREVER, PART_ALL, REFMSG_CHANGE); 
 				ip->RedrawViews(ip->GetTime());
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -750,6 +762,8 @@ set_vector_pos_cf(Value** arg_list, int count)
 				node->NotifyDependents(FOREVER, PART_ALL, REFMSG_CHANGE); 
 				ip->RedrawViews(ip->GetTime());
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -792,6 +806,8 @@ get_vertex_pos_cf(Value** arg_list, int count)
 			{
 				vRet=new Point3Value (tri->patch.verts[nVertex].p);
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -834,6 +850,8 @@ get_vector_pos_cf(Value** arg_list, int count)
 			{
 				vRet=new Point3Value (tri->patch.vecs[nVertex].p);
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -877,6 +895,8 @@ get_edge_vect1_cf(Value** arg_list, int count)
 			{
 				nVert=tri->patch.edges[nEdge].vec12;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -919,6 +939,8 @@ get_edge_vect2_cf(Value** arg_list, int count)
 			{
 				nVert=tri->patch.edges[nEdge].vec21;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -961,6 +983,8 @@ get_edge_vert1_cf(Value** arg_list, int count)
 			{
 				nVert=tri->patch.edges[nEdge].v1;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -1004,6 +1028,8 @@ get_edge_vert2_cf(Value** arg_list, int count)
 			{
 				nVert=tri->patch.edges[nEdge].v2;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -1050,6 +1076,8 @@ get_sel_edge_cf(Value** arg_list, int count)
 					array->append(Integer::intern(i+1));
 					//array->data[j++]=;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -1158,6 +1186,8 @@ set_tile_steps_cf(Value** arg_list, int count)
 				nTess=5;
 			tri->rpatch->rTess.TileTesselLevel=nTess;
 			tri->rpatch->InvalidateChannels (PART_ALL);
+			if (os.obj != tri)
+				delete tri;
 		}	
 		if (bRet)
 		{
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/editpat.h b/code/nel/tools/3d/plugin_max/nel_patch_edit/editpat.h
index d0bfd1773..ec8947571 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/editpat.h
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/editpat.h
@@ -755,6 +755,7 @@ class EditPatchMod : public Modifier, IPatchOps, IPatchSelect, ISubMtlAPI, Attac
 		TCHAR *GetObjectName() { return GetString(IDS_TH_EDITPATCH); }
 		void ActivateSubobjSel(int level, XFormModes& modes );
 		int NeedUseSubselButton() { return 0; }
+		void SelectSubPatch(int index);
 		void SelectSubComponent( HitRecord *hitRec, BOOL selected, BOOL all, BOOL invert );
 		void ClearSelection(int selLevel);
 		void SelectAll(int selLevel);
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
index adc44260e..6de328356 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
@@ -514,8 +514,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 10, 0, 0
- PRODUCTVERSION 0, 10, 0, 0
+ FILEVERSION 0, 11, 2, 0
+ PRODUCTVERSION 0, 11, 2, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -533,13 +533,13 @@ BEGIN
             VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
             VALUE "CompanyName", "Ryzom Core"
             VALUE "FileDescription", "NeL Patch Edit"
-            VALUE "FileVersion", "0.10.0"
+            VALUE "FileVersion", "0.11.2"
             VALUE "InternalName", "neleditpatch"
             VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc."
             VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF."
             VALUE "OriginalFilename", "neleditpatch.dlm"
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", "0.10.0"
+            VALUE "ProductVersion", "0.11.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp b/code/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp
index 7b1c9c644..133d0b4d6 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp
@@ -84,6 +84,31 @@
  *>	Copyright(c) 1994, All Rights Reserved.
  **********************************************************************/
 #include "stdafx.h"
+
+#if MAX_VERSION_MAJOR >= 14
+#	include <maxscript/maxscript.h>
+#	include <maxscript/foundation/3dmath.h>
+#	include <maxscript/foundation/numbers.h>
+#	include <maxscript/maxwrapper/maxclasses.h>
+#	include <maxscript/foundation/streams.h>
+#	include <maxscript/foundation/mxstime.h>
+#	include <maxscript/maxwrapper/mxsobjects.h>
+#	include <maxscript/compiler/parser.h>
+#	include <maxscript/macros/define_instantiation_functions.h>
+#else
+#	include <MaxScrpt/maxscrpt.h>
+#	include <MaxScrpt/3dmath.h>
+//	Various MAX and MXS includes
+#	include <MaxScrpt/Numbers.h>
+#	include <MaxScrpt/MAXclses.h>
+#	include <MaxScrpt/Streams.h>
+#	include <MaxScrpt/MSTime.h>
+#	include <MaxScrpt/MAXObj.h>
+#	include <MaxScrpt/Parser.h>
+//	define the new primitives using macros from SDK
+#	include <MaxScrpt/definsfn.h>
+#endif
+
 #include "editpat.h"
 #include "../nel_patch_lib/vertex_neighborhood.h"
 
@@ -855,3 +880,67 @@ void ResetVert (PatchMesh *patch)
 	patch->computeInteriors();
 	patch->InvalidateGeomCache ();
 }
+
+def_visible_primitive(turn_patch, "RykolTurnPatch");
+
+Value *turn_patch_cf (Value** arg_list, int count)
+{
+	// Make sure we have the correct number of arguments (2)
+	check_arg_count(RykolTurnPatch, 3, count);
+
+	// Check to see if the arguments match up to what we expect
+	// We want to use 'TurnAllTexturesOn <object to use>'
+	type_check(arg_list[0], MAXNode, "RykolTurnPatch [Node] [Modifier] [Patch]");
+    type_check(arg_list[1], MAXModifier, "RykolTurnPatch [Node] [Modifier] [Patch]"); 
+	type_check(arg_list[2], Integer, "RykolTurnPatch [Node] [Modifier] [Patch]");
+
+	// Get a good interface pointer
+	Interface *ip = MAXScript_interface;
+
+	// Get a INode pointer from the argument passed to us
+	INode *node = arg_list[0]->to_node();
+	nlassert (node);
+
+	// Get a Object pointer
+	ObjectState os = node->EvalWorldState(ip->GetTime()); 
+
+	// ok ?
+	bool bRet=false;
+
+	if (os.obj)
+	{
+		// Get class id
+		if (os.obj->CanConvertToType(RYKOLPATCHOBJ_CLASS_ID)) 
+		{
+			bRet = true;
+			RPO *tri = (RPO *)os.obj->ConvertToType(ip->GetTime(), RYKOLPATCHOBJ_CLASS_ID);
+			if (tri)
+			{
+				Modifier *mod = arg_list[1]->to_modifier();
+				if (mod)
+				{
+					EditPatchMod *epmod = (EditPatchMod *)mod;
+					epmod->ClearSelection(EP_PATCH);
+					epmod->SelectSubPatch(arg_list[2]->to_int() - 1);
+					epmod->DoPatchTurn(true);
+					epmod->ClearSelection(EP_PATCH);
+				}
+				else
+				{
+					bRet = false;
+				}
+			}
+			// Note that the TriObject should only be deleted
+			// if the pointer to it is not equal to the object
+			// pointer that called ConvertToType()
+			if (os.obj != tri)
+				delete tri;
+		
+			// redraw and update
+			node->NotifyDependents(FOREVER, PART_ALL, REFMSG_CHANGE); 
+			ip->RedrawViews(ip->GetTime());
+		}
+	}
+
+	return bRet?&true_value:&false_value;
+}
\ No newline at end of file
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp
index 64a3296f0..d2843df1c 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp
@@ -37,7 +37,6 @@ int EditPatchMod::DoAttach(INode *node, PatchMesh *attPatch, RPatchMesh *rattPat
 		nodes.DisposeTemporary();
 		return 0;
 	}
-	patchData->BeginEdit(ip->GetTime());
 
 	// If the mesh isn't yet cached, this will cause it to get cached.
 	RPatchMesh *rpatch;
@@ -49,6 +48,7 @@ int EditPatchMod::DoAttach(INode *node, PatchMesh *attPatch, RPatchMesh *rattPat
 	}
 	patchData->RecordTopologyTags(patch);
 	RecordTopologyTags();
+	patchData->BeginEdit(ip->GetTime());
 
 	// Transform the shape for attachment:
 	// If reorienting, just translate to align pivots
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp
index 3814a2df9..0b15b63e7 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp
@@ -236,6 +236,50 @@ void EditPatchMod::SetSelLevel(DWORD level)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
+void EditPatchMod::SelectSubPatch(int index)
+{
+	if (!ip)
+		return; 
+	TimeValue t = ip->GetTime();
+
+	ip->ClearCurNamedSelSet();
+
+	ModContextList mcList;
+	INodeTab nodes;
+	ip->GetModContexts(mcList, nodes);
+
+	for (int i = 0; i < mcList.Count(); i++)
+	{
+		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
+	
+		if (!patchData)
+			return;
+		
+		RPatchMesh *rpatch;
+		PatchMesh *patch = patchData->TempData(this)->GetPatch(t, rpatch);
+		if (!patch)
+			return;
+		
+		patchData->BeginEdit(t);
+		if (theHold.Holding()) 
+			theHold.Put(new PatchRestore(patchData, this, patch, rpatch, "SelectSubComponent"));
+
+		patch->patchSel.Set(index);
+
+		patchData->UpdateChanges(patch, rpatch, FALSE);
+		if (patchData->tempData)
+		{
+			patchData->tempData->Invalidate(PART_SELECT);
+		}
+	}
+	PatchSelChanged();
+		
+	UpdateSelectDisplay();
+	NotifyDependents(FOREVER, PART_SELECT, REFMSG_CHANGE);
+}
+
+// ------------------------------------------------------------------------------------------------------------------------------------------------------
+
 // Select a subcomponent within our object(s).  WARNING! Because the HitRecord list can
 // indicate any of the objects contained within the group of patches being edited, we need
 // to watch for control breaks in the patchData pointer within the HitRecord!
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg b/code/nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg
index a94996500..4f1013dae 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg
@@ -176,6 +176,7 @@ LockBorders			= KeyL;
 ZoomIn				= Key1;
 ZoomOut				= Key2;
 GetState			= Key3;
+ResetPatch			= KeyF10;
 
 /***************
  *This is the the light settings
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
index fadbde308..507d36ab5 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
@@ -96,8 +96,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 10, 0, 0
- PRODUCTVERSION 0, 10, 0, 0
+ FILEVERSION 0, 11, 1, 0
+ PRODUCTVERSION 0, 11, 1, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -116,14 +116,14 @@ BEGIN
             VALUE "Comments", "TECH: cyril.corvazier\0"
             VALUE "CompanyName", "Ryzom Core\0"
             VALUE "FileDescription", "NeL Patch Paint\0"
-            VALUE "FileVersion", "0.10.0\0"
+            VALUE "FileVersion", "0.11.1\0"
             VALUE "InternalName", "mods\0"
             VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "nelpatchpaint.dlm\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.10.0\0"
+            VALUE "ProductVersion", "0.11.1\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
index 3fd00f000..73bb142b1 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
@@ -145,7 +145,7 @@ std::vector<CZoneSymmetrisation> symVector;
 
 // Painter modes
 enum TModePaint { ModeTile, ModeColor, ModeDisplace};
-enum TModeMouse { ModePaint, ModeSelect, ModePick, ModeFill, ModeGetState };
+enum TModeMouse { ModePaint, ModeSelect, ModePick, ModeFill, ModeGetState, ModeResetPatch };
 
 /*-------------------------------------------------------------------*/
 
@@ -2585,6 +2585,13 @@ void	mainproc(CScene& scene, CEventListenerAsync& AsyncListener, CEvent3dMouseLi
 		// Set mode
 		modeSelect=ModeGetState;
 
+	// Mode reset zone
+	if (AsyncListener.isKeyDown ((TKey)PainterKeys[ResetPatch]))
+	{
+		// Set mode
+		modeSelect=ModeResetPatch;
+	}
+
 	// Mode picking
 	if (AsyncListener.isKeyDown ((TKey)PainterKeys[Fill0]))
 	{
@@ -2891,6 +2898,8 @@ void	mainproc(CScene& scene, CEventListenerAsync& AsyncListener, CEvent3dMouseLi
 		SetCursor (bankCont->HFill);
 	else if (pData->pobj->TileTrick)
 		SetCursor (bankCont->HTrick);
+	else if (modeSelect==ModeResetPatch)
+		SetCursor (LoadCursor (NULL, IDC_NO));
 	else
 		SetCursor (LoadCursor (NULL, IDC_ARROW));
 
@@ -3034,7 +3043,7 @@ private:
 	// Callback on mouse events
 	virtual void operator ()(const CEvent& event)
 	{
-		if (event==EventDestroyWindowId)
+		if (event==EventDestroyWindowId || event==EventCloseWindowId)
 		{
 			WindowActive=false;
 		}
@@ -3140,9 +3149,30 @@ private:
 								_FillTile.fillColor (mesh1, patch, _VectMesh, maxToNel (color1), (uint16)(256.f*opa1), PaintColor);
 
 							else if (nModeTexture==ModeDisplace)
-								// Fill this patch with the current color
+								// Fill this patch with the current displace
 								_FillTile.fillDisplace (mesh1, patch, _VectMesh, bank);
 						}
+						else if (modeSelect==ModeResetPatch)
+						{
+							int np = _VectMesh[mesh1].PMesh->numPatches;
+							for (int pp = 0; pp < np; ++pp)
+							{
+								// Fill default tile
+								_FillTile.fillTile (mesh1, pp, _VectMesh, -1, 0, 0, true, bank);
+
+								// Fill default color
+								_FillTile.fillColor (mesh1, pp, _VectMesh, CRGBA(255, 255, 255), 256, PaintColor);
+
+								// Backup current displace, fill default, restore
+								int bkdt = _Pobj->DisplaceTile;
+								int bkdts = _Pobj->DisplaceTileSet;
+								_Pobj->DisplaceTile = 0;
+								_Pobj->DisplaceTileSet = -1;
+								_FillTile.fillDisplace (mesh1, pp, _VectMesh, bank);
+								_Pobj->DisplaceTile = bkdt;
+								_Pobj->DisplaceTileSet = bkdts;
+							}
+						}
 					}
 				}
 				// Pick with right mouse
@@ -4095,7 +4125,7 @@ DWORD WINAPI myThread (LPVOID vData)
 
 			// Create a Landscape.
 			CLandscapeModel	*TheLand= (CLandscapeModel*)CNELU::Scene->createModel(LandscapeModelId);
-			TheLand->Landscape.setTileNear (1000.f);
+			TheLand->Landscape.setTileNear (10000.f);
 			TheLand->Landscape.TileBank=bank;
 
 			// Enbable automatique lighting
@@ -4192,7 +4222,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			mat.setPos(P);
 			CNELU::Camera->setTransformMode (ITransformable::DirectMatrix);
 			CNELU::Camera->setMatrix (mat);
-			CNELU::Camera->setPerspective( 75.f*(float)Pi/180.f/*vp->GetFOV()*/, 1.33f, 0.1f, 1000.f);
+			CNELU::Camera->setPerspective( 75.f*(float)Pi/180.f/*vp->GetFOV()*/, 1.33f, 0.1f, 10000.f);
 
 			// Resize the sym vector
 			symVector.resize (pData->VectMesh.size());
@@ -4257,6 +4287,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			CNELU::EventServer.addListener (EventMouseUpId, &listener);
 			CNELU::EventServer.addListener (EventMouseDblClkId, &listener);
 			CNELU::EventServer.addListener (EventDestroyWindowId, &listener);
+			CNELU::EventServer.addListener (EventCloseWindowId, &listener);
 			CNELU::EventServer.addListener (EventKeyDownId, &listener);
 
 			// Camera position
@@ -4326,6 +4357,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			CNELU::EventServer.removeListener (EventMouseDblClkId, &listener);
 			CNELU::EventServer.removeListener (EventKeyDownId, &listener);
 			CNELU::EventServer.removeListener (EventDestroyWindowId, &listener);
+			CNELU::EventServer.removeListener (EventCloseWindowId, &listener);
 
 			// End.
 			//========
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp
index 1c756e0c8..b8503c137 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp
@@ -43,6 +43,7 @@ uint PainterKeys[KeyCounter]=
 	Key1,
 	Key2,
 	KeyI,
+	KeyF10,
 };
 
 // Keys
@@ -77,6 +78,7 @@ const char* PainterKeysName[KeyCounter]=
 	"ZoomIn",
 	"ZoomOut",
 	"GetState",
+	"ResetPatch",
 };
 
 // Light settings
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h
index aa56b06ba..13d1708ef 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h
@@ -122,6 +122,7 @@ enum PainterKeysType
 	ZoomIn,
 	ZoomOut,
 	GetState,
+	ResetPatch,
 	KeyCounter
 };
 
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
index bf5fdd549..4e70d1afc 100644
--- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
@@ -125,8 +125,8 @@ IDC_DROPPER_CURSOR      CURSOR  DISCARDABLE     "dropcurs.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 10, 0, 0
- PRODUCTVERSION 0, 10, 0, 0
+ FILEVERSION 0, 11, 0, 0
+ PRODUCTVERSION 0, 11, 0, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -145,13 +145,13 @@ BEGIN
             VALUE "Comments", "TECH: \0"
             VALUE "CompanyName", "Ryzom Core\0"
             VALUE "FileDescription", "Vertex Tree Paint\0"
-            VALUE "FileVersion", "0.10.0\0"
+            VALUE "FileVersion", "0.11.0\0"
             VALUE "InternalName", "VertexTreePaint\0"
             VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc.\0"
             VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF.\0"
             VALUE "OriginalFilename", "nel_vertex_tree_paint.dlm\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.10.0\0"
+            VALUE "ProductVersion", "0.11.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_orient_zones.ms b/code/nel/tools/3d/plugin_max/scripts/nel_orient_zones.ms
new file mode 100644
index 000000000..26fd67171
--- /dev/null
+++ b/code/nel/tools/3d/plugin_max/scripts/nel_orient_zones.ms
@@ -0,0 +1,124 @@
+
+gc()
+nodes = getCurrentSelection()
+max select none
+clearselection()
+
+undo off
+(
+	for cnode in nodes do
+	(
+		if (classof cnode) == Editable_Patch or (classof cnode) == RklPatch then 
+		(
+			print cnode.name
+			selectmore cnode
+			if (classof cnode) == Editable_Patch and (classof cnode) != RklPatch then
+			(
+				modPanel.addModToSelection (NeL_Convert ()) ui:on
+			)
+			modPanel.addModToSelection (NeL_Edit ()) ui:on
+			setCommandPanelTaskMode #modify
+			cmod = modpanel.getCurrentObject()
+			pcount = (GetRykolPatchCount cnode)
+			print pcount
+			for p = 1 to pcount do
+			(
+				--print p
+				vbegin = (NeLGetPatchVertex cnode p 1)
+				vend = (NeLGetPatchVertex cnode p 2)
+				vref = (NeLGetPatchVertex cnode p 3)
+				begin = (GetRykolVertexPos cnode vbegin)
+				end = (GetRykolVertexPos cnode vend)
+				ref = (GetRykolVertexPos cnode vref)
+				normal = (cross (end - begin) (ref - begin))
+				normal = (normalize normal)
+					
+				rotnormal = (point3 0 0 0)
+				if (normal.z > 0.9) then
+				(
+					--print "x normal"
+					rotnormal = (normal * (rotateXMatrix -90))
+				)
+				else
+				(
+					normal.z = 0
+					normal = (normalize normal)
+					rotnormal = (normal * (rotateZMatrix -90))
+				)
+				--print rotnormal
+				
+				-- print normal
+				-- print rotnormal
+				-- print begin
+				-- print end
+				dir = (normalize (end - begin))
+				-- print dir
+				score1 = (dot dir rotnormal)
+					
+				RykolTurnPatch cnode cmod (p)
+				vbegin = (NeLGetPatchVertex cnode p 1)
+				vend = (NeLGetPatchVertex cnode p 2)
+				begin = (GetRykolVertexPos cnode vbegin)
+				end = (GetRykolVertexPos cnode vend)
+				dir = (normalize (end - begin))
+				score2 = (dot dir rotnormal)
+					
+				RykolTurnPatch cnode cmod (p)
+				vbegin = (NeLGetPatchVertex cnode p 1)
+				vend = (NeLGetPatchVertex cnode p 2)
+				begin = (GetRykolVertexPos cnode vbegin)
+				end = (GetRykolVertexPos cnode vend)
+				dir = (normalize (end - begin))
+				score3 = (dot dir rotnormal)
+					
+				RykolTurnPatch cnode cmod (p)
+				vbegin = (NeLGetPatchVertex cnode p 1)
+				vend = (NeLGetPatchVertex cnode p 2)
+				begin = (GetRykolVertexPos cnode vbegin)
+				end = (GetRykolVertexPos cnode vend)
+				dir = (normalize (end - begin))
+				score4 = (dot dir rotnormal)
+				
+				-- print score1
+				-- print score2
+				-- print score3
+				-- print score4
+				
+				if (score1 > score2 and score1 > score3 and score1 > score4) then
+				(
+					-- print "score 1"
+					RykolTurnPatch cnode cmod (p)
+				)
+				else if (score2 > score3 and score2 > score4) then
+				(
+					-- print "score 2"
+					RykolTurnPatch cnode cmod (p)
+					RykolTurnPatch cnode cmod (p)
+				)
+				else if (score3 > score4) then
+				(
+					-- print "score 3"
+					RykolTurnPatch cnode cmod (p)
+					RykolTurnPatch cnode cmod (p)
+					RykolTurnPatch cnode cmod (p)
+				)
+				else
+				(
+					-- print "score 4"
+				)
+			)
+			maxOps.CollapseNode cnode off
+			max select none
+		)
+	)
+)
+
+max select none
+clearselection()
+undo off
+(
+	for cnode in nodes do
+	(
+		selectmore cnode
+	)
+)
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_zone_namer.ms b/code/nel/tools/3d/plugin_max/scripts/nel_zone_namer.ms
new file mode 100644
index 000000000..e651dd76a
--- /dev/null
+++ b/code/nel/tools/3d/plugin_max/scripts/nel_zone_namer.ms
@@ -0,0 +1,68 @@
+-- This script sets proper centered zone positions and generates their names
+-- Use after cutting the zone into 160m by 160m pieces
+
+cell_size = 160.0
+offset_x = 7680 / 2
+offset_y = -(20480 + (5120 / 2))
+
+alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" 
+
+-- http://proofofprogress.blogspot.be/2011/03/solution-align-pivot-to-world-without.html
+Function alignPivotToWorld &theObject = (
+	--VLM = Visible Local Matrix.
+	--The matrix/pivot you see when selecting object and "Local" axis is selected as viewable.
+	VLM = theObject.Transform;
+	IP_LocalRot = theObject.objectOffsetRot; --Rotation to be used later.
+	IP_LOCAL = theObject.objectOffsetPos;  --Invisible Pivot Local coordinates
+	--In relation to VLM matrix.
+	IP_WORLD = IP_LOCAL * VLM; --World Coordinates of Invisible Pivot. [Local To World Transform]
+	VLM_0 = matrix3 1; --Reset Visible Local matrix coordinates.
+
+	NEW_IP_LOCAL = IP_WORLD * inverse(VLM_0); --[World To local Transform]
+
+	theObject.Transform = VLM_0;
+	theObject.objectOffsetPos = NEW_IP_LOCAL;
+
+	--Now Handle Rotation:
+	--Since rotation of visible local matrix has been zeroed out,
+	--You must add that loss to the invisible pivot rotation.
+	GeomWorldRot = VLM.RotationPart + IP_LocalRot;
+	theObject.objectOffsetRot = GeomWorldRot;
+)
+	
+-- Convert a coordinate in a name
+-- name = coordToName #(x, y)
+fn coordToName coord =
+(
+	up = floor(coord[1] / 26) + 1
+	down = floor(coord[1] - ((up-1) * 26)) + 1
+	return (((-coord[2] + 1) as integer) as string) + "_" + alphabet[up] + alphabet[down]
+)
+
+fn realCoordToName coord =
+(
+	return coordToName(#(((coord[1] + offset_x) / cell_size) + 0.5, ((coord[2] + offset_y) / cell_size) + 0.5))
+)
+
+fn roundedCoord coord =
+(
+	return #(ceil(coord[1] / cell_size) * cell_size - (cell_size / 2), ceil(coord[2] / cell_size) * cell_size - (cell_size / 2))
+)
+
+max select none
+clearselection()
+
+for node in geometry do
+(
+	if (classof node) == RklPatch or (classof node) == Editable_Patch then 
+	(
+		newcoords = roundedCoord(#(node.center.x, node.center.y))
+		newname = realCoordToName(newcoords)
+		node.name = newname
+		alignPivotToWorld &node
+		node.pivot.x = newcoords[1]
+		node.pivot.y = newcoords[2]
+		resetxform node
+		maxOps.CollapseNode node off
+	)
+)
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms b/code/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms
new file mode 100644
index 000000000..edab4f35d
--- /dev/null
+++ b/code/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms
@@ -0,0 +1,162 @@
+-- Use to take the snapshots of a large manually created zone
+
+from_x = 160
+size_x = 7680-320
+from_y = -25600+160
+size_y = 5120-320
+
+targetdir = "W:/database/landscape/ligo/asteroids/max"
+snapshotdir = "W:/database/landscape/ligo/asteroids/zonebitmaps"
+zonename = "anne"
+resumeonly = true
+
+cell_size = 160.0
+
+alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" 
+
+fn lowercase instring =                -- beginning of function definition 
+(
+	local upper, lower, outstring       -- declare variables as local 
+	upper="ABCDEFGHIJKLMNOPQRSTUVWXYZ"  -- set variables to literals 
+	lower="abcdefghijklmnopqrstuvwxyz" 
+	outstring=copy instring
+	for i=1 to outstring.count do 
+	(  
+		j=findString upper outstring[i] 
+		if (j != undefined) do outstring[i]=lower[j] 
+	) 
+	return outstring     -- value of outstring will be returned as function result 
+)
+
+fn existFile fname = (getfiles fname).count != 0
+	
+-- Convert a coordinate in a name
+-- name = coordToName #(x, y)
+fn coordToName coord =
+(
+	up = floor(coord[1] / 26) + 1
+	down = floor(coord[1] - ((up-1) * 26)) + 1
+	return (((-coord[2] + 1) as integer) as string) + "_" + alphabet[up] + alphabet[down]
+)
+
+fn roundedCoord coord =
+(
+	return #(ceil(coord[1] / cell_size) * cell_size - (cell_size / 2), ceil(coord[2] / cell_size) * cell_size - (cell_size / 2))
+)
+
+fn coordId coord =
+(
+	coordr = (roundedCoord coord)
+	return #(((coordr[1]) / cell_size) + 0.5, ((coordr[2]) / cell_size) + 0.5)
+)
+
+from_coord = (coordId #(from_x, from_y))
+to_coord = (coordId #(from_x + size_x, from_y + size_y))
+
+print from_coord
+print to_coord
+
+print (coordToName from_coord)
+
+undo off
+(
+	for x=from_coord[1] to to_coord[1] do
+	(
+		for y=from_coord[2] to to_coord[2] do
+		(
+			ny=y+1
+			sy=y-1
+			ex=x+1
+			wx=x-1
+			zc = coordToName #(x, y)
+			zn = coordToName #(x, ny)
+			zne = coordToName #(ex, ny)
+			ze = coordToName #(ex, y)
+			zse = coordToName #(ex, sy)
+			zs = coordToName #(x, sy)
+			zsw = coordToName #(wx, sy)
+			zw = coordToName #(wx, y)
+			znw = coordToName #(wx, ny)
+			maxc = targetdir + "/zonematerial-" + zonename + "-" + (lowercase zc) + ".max"
+			csnapfile = snapshotdir + "/" + zonename + "-" + (lowercase zc) + ".tga"
+			if existFile maxc and (not resumeonly or not (existFile csnapfile)) then
+			(
+				print zc
+				resetMAXFile #noprompt
+				gc()
+				mergeMAXFile maxc #(zc)
+				ccenter = getnodebyname zc
+				maxn = targetdir + "/zonematerial-" + zonename + "-" + (lowercase zn) + ".max"
+				if existFile maxn then
+				(
+					mergeMAXFile maxn #(zn)
+					cnode = getnodebyname zn
+					cnode.position.y = cnode.position.y + 160
+					NeLAttachPatchMesh cnode ccenter
+				)
+				maxne = targetdir + "/zonematerial-" + zonename + "-" + (lowercase zne) + ".max"
+				if existFile maxne then
+				(
+					mergeMAXFile maxne #(zne)
+					cnode = getnodebyname zne
+					cnode.position.x = cnode.position.x + 160
+					cnode.position.y = cnode.position.y + 160
+					NeLAttachPatchMesh cnode ccenter
+				)
+				maxe = targetdir + "/zonematerial-" + zonename + "-" + (lowercase ze) + ".max"
+				if existFile maxe then
+				(
+					mergeMAXFile maxe #(ze)
+					cnode = getnodebyname ze
+					cnode.position.x = cnode.position.x + 160
+					NeLAttachPatchMesh cnode ccenter
+				)
+				maxse = targetdir + "/zonematerial-" + zonename + "-" + (lowercase zse) + ".max"
+				if existFile maxse then
+				(
+					mergeMAXFile maxse #(zse)
+					cnode = getnodebyname zse
+					cnode.position.x = cnode.position.x + 160
+					cnode.position.y = cnode.position.y - 160
+					NeLAttachPatchMesh cnode ccenter
+				)
+				maxs = targetdir + "/zonematerial-" + zonename + "-" + (lowercase zs) + ".max"
+				if existFile maxs then
+				(
+					mergeMAXFile maxs #(zs)
+					cnode = getnodebyname zs
+					cnode.position.y = cnode.position.y - 160
+					NeLAttachPatchMesh cnode ccenter
+				)
+				maxsw = targetdir + "/zonematerial-" + zonename + "-" + (lowercase zsw) + ".max"
+				if existFile maxsw then
+				(
+					mergeMAXFile maxsw #(zsw)
+					cnode = getnodebyname zsw
+					cnode.position.x = cnode.position.x - 160
+					cnode.position.y = cnode.position.y - 160
+					--NeLAttachPatchMesh cnode ccenter
+				)
+				maxw = targetdir + "/zonematerial-" + zonename + "-" + (lowercase zw) + ".max"
+				if existFile maxw then
+				(
+					mergeMAXFile maxw #(zw)
+					cnode = getnodebyname zw
+					cnode.position.x = cnode.position.x - 160
+					NeLAttachPatchMesh cnode ccenter
+				)
+				maxnw = targetdir + "/zonematerial-" + zonename + "-" + (lowercase znw) + ".max"
+				if existFile maxnw then
+				(
+					mergeMAXFile maxnw #(znw)
+					cnode = getnodebyname znw
+					cnode.position.x = cnode.position.x - 160
+					cnode.position.y = cnode.position.y + 160
+					NeLAttachPatchMesh cnode ccenter
+				)
+				NeLWeldPatchMesh ccenter 1.0
+				NeLLigoMakeSnapShot ccenter csnapfile 0 1 0 1 false
+			)
+		)
+	)
+)
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
index c6118c2f8..80d1d390d 100644
--- a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
+++ b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
@@ -124,8 +124,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 10, 0, 0
- PRODUCTVERSION 0, 10, 0, 0
+ FILEVERSION 0, 11, 0, 0
+ PRODUCTVERSION 0, 11, 0, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -142,12 +142,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
             VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.10.0\0"
+            VALUE "FileVersion", "0.11.0\0"
             VALUE "InternalName", "Tile_utility\0"
             VALUE "LegalCopyright", "\0"
             VALUE "OriginalFilename", "Tile_utility.dlu\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.10.0\0"
+            VALUE "ProductVersion", "0.11.0\0"
             VALUE "FileDescription", "Create material for tiles\0"
             VALUE "Comments", "TECH: \0"
             VALUE "LegalTrademarks", "\0"
diff --git a/code/nel/tools/3d/tile_edit/Browse.cpp b/code/nel/tools/3d/tile_edit/Browse.cpp
index 0d71ffad7..7c4f6d745 100644
--- a/code/nel/tools/3d/tile_edit/Browse.cpp
+++ b/code/nel/tools/3d/tile_edit/Browse.cpp
@@ -885,7 +885,7 @@ void Browse::OnChangeVariety()
 void Browse::OnBatchLoad ()
 {
 	CFileDialog sFile (true, NULL, NULL, OFN_ENABLESIZING,
-		"Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
+		"PNG Bitmap (*.png)|*.png|Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
 
 	if (sFile.DoModal()==IDOK)
 	{
@@ -1365,7 +1365,7 @@ void Browse::OnExportBorder()
 {
 	// Select a file
 	CFileDialog sFile (false, NULL, NULL, OFN_ENABLESIZING,
-		"Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
+		"PNG Bitmap (*.png)|*.png|Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
 	if (sFile.DoModal()==IDOK)
 	{
 		// Get the border of the bank
@@ -1431,7 +1431,7 @@ void Browse::OnImportBorder()
 {
 	// Select a file
 	CFileDialog sFile (true, NULL, NULL, OFN_ENABLESIZING,
-		"Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
+		"PNG Bitmap (*.png)|*.png|Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
 	if (sFile.DoModal()==IDOK)
 	{
 		// Get the border of the bank
diff --git a/code/nel/tools/3d/tile_edit/CMakeLists.txt b/code/nel/tools/3d/tile_edit/CMakeLists.txt
index ea7e1ac77..394359cd0 100644
--- a/code/nel/tools/3d/tile_edit/CMakeLists.txt
+++ b/code/nel/tools/3d/tile_edit/CMakeLists.txt
@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h PIC/*.cpp PIC/*.h)
+FILE(GLOB SRC *.cpp *.h)
 
 FILE(GLOB SRC2 cpu.cpp DllEntry.cpp Popup.* thread_win32.* TileCtrl.* TileList.* TileView.*)
 LIST(REMOVE_ITEM SRC ${SRC2})
diff --git a/code/nel/tools/3d/tile_edit/PIC/PIC_System.cpp b/code/nel/tools/3d/tile_edit/PIC/PIC_System.cpp
deleted file mode 100644
index 439de9979..000000000
--- a/code/nel/tools/3d/tile_edit/PIC/PIC_System.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include <string.h>
-#include <stdarg.h>
-
-#define PIC_ERRSIZE		256
-
-static unsigned long	PIC_Sys_MEM_Allocated;
-static unsigned long	PIC_Sys_MEM_NbAllocs;
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-void *Pic_malloc(unsigned long size)
-{
-	void	*mem;
-	mem=malloc(size);
-	if (mem) 
-	{
-		PIC_Sys_MEM_Allocated+=size;
-		PIC_Sys_MEM_NbAllocs++;
-	}
-	return(mem);
-}
-// -----
-void *Pic_calloc(unsigned long count, unsigned long size)
-{
-	void	*mem;
-	mem=calloc(count,size);
-	if (mem) 
-	{
-		PIC_Sys_MEM_Allocated+=(size*count);
-		PIC_Sys_MEM_NbAllocs++;
-	}
-	return(mem);
-}
-// -----
-void Pic_free(void *memblock)
-{
-	unsigned long	size;
-	size=(unsigned long)_msize(memblock);
-	PIC_Sys_MEM_Allocated-=size;
-	PIC_Sys_MEM_NbAllocs--;
-	free(memblock);
-}
-// -----
-unsigned long Pic__msize(void *memblock)
-{
-	return(unsigned long)(_msize(memblock));
-}
-// -----
-unsigned long PIC_GetMemNbAllocs(void)
-{
-	return(PIC_Sys_MEM_NbAllocs);
-}
-// -----
-unsigned long PIC_GetMemAllocated(void)
-{
-	return(PIC_Sys_MEM_Allocated);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-static char	PIC_ErrorFlag;
-static char	PIC_ErrorString[PIC_ERRSIZE];
-static unsigned char	PIC_Sys_FnctActive=0;
-static void				(*PIC_Sys_Fnct)(void);
-
-void Pic_SetError(const char *msg, ...)
-{
-	char	curerr[PIC_ERRSIZE],olderr[PIC_ERRSIZE];
-	va_list			args;
-
-	va_start(args,msg);
-	vsprintf(curerr,msg,args);
-	va_end(args);
-	if ( (strlen(curerr)+strlen(PIC_ErrorString))>PIC_ERRSIZE ) return;
-
-	if (PIC_ErrorFlag)
-	{
-		strcpy(olderr,PIC_ErrorString);
-		sprintf(PIC_ErrorString,"--- [PIC#%03d] :\n%s",PIC_ErrorFlag,curerr);
-		strcat(PIC_ErrorString,"\n");
-		strcat(PIC_ErrorString,olderr);
-	}
-	else
-	{
-		sprintf(PIC_ErrorString,"--- [PIC#%03d] :\n%s",PIC_ErrorFlag,curerr);
-	}
-	PIC_ErrorFlag++;
-	if (PIC_Sys_FnctActive) PIC_Sys_Fnct();
-	return;
-}
-// -----
-char* PIC_GetError(void)
-{
-	return(PIC_ErrorString);
-}
-// -----
-unsigned char PIC_Error(void)
-{
-	return(PIC_ErrorFlag);
-}
-// -----
-void PIC_ResetError(void)
-{
-	strcpy(PIC_ErrorString,"");
-	PIC_ErrorFlag=0;
-}
-// -----
-unsigned char PIC_OnErrorCall( void pFnct(void) )
-{
-	if (pFnct != NULL)
-	{
-		PIC_Sys_Fnct=pFnct;
-		PIC_Sys_FnctActive=1;
-	}
-	else
-	{
-		PIC_Sys_FnctActive=0;
-	}
-	return(1);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
diff --git a/code/nel/tools/3d/tile_edit/PIC/Pic_BMP.cpp b/code/nel/tools/3d/tile_edit/PIC/Pic_BMP.cpp
deleted file mode 100644
index 9ea55e029..000000000
--- a/code/nel/tools/3d/tile_edit/PIC/Pic_BMP.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "pic_private.h"
-#include "pic.h"
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-#pragma pack(1)
-typedef struct BMP_HEADER
-{
-	unsigned short	bfType;
-	unsigned long	bfSize;
-	unsigned short	Res1;
-	unsigned short	Res2;
-	unsigned long	bfOffBits;
-	unsigned long	biSize;
-	unsigned long	biWidth;
-	unsigned long	biHeight;
-	unsigned short	biPlanes;
-	unsigned short	biBitCount;
-	unsigned long	biCompression;
-	unsigned long	biSizeImage;
-	unsigned long	biXPelsPerMeter;
-	unsigned long	biYPelsPerMeter;
-	unsigned long	biClrUsed;
-	unsigned long	biClrImportant;
-} BMP_HEADER;
-#pragma pack()
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long Pic_BMP_Write(	const char *FileName, 
-								char *pPal, char *pDatas, 
-								unsigned long w, unsigned long h, unsigned long d)
-
-{
-	FILE			*file;
-	BMP_HEADER		bmph;
-	unsigned long	slsize;
-	unsigned char	*scanline;	
-	unsigned long	i;
-	long			x,y,rest;
-	unsigned char	r,g,b;
-
-	file=fopen(FileName,"wb");
-	if (!file)
-	{
-		return(0);
-	}
-	memset(&bmph,0,sizeof(BMP_HEADER));
-	bmph.bfType=19778;
-	bmph.bfSize=sizeof(BMP_HEADER);
-	bmph.bfSize+=w*h*d/8;
-	if (pPal)
-	{
-		bmph.bfSize+=(256*4);
-	}
-	bmph.bfOffBits=sizeof(BMP_HEADER);
-	if (pPal)
-	{
-		bmph.bfOffBits+=(256*4);
-	}
-	bmph.biSize=40;//sizeof(BMP_HEADER);
-	bmph.biWidth=w;
-	bmph.biHeight=h;
-	bmph.biPlanes=1;
-	bmph.biBitCount=(unsigned short)d;
-	bmph.biCompression=0;
-	bmph.biSizeImage=w*h*d/8;
-
-	fwrite(&bmph,1,sizeof(BMP_HEADER),file);
-	if (pPal)
-	{
-		for(i=0 ; i<256 ; i++)
-		{
-			fwrite(&pPal[i*3+0],1,1,file);
-			fwrite(&pPal[i*3+1],1,1,file);
-			fwrite(&pPal[i*3+2],1,1,file);
-			fwrite(&pPal[i*3+2],1,1,file);
-		}
-	}
-	slsize=w*d/8;
-	scanline=(unsigned char*)Pic_calloc(1,slsize);
-	if (!scanline)
-	{
-		Pic_SetError("BMP_Write, not enough memory for scanline");
-		return(0);
-	}
-	for(rest=0 ; ((w*d/8)+rest)%4!=0 ; rest++);
-	for(y=0 ; y<(long)h ; y++)
-	{
-		memcpy(scanline,&pDatas[(h-y-1)*slsize],slsize);
-		if (d==24)
-		{
-			for(x=0 ; x<(long)w ; x++)
-			{
-				b=scanline[x*3+0];
-				g=scanline[x*3+1];
-				r=scanline[x*3+2];
-				scanline[x*3+0]=b;
-				scanline[x*3+1]=g;
-				scanline[x*3+2]=r;				
-			}
-		}
-		fwrite(scanline,1,slsize,file);
-		if (rest)
-		{
-			fwrite(scanline,1,rest,file);
-		}
-	}
-	Pic_free(scanline);
-	fclose(file);
-	return(1);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long Pic_BMP_Read(	const char *FileName,
-							char **ppPal, char **ppDatas,
-							unsigned long *pWidth, unsigned long *pHeight, 
-							unsigned long *pDepth)
-{
-	FILE			*file;
-	BMP_HEADER		bmph;
-	char			*pPal;
-	char			*pDatas;
-	unsigned char	*scanline;
-	long			w,h,d;	
-	long			i,x,y,rest;
-	unsigned char	r,g,b;
-	unsigned char	pad[4];
-
-	pPal=NULL;
-	pDatas=NULL;
-	file=fopen(FileName,"rb");
-	if (!file)
-	{
-		Pic_SetError("BMP_Read, unable to open %s",FileName);
-		return(0);
-	}
-	fread(&bmph,1,sizeof(BMP_HEADER),file);
-	*pWidth=w=bmph.biWidth;
-	*pHeight=h=bmph.biHeight;
-	*pDepth=d=bmph.biBitCount;
-	if (d!=8 && d!=24)
-	{
-		Pic_SetError("BMP_Read, number of bits per pixel unsupported");
-		return(0);
-	}
-	if (*pDepth==8)
-	{
-		pPal=(char*)Pic_calloc(1,256*3);
-		if (!pPal)
-		{
-			Pic_SetError("BMP_Read, not enough memory for palette");
-			return(0);
-		}
-		for(i=0 ; i<256 ; i++)
-		{
-			fread(&pPal[i*3+2],1,1,file);		
-			fread(&pPal[i*3+1],1,1,file);		
-			fread(&pPal[i*3+0],1,1,file);		
-			fread(&pad[0],1,1,file);
-		}		
-	}
-	pDatas=(char*)Pic_calloc(1,w*h*d/8);
-	if (!pDatas)
-	{
-		if (pPal)
-		{
-			Pic_free(pPal);
-		}
-		Pic_SetError("BMP_Read, not enough memory for datas");
-		return(0);
-	}
-	scanline=(unsigned char*)Pic_calloc(1,w*h*d/8);
-	if (!scanline)
-	{
-		if (pPal)
-		{
-			Pic_free(pPal);
-		}
-		Pic_free(pDatas);
-		Pic_SetError("BMP_Read, not enough memory for scanline");
-		return(0);
-	}
-	for(rest=0 ; (w+rest)%4!=0 ; rest++);
-	for(y=0 ; y<h ; y++)
-	{
-		fread(scanline,w,d/8,file);
-		if (d==24)
-		{
-			for(x=0 ; x<w ; x++)
-			{
-				r=scanline[x*3+0];
-				g=scanline[x*3+1];
-				b=scanline[x*3+2];
-				scanline[x*3+0]=b;
-				scanline[x*3+1]=g;
-				scanline[x*3+2]=r;				
-			}
-		}
-		memcpy(&pDatas[(h-y-1)*w*d/8],scanline,w*d/8);
-		fread(pad,rest,d/8,file);
-	}
-	fclose(file);
-	Pic_free(scanline);
-	*ppPal=pPal;
-	*ppDatas=pDatas;
-	return(1);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
diff --git a/code/nel/tools/3d/tile_edit/PIC/Pic_JPG.cpp b/code/nel/tools/3d/tile_edit/PIC/Pic_JPG.cpp
deleted file mode 100644
index 000bb8245..000000000
--- a/code/nel/tools/3d/tile_edit/PIC/Pic_JPG.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <setjmp.h>
-#include <string.h>
-
-#include <jpeglib.h>
-#include "pic_private.h"
-#include "pic.h"
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-struct my_error_mgr 
-{
-	struct jpeg_error_mgr pub;
-	jmp_buf setjmp_buffer;
-};
-typedef struct my_error_mgr * my_error_ptr;
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-static unsigned char	error;
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-void my_error_exit(j_common_ptr cinfo)
-{
-	my_error_ptr myerr = (my_error_ptr) cinfo->err;
-	error=1;
-	longjmp(myerr->setjmp_buffer, 1);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long Pic_JPG_Read(const char *FileName, char **ppPal, char **ppDatas, unsigned long *w, unsigned long *h)
-{
-	struct jpeg_decompress_struct	cinfo;
-	struct my_error_mgr				jerr;
-	FILE							*file;
-	JSAMPARRAY						buffer;		
-	int								row_stride,i;		
-	char							*pDatas,*pPal;
-	unsigned long					ptr;
-	
-	error=0;
-	ptr=0;
-	file=fopen(FileName, "rb");
-	if (!file)
-	{
-		Pic_SetError("JPG_Read, unable to open %s",FileName);
-		return(0);
-	}
-	cinfo.err = jpeg_std_error(&jerr.pub);
-	jerr.pub.error_exit = my_error_exit;
-	setjmp(jerr.setjmp_buffer);
-	if (error)
-	{
-		Pic_SetError("JPG_Read, internal decompression error");
-		jpeg_destroy_decompress(&cinfo);
-		return(0);
-	}
-	jpeg_create_decompress(&cinfo);
-	jpeg_stdio_src(&cinfo, file);
-	(void) jpeg_read_header(&cinfo, TRUE);
-	*w=cinfo.image_width;
-	*h=cinfo.image_height;
-	if (!ppPal)
-	{
-		pDatas=(char*)Pic_calloc(1,(*w)*(*h)*3);
-	}
-	else
-	{
-		pDatas=(char*)Pic_calloc(1,(*w)*(*h));
-		pPal=(char*)Pic_calloc(1,256*3);
-		if (!pPal)
-		{
-			Pic_SetError("JPG_Read, not enough memory for palette");
-			return(0);
-		}
-		cinfo.desired_number_of_colors = 256;
-		cinfo.quantize_colors = TRUE;
-		cinfo.dither_mode = JDITHER_ORDERED;
-	}
-	if (!pDatas)
-	{
-		Pic_SetError("JPG_Read, not enough memory for pic");
-		return(0);
-	}
-	(void) jpeg_start_decompress(&cinfo);
-	row_stride = cinfo.output_width * cinfo.output_components;
-	buffer = (*cinfo.mem->alloc_sarray)
-	((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
-	while (cinfo.output_scanline < cinfo.output_height) 
-	{
-		(void) jpeg_read_scanlines(&cinfo, buffer, 1);
-		memcpy(&pDatas[ptr],buffer[0],row_stride);
-		ptr+=row_stride;
-	}
-	*ppDatas=pDatas;
-	if (ppPal)
-	{
-		for(i=0 ; i<256 ; i++)
-		{
-			pPal[i*3+0]=cinfo.colormap[2][i];
-			pPal[i*3+1]=cinfo.colormap[1][i];
-			pPal[i*3+2]=cinfo.colormap[0][i];
-		}
-		*ppPal=pPal;
-	}	
-	(void) jpeg_finish_decompress(&cinfo);
-	jpeg_destroy_decompress(&cinfo);
-	fclose(file);
-	return(1);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long Pic_JPG_Write(const char *FileName, unsigned long Qual, char *pDatas, unsigned long w, unsigned long h)
-{
-	struct jpeg_compress_struct	cinfo;
-	struct my_error_mgr			jerr;
-	FILE						*file;		
-	JSAMPROW					row_pointer[1];
-	int							row_stride;		
-
-	error=0;
-	file=fopen(FileName,"wb");
-	if (!file)
-	{
-		Pic_SetError("JPG_Write, unable to open %s",FileName);
-		return(0);
-	}
-	jpeg_create_compress(&cinfo);
-	cinfo.err = jpeg_std_error(&jerr.pub);
-	jerr.pub.error_exit = my_error_exit;
-	setjmp(jerr.setjmp_buffer);
-	if (error)
-	{
-		Pic_SetError("JPG_Write, internal compression error");
-		jpeg_destroy_compress(&cinfo);
-		return(0);
-	}
-	jpeg_stdio_dest(&cinfo, file);
-	cinfo.image_width = w; 	
-	cinfo.image_height = h;
-	cinfo.input_components = 3;	
-	cinfo.in_color_space = JCS_RGB;
-	jpeg_set_defaults(&cinfo);
-	jpeg_set_quality(&cinfo, Qual, TRUE);
-	jpeg_start_compress(&cinfo, TRUE);
-	row_stride = w * 3;
-	while(cinfo.next_scanline<cinfo.image_height) 
-	{
-		row_pointer[0] = (JSAMPROW)& pDatas[cinfo.next_scanline * row_stride];
-		(void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
-	}
-	jpeg_finish_compress(&cinfo);
-	fclose(file);
-	jpeg_destroy_compress(&cinfo);
-	return(1);
-}
diff --git a/code/nel/tools/3d/tile_edit/PIC/Pic_Manage.cpp b/code/nel/tools/3d/tile_edit/PIC/Pic_Manage.cpp
deleted file mode 100644
index dfd13fb3f..000000000
--- a/code/nel/tools/3d/tile_edit/PIC/Pic_Manage.cpp
+++ /dev/null
@@ -1,637 +0,0 @@
-#include <string.h>
-#include "pic_private.h"
-#include "pic.h"
-
-static unsigned long	NbPics=0;
-static PIC_PICTURE		*HeadPic=NULL;
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-static PIC_PICTURE *GetPic(unsigned long id)
-{
-	PIC_PICTURE	*pic;
-
-	for(pic=HeadPic ; pic ; pic=pic->Next)
-	{
-		if (pic->ID==id)
-		{
-			return(pic);
-		}
-	}
-	return(NULL);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long PIC_Load(char* FileName, unsigned char Quantize)
-{
-	char	ext[4];
-	unsigned long	type;
-	unsigned long	i,taken,id;
-	PIC_PICTURE		*pic;
-	char			*pDatas;
-	char			*pPal;
-	unsigned long	w,h,Depth;
-	unsigned long	ret;
-
-	// --- Init
-	ret=0;
-	type=0;
-	id=0;
-	taken=0;
-	w=0;
-	h=0;
-	Depth=0;
-	pic=NULL;
-	pDatas=NULL;
-	pPal=NULL;
-	// --- Get 1st available ID
-	for(i=1 ; i<=NbPics+1 ; i++)
-	{
-		taken=0;
-		for(pic=HeadPic ; pic ; pic=pic->Next)
-		{
-			if (pic->ID==i)
-			{
-				taken=1;
-				break;
-			}
-		}
-		if (!taken)
-		{
-			id=i;
-			break;
-		}
-	}
-	if (!id)
-	{
-		Pic_SetError("Load, unable to create ID");
-		return(0);
-	}
-	// --- Load pic
-	if (FileName)
-	{
-		ext[0]=FileName[strlen(FileName)-3];
-		ext[1]=FileName[strlen(FileName)-2];
-		ext[2]=FileName[strlen(FileName)-1];
-		ext[3]=0;
-		strupr(ext);
-		if ( !strcmp(ext,"JPG") )
-		{
-			type=1;
-		}
-		else if ( !strcmp(ext,"TGA") )
-		{
-			type=2;
-		}
-		else if ( !strcmp(ext,"BMP") )
-		{
-			type=3;
-		}
-
-		switch(type)
-		{
-		// - JPG
-		case 1:
-			if (!Quantize)
-			{
-				Depth=24;
-				ret=Pic_JPG_Read(FileName,NULL,&pDatas,&w,&h);
-			}
-			else
-			{
-				Depth=8;
-				ret=Pic_JPG_Read(FileName,&pPal,&pDatas,&w,&h);
-			}
-			if (!ret)
-			{
-				Pic_SetError("Load, unable to load JPG file %s",FileName);
-				return(0);
-			}
-			break;
-		// - TGA
-		case 2:
-			ret=Pic_TGA_Read(FileName,&pPal,&pDatas,&w,&h,&Depth);
-			if (!ret)
-			{
-				Pic_SetError("Load, unable to load TGA file %s",FileName);
-				return(0);
-			}
-			break;
-		// - BMP
-		case 3:
-			ret=Pic_BMP_Read(FileName,&pPal,&pDatas,&w,&h,&Depth);
-			if (!ret)
-			{
-				Pic_SetError("Load, unable to load BMP file %s",FileName);
-				return(0);
-			}
-			break;
-		// - Unknown
-		default:
-			Pic_SetError("Load, unknown extension for %s",FileName);
-			return(0);
-		}
-	}
-
-	// --- Create and place new pic struct
-	pic=(PIC_PICTURE *)Pic_calloc(1,sizeof(PIC_PICTURE));
-	if (!pic)
-	{
-		Pic_SetError("Load, not enough memory for internal structure");
-		return(0);
-	}
-	pic->Next=HeadPic;
-	HeadPic=pic;
-	NbPics++;
-	pic->ID=id;
-	pic->pDatas=pDatas;
-	pic->pPal=pPal;
-	pic->Width=w;
-	pic->Height=h;
-	pic->Depth=Depth;
-	return(id);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long PIC_Create(char* pPal, char* pDatas, unsigned long w, unsigned long h, unsigned long d)
-{
-	unsigned long	i,taken,id;
-	PIC_PICTURE		*pic;
-
-	// --- Init
-	id=0;
-	taken=0;
-	pic=NULL;
-	// --- Get 1st available ID
-	for(i=1 ; i<=NbPics+1 ; i++)
-	{
-		taken=0;
-		for(pic=HeadPic ; pic ; pic=pic->Next)
-		{
-			if (pic->ID==i)
-			{
-				taken=1;
-				break;
-			}
-		}
-		if (!taken)
-		{
-			id=i;
-			break;
-		}
-	}
-	if (!id)
-	{
-		Pic_SetError("Create, unable to create ID");
-		return(0);
-	}
-	// --- Create pic
-	if (!pDatas)
-	{
-		pDatas=(char *)Pic_calloc(1,w*h*d/8);
-		if (!pDatas)
-		{
-			Pic_SetError("Create, not enough memory for datas");
-			return(0);
-		}
-	}
-	if (d==8)
-	{
-		if (!pPal)
-		{
-			pPal=(char *)Pic_calloc(1,256*3);
-			if (!pPal)
-			{
-				Pic_SetError("Create, not enough memory for palette");
-				return(0);
-			}
-		}
-	}
-	else
-	{
-		pPal=NULL;
-	}
-	// --- Create and place new pic struct
-	pic=(PIC_PICTURE *)Pic_calloc(1,sizeof(PIC_PICTURE));
-	if (!pic)
-	{
-		Pic_SetError("Create, not enough memory for internal structure");
-		return(0);
-	}
-	pic->Next=HeadPic;
-	HeadPic=pic;
-	NbPics++;
-	pic->ID=id;
-	pic->pDatas=pDatas;
-	pic->pPal=pPal;
-	pic->Width=w;
-	pic->Height=h;
-	pic->Depth=d;
-	return(id);
-
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long PIC_GetInfos(	unsigned long id, 
-							char **ppPal, char **ppDatas, 
-							unsigned long *pW, unsigned long *pH, unsigned long *pD)
-{
-	PIC_PICTURE	*pic;
-
-	pic=GetPic(id);
-	if (!pic)
-	{
-		Pic_SetError("GetInfos, picture internal structure not found");
-		return(0);
-	}
-	if (ppPal)
-	{
-		*ppPal=pic->pPal;
-	}
-	if (ppDatas)
-	{
-		*ppDatas=pic->pDatas;
-	}
-	if (pW)
-	{
-		*pW=pic->Width;
-	}
-	if (pH)
-	{
-		*pH=pic->Height;
-	}
-	if (pD)
-	{
-		*pD=pic->Depth;
-	}
-	return(id);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-static char* Conv8To24(unsigned long id)
-{
-	PIC_PICTURE		*pic;
-	char	*buf;
-	unsigned long	i;
-
-	pic=GetPic(id);
-	if (!pic)
-	{
-		Pic_SetError("Conv8To24, picture internal structure not found");
-		return(NULL);
-	}
-	buf=(char *)Pic_malloc(pic->Width*pic->Height*3);
-	if (!buf)
-	{
-		Pic_SetError("Conv8To24, not enough memory for temporary buffer");
-		return(NULL);
-	}
-	for(i=0 ; i<pic->Width*pic->Height ; i++)
-	{
-		buf[i*3+0]=pic->pPal[pic->pDatas[i]*3+0];
-		buf[i*3+1]=pic->pPal[pic->pDatas[i]*3+1];
-		buf[i*3+2]=pic->pPal[pic->pDatas[i]*3+2];
-	}
-	return(buf);
-}
-
-// ----------------------------------------
-static char* Conv8To16(unsigned long id)
-{
-	PIC_PICTURE		*pic;
-	unsigned short	*buf;
-	unsigned long	i;
-	unsigned short	r,g,b,pix16;
-
-	pic=GetPic(id);
-	if (!pic)
-	{
-		Pic_SetError("Conv8To24, picture internal structure not found");
-		return(NULL);
-	}
-	buf=(unsigned short*)Pic_malloc(pic->Width*pic->Height*2);
-	if (!buf)
-	{
-		Pic_SetError("Conv8To24, not enough memory for temporary buffer");
-		return(NULL);
-	}
-	for(i=0 ; i<pic->Width*pic->Height ; i++)
-	{
-		b=pic->pPal[pic->pDatas[i]*3+0];
-		g=pic->pPal[pic->pDatas[i]*3+1];
-		r=pic->pPal[pic->pDatas[i]*3+2];
-		r>>=3; 
-		g>>=3; g&=0x3E;
-		b>>=3;
-		pix16=(r<<10)+(g<<5)+b;
-		buf[i]=pix16;
-	}
-	return (char*)buf;
-}
-
-// ----------------------------------------
-
-static char* Conv16To24(unsigned long id)
-{
-	PIC_PICTURE		*pic;
-	unsigned short	*pDatas;
-	unsigned char	*buf;
-	unsigned long	i;
-	unsigned short	r,g,b;
-
-	pic=GetPic(id);
-	if (!pic)
-	{
-		Pic_SetError("Conv16To24, picture internal structure not found");
-		return(NULL);
-	}
-	buf=(unsigned char *)Pic_malloc(pic->Width*pic->Height*3);
-	if (!buf)
-	{
-		Pic_SetError("Conv16To24, not enough memory for temporary buffer");
-		return(NULL);
-	}
-	pDatas=(unsigned short*)pic->pDatas;
-	for(i=0 ; i<pic->Width*pic->Height ; i++)
-	{
-		r=(pDatas[i] & 0x7C00)>>(10-3);
-		g=(pDatas[i] & 0x03E0)>>(5-3);
-		b=(pDatas[i] & 0x001F)<<3;
-		buf[i*3+0]=(unsigned char)r;
-		buf[i*3+1]=(unsigned char)g;
-		buf[i*3+2]=(unsigned char)b;
-	}
-	return (char*)buf;
-}
-
-// ----------------------------------------
-
-static char* Conv24To16(unsigned long id)
-{
-	PIC_PICTURE		*pic;
-	unsigned short	*buf;
-	unsigned long	i;
-	unsigned short	r,g,b;
-	unsigned short	pix16;
-
-	pic=GetPic(id);
-	if (!pic)
-	{
-		Pic_SetError("Conv24To16, picture internal structure not found");
-		return(NULL);
-	}
-	buf=(unsigned short*)Pic_malloc(pic->Width*pic->Height*2);
-	if (!buf)
-	{
-		Pic_SetError("Conv24To16, not enough memory for temporary buffer");
-		return(NULL);
-	}
-	for(i=0 ; i<pic->Width*pic->Height ; i++)
-	{
-		r=pic->pDatas[i*3+0];
-		g=pic->pDatas[i*3+1];
-		b=pic->pDatas[i*3+2];
-		// r : 5 bits forts			(0x7C)
-		// g : 5 bits (6e zapped)	(0x3E)
-		// b : 5 bits faibles		(0x1F)
-		r>>=3; 
-		g>>=3; g&=0x3E;
-		b>>=3;
-		pix16=(r<<10)+(g<<5)+b;
-		buf[i]=pix16;
-	}
-	return (char*)buf;
-}
-
-// ----------------------------------------
-
-static char* ConvPic(PIC_PICTURE *pic, unsigned long type, char* pErr)
-{
-	char	*buf;
-	unsigned long	src,dst;
-
-	*pErr=0;
-	buf=NULL;
-	src=pic->Depth;
-	if (type==PIC_TYPE_TGA8 || type==PIC_TYPE_BMP8)
-	{
-		dst=8;
-	}
-	if (type==PIC_TYPE_TGA16)
-	{
-		dst=16;
-	}
-	if (type==PIC_TYPE_JPG || type==PIC_TYPE_TGA24 || type==PIC_TYPE_BMP24)
-	{
-		dst=24;
-	}
-	// ---
-	if (src==dst)
-	{
-		return(NULL);
-	}
-	// ---
-	if (src==8 && dst==24)
-	{
-		buf=Conv8To24(pic->ID);
-		if (!buf)
-		{
-			*pErr=1;
-		}
-		return(buf);
-	}
-	if (src==8 && dst==16)
-	{
-		buf=Conv8To16(pic->ID);
-		if (!buf)
-		{
-			*pErr=1;
-		}
-		return(buf);
-	}
-	// ---
-	if (src==16 && dst==24)
-	{
-		buf=Conv16To24(pic->ID);
-		if (!buf)
-		{
-			*pErr=1;
-		}
-		return(buf);
-	}
-	// ---
-	if (src==24 && dst==16)
-	{
-		buf=Conv24To16(pic->ID);
-		if (!buf)
-		{
-			*pErr=1;
-		}
-		return buf;
-	}
-	// ---
-	if (src==24 && dst==8)
-	{
-		Pic_SetError("ConvPic, downsampling 24 to 8 bits unsupported");
-		*pErr=1;
-		return(NULL);
-	}
-	Pic_SetError("ConvPic, conversion %d to %d unsupported",src,dst);
-	*pErr=1;
-	return(NULL);
-}
-
-// ----------------------------------------
-
-unsigned long PIC_Save(unsigned long id, char* FileName, unsigned long type, unsigned long qual)
-{
-	PIC_PICTURE		*pic;
-	char	err;
-	char	*buf;
-	char	*freeit;
-	unsigned long	depth;
-
-	freeit=NULL;
-	pic=GetPic(id);
-	if (!pic)
-	{
-		Pic_SetError("Save %s, picture internal structure not found",FileName);
-		return(0);
-	}
-	freeit = ConvPic(pic,type,&err);
-	if (err)
-	{
-		Pic_SetError("Save %s, error while converting picture",FileName);
-		return(0);
-	}
-	if (!freeit)
-	{
-		buf=pic->pDatas;
-	}
-	else
-	{
-		buf=freeit;
-	}
-	err=0;
-	switch(type)
-	{
-	// ---
-	case PIC_TYPE_JPG:
-		if ( !Pic_JPG_Write(FileName,qual,buf,pic->Width,pic->Height) )
-		{
-			if (freeit)
-			{
-				Pic_free(buf);
-			}
-			Pic_SetError("Save %s, error while saving JPG file",FileName);
-			err=1;
-		}
-		break;
-	// ---
-	case PIC_TYPE_TGA8:
-	case PIC_TYPE_TGA16:
-	case PIC_TYPE_TGA24:
-		if (type==PIC_TYPE_TGA8)
-		{
-			depth=8;
-		}
-		if (type==PIC_TYPE_TGA16)
-		{
-			depth=16;
-		}
-		if (type==PIC_TYPE_TGA24)
-		{
-			depth=24;
-		}
-		if ( !Pic_TGA_Write(FileName,pic->pPal,buf,pic->Width,pic->Height,depth) )
-		{
-			if (freeit)
-			{
-				Pic_free(freeit);
-			}
-			Pic_SetError("Save %s, error while saving TGA file",FileName);
-			err=1;
-		}
-		break;
-	// ---
-	case PIC_TYPE_BMP8:
-	case PIC_TYPE_BMP24:
-		if (type==PIC_TYPE_BMP8)
-		{
-			depth=8;
-		}
-		if (type==PIC_TYPE_BMP24)
-		{
-			depth=24;
-		}
-		if ( !Pic_BMP_Write(FileName,pic->pPal,buf,pic->Width,pic->Height,depth) )
-		{
-			if (freeit)
-			{
-				Pic_free(freeit);
-			}
-			Pic_SetError("Save %s, error while saving BMP file",FileName);
-			err=1;
-		}
-		break;
-	// ---
-	default:		
-		Pic_SetError("Save %s, unknow save format/type",FileName);
-		err=1;
-		break;
-	}
-	if (freeit)
-	{
-		Pic_free(freeit);
-	}
-	return(err-1);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long PIC_Destroy(unsigned long id)
-{
-	PIC_PICTURE		*prevpic,*pic;
-	unsigned long	found;
-
-	prevpic=NULL;
-	found=0;
-	for(pic=HeadPic ; pic ; pic=pic->Next)
-	{
-		if (pic->ID==id)
-		{
-			found=1;
-			break;
-		}
-		prevpic=pic;
-	}
-	if (!found)
-	{
-		Pic_SetError("Destroy, picture internal structure not found");
-		return(0);
-	}
-	if (prevpic)
-	{
-		prevpic->Next=pic->Next;
-	}
-	if (pic->pDatas)
-	{
-		Pic_free(pic->pDatas);
-	}
-	if (pic->pPal)
-	{
-		Pic_free(pic->pPal);
-	}
-	if (pic==HeadPic)
-	{
-		HeadPic=pic->Next;
-	}
-	Pic_free(pic);
-	return(1);
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/code/nel/tools/3d/tile_edit/PIC/Pic_TGA.cpp b/code/nel/tools/3d/tile_edit/PIC/Pic_TGA.cpp
deleted file mode 100644
index 6d69b914e..000000000
--- a/code/nel/tools/3d/tile_edit/PIC/Pic_TGA.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "pic_private.h"
-#include "pic.h"
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-#pragma pack(1)
-typedef struct TGA_HEADER
-{
-	unsigned char	LengthID;
-	unsigned char	CMapType;
-	unsigned char	ImageType;
-	unsigned short	Origin;
-	unsigned short	Length;
-	unsigned char	Depth;
-	unsigned short	XOrg;
-	unsigned short	YOrg;
-	unsigned short	Width;
-	unsigned short	Height;
-	unsigned char	ImageDepth;
-	unsigned char	Desc;
-} TGA_HEADER;
-#pragma pack()
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long Pic_TGA_Read(	const char *FileName,
-							char **ppPal, char **ppDatas,
-							unsigned long *pWidth, unsigned long *pHeight, 
-							unsigned long *pDepth)
-{
-	FILE			*file;
-	TGA_HEADER		tgah;
-	long			w,h,d;
-	unsigned long	size;
-	char			*pDatas;
-	char			*pPal;
-	long			x,y;
-	long			slsize;
-	unsigned char	*scanline;
-	unsigned char	r,g,b;
-	long			i;
-	int				upSideDown;
-
-	pDatas=NULL;
-	pPal=NULL;
-	file=fopen(FileName,"rb");
-	if (!file)
-	{
-		Pic_SetError("TGA_Read, unable to open %s",FileName);
-		return(0);
-	}
-	fread(&tgah,1,sizeof(TGA_HEADER),file);
-	if (tgah.ImageType>3)
-	{
-		Pic_SetError("TGA_Read, unsupported TGA format");
-		return(0);
-	}
-	*pWidth=w=tgah.Width;
-	*pHeight=h=tgah.Height;
-	*pDepth=d=tgah.ImageDepth;
-	upSideDown = ((tgah.Desc & (1 << 5))==0);
-
-	size=tgah.Width*tgah.Height*(tgah.ImageDepth/8);
-	pDatas=(char*)Pic_malloc(size);
-	if (!pDatas)
-	{
-		Pic_SetError("TGA_Read, not enough memory");
-		return(0);
-	}
-	if (*pDepth==8)
-	{
-		if (!ppPal)
-		{
-			Pic_free(pDatas);
-			Pic_SetError("TGA_Read, need a pointer to palette");
-			return(0);
-		}
-		pPal=(char*)Pic_calloc(1,256*3);
-		if (!pPal)
-		{
-			Pic_SetError("TGA_Read, not enough memory for palette");
-			return(0);
-		}
-		if (tgah.ImageType==1)
-		{
-			for(i=0 ; i<256*3 ; i+=3)
-			{
-				fread(&pPal[i+2],1,1,file);
-				fread(&pPal[i+1],1,1,file);
-				fread(&pPal[i+0],1,1,file);
-			}
-		}
-		*ppPal=pPal;
-	}
-
-	slsize=w*d/8;
-	scanline=(unsigned char*)Pic_calloc(1,slsize);
-	if (!scanline)
-	{
-		if (pPal)
-		{
-			Pic_free(pPal);
-		}
-		Pic_free(pDatas);
-		Pic_SetError("TGA_Read, not enough memory for scanline");
-		return(0);
-	}
-	for(y=0 ; y<h ; y++)
-	{
-		fread(scanline,1,slsize,file);
-		if (d==24 || d==32)
-		{
-			long	mult=3;
-			if(d==32)  mult=4;
-			for(x=0 ; x<w ; x++)
-			{
-				r=scanline[x*mult+0];
-				g=scanline[x*mult+1];
-				b=scanline[x*mult+2];
-				scanline[x*mult+0]=b;
-				scanline[x*mult+1]=g;
-				scanline[x*mult+2]=r;
-			}
-		}
-		if (upSideDown)
-			memcpy(&pDatas[(h-y-1)*slsize], scanline, slsize);
-		else
-			memcpy(&pDatas[(y)*slsize], scanline, slsize);
-	}
-	Pic_free(scanline);
-	fclose(file);
-	*ppDatas=pDatas;
-	return(1);
-
-}
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-unsigned long Pic_TGA_Write(	const char *FileName, 
-								char *pPal, char *pDatas, 
-								unsigned long w, unsigned long h, unsigned long d)
-{
-	FILE			*file;
-	TGA_HEADER		tgah;
-	long			x,y;
-	long			slsize;
-	unsigned char	*scanline;
-	unsigned char	r,g,b;
-
-	file=fopen(FileName,"wb");
-	if (!file)
-	{
-		Pic_SetError("TGA_Write, unable to open %s",FileName);
-		return(0);
-	}
-	memset(&tgah,0,sizeof(TGA_HEADER));
-	tgah.LengthID=0;
-	if (d>8)
-	{
-		tgah.CMapType=0;
-		tgah.ImageType=2;
-		tgah.Length=0;
-		tgah.Depth=0;
-	}
-	else
-	{
-		tgah.CMapType=1;
-		tgah.ImageType=1;
-		tgah.Length=256;
-		tgah.Depth=24;
-	}	
-	tgah.Origin=0;
-	tgah.XOrg=0;
-	tgah.YOrg=0;
-	tgah.Width=(unsigned short)w;
-	tgah.Height=(unsigned short)h;
-	tgah.ImageDepth=(unsigned char)d;
-	tgah.Desc=0;
-	fwrite(&tgah,1,sizeof(TGA_HEADER),file);
-	if (d==8)
-	{
-		fwrite(pPal,1,256*3,file);
-	}
-	slsize=w*d/8;
-	scanline=(unsigned char*)Pic_calloc(1,slsize);
-	if (!scanline)
-	{
-		Pic_SetError("TGA_Write, not enough memory for scanline");
-		return(0);
-	}
-	for(y=0 ; y<(long)h ; y++)
-	{
-		memcpy(scanline,&pDatas[(h-y-1)*slsize],slsize);
-		if (d==24)
-		{
-			for(x=0 ; x<(long)w ; x++)
-			{
-				r=scanline[x*3+0];
-				g=scanline[x*3+1];
-				b=scanline[x*3+2];
-				scanline[x*3+0]=b;
-				scanline[x*3+1]=g;
-				scanline[x*3+2]=r;				
-			}
-		}
-		fwrite(scanline,1,slsize,file);
-	}
-	Pic_free(scanline);
-	fclose(file);
-	return(1);
-}
diff --git a/code/nel/tools/3d/tile_edit/PIC/pic.h b/code/nel/tools/3d/tile_edit/PIC/pic.h
deleted file mode 100644
index ec6582c6b..000000000
--- a/code/nel/tools/3d/tile_edit/PIC/pic.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// 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/>.
-
-#ifndef _PIC_H_
-#define _PIC_H_
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-#define	PIC_TYPE_JPG		1
-#define	PIC_TYPE_TGA8		2
-#define	PIC_TYPE_TGA16		3
-#define	PIC_TYPE_TGA24		4
-#define PIC_TYPE_BMP8		5
-#define PIC_TYPE_BMP24		6
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-//
-// Basic API
-//
-extern unsigned long	PIC_Load(char* FileName, unsigned char Quantize);
-
-extern unsigned long	PIC_Create(char* pPal, char* pDatas, unsigned long w, unsigned long h, unsigned long d);
-
-extern unsigned long	PIC_Save(unsigned long id, char* FileName, unsigned long type, unsigned long qual);
-
-extern unsigned long	PIC_GetInfos(	unsigned long id, 
-										char **ppPal, char **ppDatas, 
-										unsigned long *pW, unsigned long *pH, unsigned long *pD);
-
-
-extern unsigned long	PIC_Destroy(unsigned long id);
-//
-// System
-// 
-extern unsigned long	PIC_GetMemNbAllocs(void);
-extern unsigned long	PIC_GetMemAllocated(void);
-extern char*			PIC_GetError(void);
-extern unsigned char	PIC_Error(void);
-extern void				PIC_ResetError(void);
-extern unsigned char	PIC_OnErrorCall( void pFnct(void) );
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/code/nel/tools/3d/tile_edit/PIC/pic_private.h b/code/nel/tools/3d/tile_edit/PIC/pic_private.h
deleted file mode 100644
index 4a67bbc9c..000000000
--- a/code/nel/tools/3d/tile_edit/PIC/pic_private.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// 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/>.
-
-#ifndef _PIC_PRIVATE_H_
-#define _PIC_PRIVATE_H_
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-typedef struct PIC_PICTURE
-{
-	unsigned long		ID;
-	unsigned long		Width;
-	unsigned long		Height;
-	unsigned long		Depth;
-	char				*pDatas;
-	char				*pPal;
-	struct PIC_PICTURE	*Next;
-} PIC_PICTURE;
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-
-//
-// JPG
-//
-
-	
-extern unsigned long	Pic_JPG_Read(	const char *FileName, 
-										char **ppPal, char **ppDatas, 
-										unsigned long *w, unsigned long *h);
-
-extern unsigned long	Pic_JPG_Write(	const char *FileName, 
-										unsigned long Qual, 
-										char *pDatas, 
-										unsigned long w, unsigned long h);
-//
-// TGA
-//
-extern unsigned long	Pic_TGA_Read(	const char *FileName,
-										char **ppPal, char **ppDatas,
-										unsigned long *pWidth, unsigned long *pHeight, 
-										unsigned long *pDepth);
-extern unsigned long	Pic_TGA_Write(	const char *FileName, 
-										char *pPal, char *pDatas, 
-										unsigned long w, unsigned long h, unsigned long d);
-//
-// BMP
-//
-extern unsigned long	Pic_BMP_Read(	const char *FileName,
-										char **ppPal, char **ppDatas,
-										unsigned long *pWidth, unsigned long *pHeight, 
-										unsigned long *pDepth);
-
-extern unsigned long	Pic_BMP_Write(	const char *FileName, 
-										char *pPal, char *pDatas, 
-										unsigned long w, unsigned long h, unsigned long d);
-//
-// System
-//
-extern void*			Pic_malloc(unsigned long size);
-extern void*			Pic_calloc(unsigned long count, unsigned long size);
-extern void				Pic_free(void *memblock);
-extern unsigned long	Pic__msize(void *memblock);
-extern void				Pic_SetError(const char *msg, ...);
-
-// ----------------------------------------------------------------------------------------------------------------------------------
-
-#endif
\ No newline at end of file
diff --git a/code/nel/tools/3d/tile_edit/PIC/readpic.cpp b/code/nel/tools/3d/tile_edit/PIC/readpic.cpp
deleted file mode 100644
index 8afac2b45..000000000
--- a/code/nel/tools/3d/tile_edit/PIC/readpic.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// 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/>.
-
-
-#include <assert.h>
-#include <algorithm>
-#include "readpic.h"
-#include "pic.h"
-#include <nel/misc/rgba.h>
-
-using namespace std;
-
-//============================================================
-// Image API.
-//============================================================
-
-
-bool	PIC_LoadPic(string path, vector<NLMISC::CBGRA> &tampon, uint &Width, uint &Height)
-{
-	uint32			id;
-	char			*pal, *data;
-	unsigned long	w,h,depth;
-	uint			i;
-
-
-	// Loadons l'image.
-	id= PIC_Load((char*)path.c_str(), 0);
-	if(id==0)
-		return false;
-	PIC_GetInfos( id,  &pal, &data, &w, &h, &depth);
-	Width=w;
-	Height=h;
-
-	// On traduit en RGBA.
-	tampon.resize(w*h);
-	switch(depth)
-	{
-		case 8:
-			for(i=0;i<w*h;i++)
-			{
-				tampon[i].R= data[i];
-				tampon[i].G= data[i];
-				tampon[i].B= data[i];
-				tampon[i].A= data[i];
-			}
-			break;
-		case 24:
-			for(i=0;i<w*h;i++)
-			{
-				tampon[i].R= data[i*3+ 0];
-				tampon[i].G= data[i*3+ 1];
-				tampon[i].B= data[i*3+ 2];
-				tampon[i].A= 255;
-			}
-			break;
-		case 32:
-			for(i=0;i<w*h;i++)
-			{
-				tampon[i].R= data[i*4+ 0];
-				tampon[i].G= data[i*4+ 1];
-				tampon[i].B= data[i*4+ 2];
-				tampon[i].A= data[i*4+ 3];
-			}
-			break;
-	}
-
-	// On ferme.
-	PIC_Destroy(id);
-
-	return true;
-}
diff --git a/code/nel/tools/3d/tile_edit/View.cpp b/code/nel/tools/3d/tile_edit/View.cpp
index 2ac9bdeb3..81f5fe784 100644
--- a/code/nel/tools/3d/tile_edit/View.cpp
+++ b/code/nel/tools/3d/tile_edit/View.cpp
@@ -24,7 +24,7 @@
 #include <direct.h>
 //#include "ListGroup.h"
 //#include "ViewPopup.h"
-#include "pic/readpic.h"
+//#include "pic/readpic.h"
 
 using namespace std;
 using namespace NL3D;
@@ -74,6 +74,37 @@ void rotateBuffer (uint &Width, uint &Height, std::vector<NLMISC::CBGRA>& Tampon
 	Height=tmp;
 }
 
+static bool loadPic(const string &path, std::vector<NLMISC::CBGRA> &tampon, uint &width, uint &height)
+{
+	try
+	{
+		NLMISC::CIFile file;
+		if (file.open(path.c_str()))
+		{
+			NLMISC::CBitmap bitmap;
+			bitmap.load(file);
+			width = bitmap.getWidth();
+			height = bitmap.getHeight();
+			tampon.resize(width * height);
+			bitmap.convertToType(NLMISC::CBitmap::RGBA);
+			for (uint y = 0; y < height; ++y)
+			{
+				for (uint x = 0; x < width; ++x)
+				{
+					NLMISC::CRGBA c = bitmap.getPixelColor(x, y, 0);
+					c.R = (c.R * c.A) / 255;
+					c.G = (c.G * c.A) / 255;
+					c.B = (c.B * c.A) / 255;
+					tampon[(y * width) + x] = c;
+				}
+			}
+			return true;
+		}
+	}
+	catch (NLMISC::Exception& ) { }
+	return false;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // CTView
 //Attention : windows veut que le buffer image commence du bas vers le haut
@@ -82,7 +113,7 @@ int _LoadBitmap(const std::string& path,LPBITMAPINFO BitmapInfo, std::vector<NLM
 	//vector<NLMISC::CBGRA> Tampon;
 	uint Width;
 	uint Height;
-	if (PIC_LoadPic(path, Tampon, Width, Height))
+	if (loadPic(path, Tampon, Width, Height))
 	{
 		BitmapInfo->bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
 		BitmapInfo->bmiHeader.biWidth=Width;
@@ -207,7 +238,7 @@ int TileList::setTile128 (int tile, const std::string& name, NL3D::CTile::TBitma
 		vector<NLMISC::CBGRA> tampon;
 		uint Width;
 		uint Height;
-		if (!PIC_LoadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
+		if (!loadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
 		{
 			return (int)(MessageBox (NULL, ((tileBank2.getAbsPath ()+troncated)+"\nContinue ?").c_str(), "Can't load bitmap.", MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 		}
@@ -272,7 +303,7 @@ int TileList::setTile256 (int tile, const std::string& name, NL3D::CTile::TBitma
 		vector<NLMISC::CBGRA> tampon;
 		uint Width;
 		uint Height;
-		if (!PIC_LoadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
+		if (!loadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
 		{
 			return (int)(MessageBox (NULL, ((tileBank2.getAbsPath ()+troncated)+"\nContinue ?").c_str(), "Can't load bitmap.", MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 		}
@@ -338,7 +369,7 @@ int TileList::setTileTransition (int tile, const std::string& name, NL3D::CTile:
 		vector<NLMISC::CBGRA> tampon;
 		uint Width;
 		uint Height;
-		if (!PIC_LoadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
+		if (!loadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
 		{
 			return (int)(MessageBox (NULL, ((tileBank2.getAbsPath ()+troncated)+"\nContinue ?").c_str(), "Can't load bitmap.", MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 		}
@@ -451,7 +482,7 @@ int TileList::setTileTransitionAlpha (int tile, const std::string& name, int rot
 		vector<NLMISC::CBGRA> tampon;
 		uint Width;
 		uint Height;
-		if (!PIC_LoadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
+		if (!loadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
 		{
 			return MessageBox (NULL, ((tileBank2.getAbsPath ()+troncated)+"\nContinue ?").c_str(), "Can't load bitmap.", MB_YESNO|MB_ICONEXCLAMATION)==IDYES;
 		}
@@ -1490,7 +1521,7 @@ LRESULT CTView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 		{
 			_chdir (LastPath.c_str());
 			CFileDialog load(true, NULL, LastPath.c_str(), OFN_ENABLESIZING | OFN_ALLOWMULTISELECT,
-				"Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
+				"PNG Bitmap (*.png)|*.png|Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
 			load.m_ofn.lpstrFile = new char[10000]; // buffer contains filenames list
 			load.m_ofn.lpstrFile[0] = 0;
 			// with 10 KB we should be large enough...
diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt
index 2c1f641a0..0e1c5709d 100644
--- a/code/nel/tools/CMakeLists.txt
+++ b/code/nel/tools/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 # Don't add other subdirectories if only max plugins are selected.
 IF(WITH_NEL_TOOLS)
   ADD_SUBDIRECTORY(misc)
diff --git a/code/nel/tools/build_gamedata/b1_client_dev.py b/code/nel/tools/build_gamedata/b1_client_dev.py
index d8c77c1fa..a23ee693c 100755
--- a/code/nel/tools/build_gamedata/b1_client_dev.py
+++ b/code/nel/tools/build_gamedata/b1_client_dev.py
@@ -52,6 +52,10 @@ if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
 	cfg.write("PreDataPath          = {\n")
 	cfg.write("\t\"" + InstallDirectory + "\", \"user\", \"patch\", \"data\", \"examples\" \n")
 	cfg.write("};\n")
+	cfg.write("PatchWanted          = 0;\n")
+	cfg.write("DisplayLuaDebugInfo  = 1;\n")
+	cfg.write("AllowDebugLua        = 1;\n")
+	cfg.write("FullScreen           = 0;\n")
 	printLog(log, "")
 
 printLog(log, ">>> Install data <<<")
diff --git a/code/nel/tools/build_gamedata/characters_dev.bat b/code/nel/tools/build_gamedata/characters_dev.bat
new file mode 100644
index 000000000..f2b374c47
--- /dev/null
+++ b/code/nel/tools/build_gamedata/characters_dev.bat
@@ -0,0 +1,11 @@
+title Ryzom Core: 1_export.py (CHARACTERS)
+1_export.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: 2_build.py (CHARACTERS)
+2_build.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: 3_install.py (CHARACTERS)
+3_install.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: b1_client_dev.py (CHARACTERS)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (CHARACTERS)
+b2_shard_data.py
+title Ryzom Core: Ready (CHARACTERS)
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms
index 68c8455d6..1a947f7d6 100755
--- a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms
+++ b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms
@@ -49,6 +49,7 @@ fn runNelMaxExport inputMaxFile =
 	tagThisFile = true
 	
 	-- Unhide category
+	unhidelayers()
 	unhidecategory()
 	
 	-- Unhide
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms
index df0ecf7fc..43a05abcc 100755
--- a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms
+++ b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms
@@ -54,6 +54,7 @@ fn runNelMaxExport inputMaxFile =
 	tagThisFile = true
 	
 	-- Unhide category
+	unhidelayers()
 	unhidecategory()
 	
 	-- Unhide
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms
index d8d6c8d9d..cfb51d0e0 100755
--- a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms
+++ b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms
@@ -187,11 +187,14 @@ fn haveCoarseMesh node =
 	return false
 )
 
+fn getRoot node = if isvalidnode node.parent then getRoot node.parent else node
+
 fn runNelMaxExportSub inputMaxFile retryCount = 
 (
 	tagThisFile = false
 	
 	-- Unhide category
+	unhidelayers()
 	unhidecategory()
 	
 	-- Unhide
@@ -273,55 +276,51 @@ fn runNelMaxExportSub inputMaxFile retryCount =
 	-- For each node
 	for node in array_node do
 	(
-		-- It is root ?
-		if (node.parent == undefined) then
+		-- Is not a skeleton ?
+		if (((substring node.name 1 3) != "Bip") and ((substring (getRoot node).name 1 3) != "Bip")) then
 		(
-			-- Is not a skeleton ?
-			if (node.name != "Bip01") then
+			-- Can be exported ?
+			if (isToBeExported node == true) then
 			(
-				-- Can be exported ?
-				if (isToBeExported node == true) then
+				-- Not a lod ?
+				if ((isLod node) == false) then
 				(
-					-- Not a lod ?
-					if ((isLod node) == false) then
+					-- Output directory
+					if (haveCoarseMesh node) == true then
+						output = ("%OutputDirectoryWithCoarseMesh%/" + (node.name) + ".shape")
+					else
+						output = ("%OutputDirectoryWithoutCoarseMesh%/" + (node.name) + ".shape")
+					
+					-- Compare file date
+					if (NeLTestFileDate output inputMaxFile) == true then
 					(
-						-- Output directory
-						if (haveCoarseMesh node) == true then
-							output = ("%OutputDirectoryWithCoarseMesh%/" + (node.name) + ".shape")
-						else
-							output = ("%OutputDirectoryWithoutCoarseMesh%/" + (node.name) + ".shape")
-						
-						-- Compare file date
-						if (NeLTestFileDate output inputMaxFile) == true then
+						try
 						(
-							try
+							-- Export the shape
+							if (NelExportShapeEx node output %ShapeExportOptShadow% %ShapeExportOptExportLighting% "%OutputDirectoryLightmap%" %ShapeExportOptLightingLimit% %ShapeExportOptLumelSize% %ShapeExportOptOversampling% true false %ShapeExportOptLightmapLog%) == true then
 							(
-								-- Export the shape
-								if (NelExportShapeEx node output %ShapeExportOptShadow% %ShapeExportOptExportLighting% "%OutputDirectoryLightmap%" %ShapeExportOptLightingLimit% %ShapeExportOptLumelSize% %ShapeExportOptOversampling% true false %ShapeExportOptLightmapLog%) == true then
-								(
-									nlerror("OK "+output)
-									exported = exported +1 
-								)
-								else
-								(
-									-- Error
-									nlerror("ERROR exporting shape " + node.name + " in file " + inputMaxFile)
-									tagThisFile = false
-								)
+								nlerror("OK "+output)
+								exported = exported +1 
 							)
-							catch 
+							else
 							(
 								-- Error
-								nlerror("ERROR fatal error exporting shape " + node.name + " in file " + inputMaxFile)
+								nlerror("ERROR exporting shape " + node.name + " in file " + inputMaxFile)
 								tagThisFile = false
 							)
 						)
-						else
+						catch 
 						(
-							nlerror("SKIPPED " + output)
-							exported = exported + 1
+							-- Error
+							nlerror("ERROR fatal error exporting shape " + node.name + " in file " + inputMaxFile)
+							tagThisFile = false
 						)
 					)
+					else
+					(
+						nlerror("SKIPPED " + output)
+						exported = exported + 1
+					)
 				)
 			)
 		)
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms
index 22c49013a..614a9a94f 100755
--- a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms
+++ b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms
@@ -39,6 +39,7 @@ fn runNelMaxExport inputMaxFile =
 	tagThisFile = true
 	
 	-- Unhide category
+	unhidelayers()
 	unhidecategory()
 	
 	-- Unhide
diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms
index 2d5e5434f..f06bab786 100755
--- a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms
+++ b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms
@@ -13,6 +13,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms
index 03bfea443..a7b97a064 100755
--- a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms
+++ b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms
@@ -16,6 +16,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
diff --git a/code/nel/tools/build_gamedata/panoply_dev.bat b/code/nel/tools/build_gamedata/panoply_dev.bat
new file mode 100644
index 000000000..13afac56c
--- /dev/null
+++ b/code/nel/tools/build_gamedata/panoply_dev.bat
@@ -0,0 +1,11 @@
+title Ryzom Core: 1_export.py (PANOPLY)
+1_export.py -ipj common/characters_maps_hr
+title Ryzom Core: 2_build.py (PANOPLY)
+2_build.py -ipj common/characters_maps_hr
+title Ryzom Core: 3_install.py (PANOPLY)
+3_install.py -ipj common/characters_maps_hr
+title Ryzom Core: b1_client_dev.py (PANOPLY)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (PANOPLY)
+b2_shard_data.py
+title Ryzom Core: Ready (PANOPLY)
diff --git a/code/nel/tools/build_gamedata/processes/anim/1_export.py b/code/nel/tools/build_gamedata/processes/anim/1_export.py
index 4c51fc261..1745c45a9 100755
--- a/code/nel/tools/build_gamedata/processes/anim/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/anim/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export anim
-# \date 2011-09-21-20-51-GMT
+# \date 2015-01-06-16-31-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export anim
diff --git a/code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms b/code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms
index 7121e16d5..fc1eda5f9 100755
--- a/code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms
+++ b/code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms
@@ -16,6 +16,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
diff --git a/code/nel/tools/build_gamedata/processes/clodbank/0_setup.py b/code/nel/tools/build_gamedata/processes/clodbank/0_setup.py
index 532113523..a4ab0f4df 100755
--- a/code/nel/tools/build_gamedata/processes/clodbank/0_setup.py
+++ b/code/nel/tools/build_gamedata/processes/clodbank/0_setup.py
@@ -74,6 +74,8 @@ cfgOut.write("{\n")
 cfgOut.write("\t\"" + ExportBuildDirectory + "/" + ClodExportDirectory + "\", \n")
 cfgOut.write("\t\"" + ExportBuildDirectory + "/" + SkelExportDirectory + "\", \n")
 cfgOut.write("\t\"" + ExportBuildDirectory + "/" + AnimBuildDirectory + "\", \n")
+cfgOut.write("\t\"" + ExportBuildDirectory + "/" + ShapeOptimizedBuildDirectory + "\", \n")
+cfgOut.write("\t\"" + ExportBuildDirectory + "/" + ShapeWithCoarseMeshBuildDirectory + "\", \n")
 cfgOut.write("};\n")
 cfgOut.write("\n")
 cfgOut.close()
diff --git a/code/nel/tools/build_gamedata/processes/clodbank/1_export.py b/code/nel/tools/build_gamedata/processes/clodbank/1_export.py
index 64cd875df..c73a86ac7 100755
--- a/code/nel/tools/build_gamedata/processes/clodbank/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/clodbank/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export clodbank
-# \date 2011-09-21-20-51-GMT
+# \date 2015-01-06-16-31-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export clodbank
diff --git a/code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms b/code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms
index a8693dc8a..02856d2c7 100755
--- a/code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms
+++ b/code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms
@@ -16,6 +16,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
@@ -115,6 +125,7 @@ fn runNelMaxExport inputMaxFile =
 	tagThisFile = true
 	
 	-- Unhide category
+	unhidelayers()
 	unhidecategory()
 	
 	-- Unhide
diff --git a/code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms b/code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms
index 65cb38c4a..e91732391 100755
--- a/code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms
+++ b/code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms
@@ -16,6 +16,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
@@ -120,6 +130,7 @@ fn runNelMaxExport inputMaxFile =
 	tagThisFile = true
 	
 	-- Unhide category
+	unhidelayers()
 	unhidecategory()
 	
 	-- Unhide
diff --git a/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms b/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
index 933468459..07d032809 100755
--- a/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
+++ b/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
@@ -17,6 +17,16 @@ NEL3D_APPDATA_IGNAME = 1423062564			-- string : name of the Instance Group
 
 tagThisFile = true
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
@@ -307,6 +317,10 @@ fn buildTransitionMatrixObj mt transitionZone cellSize =
 -- Export instance groups from the current loaded zone
 fn exportInstanceGroupFromZone inputFile outputPath igName transitionZone cellSize = 
 (
+	-- Unhide category
+	unhidelayers()
+	unhidecategory()
+
 	-- Unhide
 	max unhide all
 
@@ -501,6 +515,7 @@ try
 				objXRefMgr.UpdateAllRecords()
 
 				-- Unhide category
+				unhidelayers()
 				unhidecategory()
 
 				DeleteDebugMarkersFn ()
@@ -648,6 +663,7 @@ try
 				objXRefMgr.UpdateAllRecords()
 				
 				-- Unhide category
+				unhidelayers()
 				unhidecategory()
 				
 				DeleteDebugMarkersFn ()
@@ -863,6 +879,7 @@ try
 				objXRefMgr.UpdateAllRecords()
 
 				-- Unhide category
+				unhidelayers()
 				unhidecategory()
 
 				DeleteDebugMarkersFn ()
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py b/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py
index 4fb464704..cfb46635f 100755
--- a/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export pacs_prim
-# \date 2013-07-24-14-21-GMT
+# \date 2015-01-06-16-31-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export pacs_prim
@@ -130,6 +130,13 @@ if MaxAvailable:
 
 
 
+# Remove bad file from previous script version
+listPath = ExportBuildDirectory + "/" + PacsPrimExportDirectory + "/landscape_col_prim_pacs_list.txt"
+if os.path.isfile(listPath):
+	os.remove(listPath)
+
+
+
 log.close()
 if os.path.isfile("log.log"):
 	os.remove("log.log")
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms b/code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
index 750af80d9..d0d7c7ce4 100755
--- a/code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
+++ b/code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
@@ -16,6 +16,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
diff --git a/code/nel/tools/build_gamedata/processes/rbank/1_export.py b/code/nel/tools/build_gamedata/processes/rbank/1_export.py
index 4b5667961..65c14c907 100755
--- a/code/nel/tools/build_gamedata/processes/rbank/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/rbank/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export rbank
-# \date 2011-09-21-20-51-GMT
+# \date 2015-01-06-16-31-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export rbank
diff --git a/code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms b/code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms
index 59b444db3..4949f7c60 100755
--- a/code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms
+++ b/code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms
@@ -16,6 +16,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
diff --git a/code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms b/code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms
index 16c6dcec9..f97419aa7 100755
--- a/code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms
+++ b/code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms
@@ -16,6 +16,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
@@ -253,11 +263,14 @@ fn haveCoarseMesh node =
 	return false
 )
 
+fn getRoot node = if isvalidnode node.parent then getRoot node.parent else node
+
 fn runNelMaxExportSub inputMaxFile retryCount = 
 (
 	tagThisFile = false
 	
 	-- Unhide category
+	unhidelayers()
 	unhidecategory()
 	
 	-- Unhide
@@ -339,55 +352,51 @@ fn runNelMaxExportSub inputMaxFile retryCount =
 	-- For each node
 	for node in array_node do
 	(
-		-- It is root ?
-		if (node.parent == undefined) then
+		-- Is not a skeleton ?
+		if (((substring node.name 1 3) != "Bip") and ((substring (getRoot node).name 1 3) != "Bip")) then
 		(
-			-- Is not a skeleton ?
-			if (node.name != "Bip01") then
+			-- Can be exported ?
+			if (isToBeExported node == true) then
 			(
-				-- Can be exported ?
-				if (isToBeExported node == true) then
+				-- Not a lod ?
+				if ((isLod node) == false) then
 				(
-					-- Not a lod ?
-					if ((isLod node) == false) then
+					-- Output directory
+					if (haveCoarseMesh node) == true then
+						output = ("%OutputDirectoryWithCoarseMesh%/" + (node.name) + ".shape")
+					else
+						output = ("%OutputDirectoryWithoutCoarseMesh%/" + (node.name) + ".shape")
+					
+					-- Compare file date
+					if (NeLTestFileDate output inputMaxFile) == true then
 					(
-						-- Output directory
-						if (haveCoarseMesh node) == true then
-							output = ("%OutputDirectoryWithCoarseMesh%/" + (node.name) + ".shape")
-						else
-							output = ("%OutputDirectoryWithoutCoarseMesh%/" + (node.name) + ".shape")
-						
-						-- Compare file date
-						if (NeLTestFileDate output inputMaxFile) == true then
+						try
 						(
-							try
+							-- Export the shape
+							if (NelExportShapeEx node output %ShapeExportOptShadow% %ShapeExportOptExportLighting% "%OutputDirectoryLightmap%" %ShapeExportOptLightingLimit% %ShapeExportOptLumelSize% %ShapeExportOptOversampling% true false %ShapeExportOptLightmapLog%) == true then
 							(
-								-- Export the shape
-								if (NelExportShapeEx node output %ShapeExportOptShadow% %ShapeExportOptExportLighting% "%OutputDirectoryLightmap%" %ShapeExportOptLightingLimit% %ShapeExportOptLumelSize% %ShapeExportOptOversampling% true false %ShapeExportOptLightmapLog%) == true then
-								(
-									nlerror("OK "+output)
-									exported = exported +1 
-								)
-								else
-								(
-									-- Error
-									nlerror("ERROR exporting shape " + node.name + " in file " + inputMaxFile)
-									tagThisFile = false
-								)
+								nlerror("OK "+output)
+								exported = exported +1 
 							)
-							catch 
+							else
 							(
 								-- Error
-								nlerror("ERROR fatal error exporting shape " + node.name + " in file " + inputMaxFile)
+								nlerror("ERROR exporting shape " + node.name + " in file " + inputMaxFile)
 								tagThisFile = false
 							)
 						)
-						else
+						catch 
 						(
-							nlerror("SKIPPED " + output)
-							exported = exported + 1
+							-- Error
+							nlerror("ERROR fatal error exporting shape " + node.name + " in file " + inputMaxFile)
+							tagThisFile = false
 						)
 					)
+					else
+					(
+						nlerror("SKIPPED " + output)
+						exported = exported + 1
+					)
 				)
 			)
 		)
diff --git a/code/nel/tools/build_gamedata/processes/skel/1_export.py b/code/nel/tools/build_gamedata/processes/skel/1_export.py
index 5f065fe5d..dcf336dbd 100755
--- a/code/nel/tools/build_gamedata/processes/skel/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/skel/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export skel
-# \date 2011-09-28-07-42-GMT
+# \date 2015-01-06-16-31-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export skel
diff --git a/code/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms b/code/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms
index 7fd2af0fb..74440350b 100755
--- a/code/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms
+++ b/code/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms
@@ -13,6 +13,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
diff --git a/code/nel/tools/build_gamedata/processes/swt/1_export.py b/code/nel/tools/build_gamedata/processes/swt/1_export.py
index 0803f1246..820950fe5 100755
--- a/code/nel/tools/build_gamedata/processes/swt/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/swt/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export swt
-# \date 2011-09-28-07-42-GMT
+# \date 2015-01-06-16-31-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export swt
diff --git a/code/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms b/code/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms
index ea6ff95c3..99d684ea3 100755
--- a/code/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms
+++ b/code/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms
@@ -13,6 +13,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
diff --git a/code/nel/tools/build_gamedata/processes/veget/1_export.py b/code/nel/tools/build_gamedata/processes/veget/1_export.py
index b2f8a7c57..ae8b835a3 100755
--- a/code/nel/tools/build_gamedata/processes/veget/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/veget/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export veget
-# \date 2011-09-21-20-51-GMT
+# \date 2015-01-06-16-31-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export veget
diff --git a/code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms b/code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms
index cbc2f2177..1b8154530 100755
--- a/code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms
+++ b/code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms
@@ -16,6 +16,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
@@ -105,6 +115,7 @@ fn runNelMaxExport inputMaxFile =
 	tagThisFile = true
 	
 	-- Unhide category
+	unhidelayers()
 	unhidecategory()
 	
 	-- Unhide
diff --git a/code/nel/tools/build_gamedata/processes/zone/1_export.py b/code/nel/tools/build_gamedata/processes/zone/1_export.py
index 94a90900c..acffe9abb 100755
--- a/code/nel/tools/build_gamedata/processes/zone/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/zone/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export zone
-# \date 2011-09-28-07-42-GMT
+# \date 2015-01-06-16-31-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export zone
diff --git a/code/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms b/code/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms
index 3a0ebf8fe..6c4e0c8a0 100755
--- a/code/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms
+++ b/code/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms
@@ -13,6 +13,16 @@ nlErrorStream = openFile nlErrorFilename mode:"a"
 if nlErrorStream == undefined then
 	nlErrorStream = createFile nlErrorFilename
 
+-- Unhide layers
+fn unhidelayers = 
+(
+	for i = 0 to (LayerManager.count - 1) do
+	(
+		layer = (LayerManager.getLayer i)
+		layer.ishidden = false
+	)
+)
+
 -- Unhide category
 fn unhidecategory =
 (
diff --git a/code/nel/tools/build_gamedata/sky_dev.bat b/code/nel/tools/build_gamedata/sky_dev.bat
new file mode 100644
index 000000000..ac80d591e
--- /dev/null
+++ b/code/nel/tools/build_gamedata/sky_dev.bat
@@ -0,0 +1,11 @@
+title Ryzom Core: 1_export.py (LEVELDESIGN)
+1_export.py -ipj common/sky common/sfx common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
+title Ryzom Core: 2_build.py (LEVELDESIGN)
+2_build.py -ipj common/sky common/sfx common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
+title Ryzom Core: 3_install.py (LEVELDESIGN)
+3_install.py -ipj common/sky common/sfx common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
+title Ryzom Core: b1_client_dev.py (LEVELDESIGN)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (LEVELDESIGN)
+b2_shard_data.py
+title Ryzom Core: Ready
diff --git a/code/nel/tools/misc/CMakeLists.txt b/code/nel/tools/misc/CMakeLists.txt
index 5386cbbc6..f7f1b9a39 100644
--- a/code/nel/tools/misc/CMakeLists.txt
+++ b/code/nel/tools/misc/CMakeLists.txt
@@ -4,6 +4,9 @@ IF(WITH_QT)
   ADD_SUBDIRECTORY(words_dic_qt)
   ADD_SUBDIRECTORY(message_box_qt)
 ENDIF(WITH_QT)
+IF(WITH_QT OR WITH_QT5)
+  ADD_SUBDIRECTORY(crash_report)
+ENDIF(WITH_QT OR WITH_QT5)
 
 IF(WIN32)
   ADD_SUBDIRECTORY(exec_timeout)
diff --git a/code/nel/tools/misc/crash_report/CMakeLists.txt b/code/nel/tools/misc/crash_report/CMakeLists.txt
new file mode 100644
index 000000000..fe063f6d0
--- /dev/null
+++ b/code/nel/tools/misc/crash_report/CMakeLists.txt
@@ -0,0 +1,65 @@
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SRC_DIR} ${QT_INCLUDES})
+FILE(GLOB CRASHREPORT_SRC *.cpp)
+FILE(GLOB CRASHREPORT_HDR *.h)
+FILE(GLOB CRASHREPORT_UI *.ui)
+
+FILE(GLOB CRASHREPORT_MOC_HDR
+	crash_report_socket.h
+	crash_report_widget.h
+)
+
+find_package(Qt5Network)
+
+IF(!WITH_QT5)
+	SET(QT_USE_QTGUI TRUE)
+	SET(QT_USE_QTNETWORK TRUE)
+	SET(QT_USE_QTMAIN TRUE)
+	SET(QT_USE_QTOPENGL FALSE)
+	SET(QT_USE_QTXML FALSE)
+	INCLUDE(${QT_USE_FILE})
+ENDIF(!WITH_QT5)
+
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+
+IF(WITH_QT5)
+	SET(CMAKE_AUTOMOC ON)
+	QT5_WRAP_CPP(CRASHREPORT_MOC_SRC ${CRASHREPORT_MOC_HDR})
+	QT5_WRAP_UI(CRASHREPORT_UI_HDR ${CRASHREPORT_UI})
+ELSE(WITH_QT5)
+	QT4_WRAP_CPP(CRASHREPORT_MOC_SRC ${CRASHREPORT_MOC_HDR})
+	QT4_WRAP_UI(CRASHREPORT_UI_HDR ${CRASHREPORT_UI})
+ENDIF(WITH_QT5)
+
+SOURCE_GROUP(resources FILES ${CRASHREPORT_UI})
+IF(!WITH_QT5)
+	SOURCE_GROUP(generated FILES ${CRASHREPORT_UI_HDR} ${CRASHREPORT_MOC_SRC})
+ENDIF(!WITH_QT5)
+SOURCE_GROUP("" FILES ${CRASHREPORT_SRC} ${CRASHREPORT_HDR})
+
+IF(WITH_QT5)
+	ADD_EXECUTABLE(crash_report WIN32 MACOSX_BUNDLE
+		${CRASHREPORT_SRC}
+		${CRASHREPORT_HDR}
+		${CRASHREPORT_UI}
+	)
+ELSE(WITH_QT5)
+	ADD_EXECUTABLE(crash_report WIN32 MACOSX_BUNDLE
+		${CRASHREPORT_SRC}
+		${CRASHREPORT_MOC_HDR}
+		${CRASHREPORT_MOC_SRC}
+		${CRASHREPORT_UI_HDR}
+	)
+ENDIF(WITH_QT5)
+
+IF(WITH_QT5)
+	TARGET_LINK_LIBRARIES(crash_report
+		Qt5::Widgets
+		Qt5::Network)
+ELSE(WITH_QT5)
+	TARGET_LINK_LIBRARIES(crash_report ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+ENDIF(WITH_QT5)
+
+NL_DEFAULT_PROPS(crash_report "NeL, Tools, Misc: Crash Report")
+NL_ADD_RUNTIME_FLAGS(crash_report)
+
+INSTALL(TARGETS crash_report RUNTIME DESTINATION ${NL_BIN_PREFIX})
diff --git a/code/nel/tools/misc/crash_report/crash_report.cpp b/code/nel/tools/misc/crash_report/crash_report.cpp
new file mode 100644
index 000000000..c42f1ae6f
--- /dev/null
+++ b/code/nel/tools/misc/crash_report/crash_report.cpp
@@ -0,0 +1,111 @@
+// Nel MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+
+#include "crash_report_widget.h"
+#include <QApplication>
+#include <QMessageBox>
+
+#include <stack>
+#include <vector>
+#include <string>
+
+class CCmdLineParser
+{
+public:
+	static void parse( int argc, char **argv, std::vector< std::pair< std::string, std::string > > &v )
+	{
+		std::stack< std::string > stack;
+		std::string key;		
+		std::string value;
+
+		for( int i = argc - 1 ; i >= 0; i-- )
+		{
+			stack.push( std::string( argv[ i ] ) );
+		}
+
+		while( !stack.empty() )
+		{
+			key = stack.top();
+			stack.pop();
+
+			// If not a real parameter ( they start with '-' ), discard.
+			if( key[ 0 ] != '-' )
+				continue;
+
+			// Remove the '-'
+			key = key.substr( 1 );
+
+			// No more parameters
+			if( stack.empty() )
+			{
+				v.push_back( std::make_pair( key, "" ) );
+				break;
+			}
+
+			 value = stack.top();
+
+			 // If next parameter is a key, process it in the next iteration
+			 if( value[ 0 ] == '-' )
+			 {
+				 v.push_back( std::make_pair( key, "" ) );
+				 continue;
+			 }
+			 // Otherwise store the pair
+			 else
+			 {
+				 v.push_back( std::make_pair( key, value ) );
+				 stack.pop();
+			 }
+		}
+	}
+};
+
+int main( int argc, char **argv )
+{
+#ifndef WIN32
+	// Workaround to default -style=gtk+ on recent Cinnamon versions
+	char *currentDesktop = getenv("XDG_CURRENT_DESKTOP");
+	if (currentDesktop)
+	{
+		printf("XDG_CURRENT_DESKTOP: %s\n", currentDesktop);
+		if (!strcmp(currentDesktop, "X-Cinnamon"))
+		{
+			setenv("XDG_CURRENT_DESKTOP", "gnome", 1);
+		}
+	}
+#endif
+
+	QApplication app( argc, argv );
+
+	std::vector< std::pair< std::string, std::string > > params;
+
+	CCmdLineParser::parse( argc, argv, params );
+
+	CCrashReportWidget w;
+	w.setup( params );
+	w.show();
+
+	int ret = app.exec();
+
+	if( ret != EXIT_SUCCESS )
+		return ret;
+	else
+		return w.getReturnValue();
+	
+}
\ No newline at end of file
diff --git a/code/nel/tools/misc/crash_report/crash_report_data.h b/code/nel/tools/misc/crash_report/crash_report_data.h
new file mode 100644
index 000000000..5884e7eb4
--- /dev/null
+++ b/code/nel/tools/misc/crash_report/crash_report_data.h
@@ -0,0 +1,33 @@
+// Ryzom Core MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+
+#ifndef RCERROR_DATA
+#define RCERROR_DATA
+
+#include <QString>
+
+
+struct SCrashReportData
+{
+	QString description;
+	QString report;
+	QString email;
+};
+
+#endif
diff --git a/code/nel/tools/misc/crash_report/crash_report_socket.cpp b/code/nel/tools/misc/crash_report/crash_report_socket.cpp
new file mode 100644
index 000000000..f2a14e84b
--- /dev/null
+++ b/code/nel/tools/misc/crash_report/crash_report_socket.cpp
@@ -0,0 +1,78 @@
+// Nel MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+#include "crash_report_socket.h"
+#include <QNetworkAccessManager>
+#include <QUrl>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#   include <QUrlQuery>
+#endif
+
+class CCrashReportSocketPvt
+{
+public:
+	QNetworkAccessManager mgr;
+};
+
+CCrashReportSocket::CCrashReportSocket( QObject *parent ) :
+QObject( parent )
+{
+	m_pvt = new CCrashReportSocketPvt();
+
+	connect( &m_pvt->mgr, SIGNAL( finished( QNetworkReply* ) ), this, SLOT( onFinished( QNetworkReply* ) ) );
+}
+
+CCrashReportSocket::~CCrashReportSocket()
+{
+	delete m_pvt;
+}
+
+void CCrashReportSocket::sendReport( const SCrashReportData &data )
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+	QUrlQuery params;
+#else
+	QUrl params;
+#endif
+	params.addQueryItem( "report", data.report );
+	params.addQueryItem( "descr", data.description );
+	params.addQueryItem("email", data.email);
+
+	QUrl url( m_url );
+	QNetworkRequest request( url );
+	request.setRawHeader( "Connection", "close" );
+
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+	QByteArray postData = params.query(QUrl::FullyEncoded).toUtf8();
+#else
+	QByteArray postData = params.encodedQuery();
+#endif
+
+	m_pvt->mgr.post(request, postData);
+}
+
+void CCrashReportSocket::onFinished( QNetworkReply *reply )
+{
+	if( reply->error() != QNetworkReply::NoError )
+		Q_EMIT reportFailed();
+	else
+		Q_EMIT reportSent();
+}
+
diff --git a/code/nel/tools/misc/crash_report/crash_report_socket.h b/code/nel/tools/misc/crash_report/crash_report_socket.h
new file mode 100644
index 000000000..32ccc5da0
--- /dev/null
+++ b/code/nel/tools/misc/crash_report/crash_report_socket.h
@@ -0,0 +1,55 @@
+// Nel MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+
+#ifndef RCERROR_SOCKET
+#define RCERROR_SOCKET
+
+#include <QObject>
+#include "crash_report_data.h"
+
+class CCrashReportSocketPvt;
+class QNetworkReply;
+
+class CCrashReportSocket : public QObject
+{
+	Q_OBJECT
+
+public:	
+	CCrashReportSocket( QObject *parent );
+	~CCrashReportSocket();
+
+	void setURL( const char *URL ){ m_url = URL; }
+	QString url() const{ return m_url; }
+
+	void sendReport( const SCrashReportData &data );
+
+Q_SIGNALS:
+	void reportSent();
+	void reportFailed();
+
+private Q_SLOTS:
+	void onFinished( QNetworkReply *reply );
+
+private:
+	CCrashReportSocketPvt *m_pvt;
+	QString m_url;
+};
+
+#endif
+
diff --git a/code/nel/tools/misc/crash_report/crash_report_widget.cpp b/code/nel/tools/misc/crash_report/crash_report_widget.cpp
new file mode 100644
index 000000000..218b3545c
--- /dev/null
+++ b/code/nel/tools/misc/crash_report/crash_report_widget.cpp
@@ -0,0 +1,301 @@
+// Nel MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+
+#include "crash_report_widget.h"
+#include "crash_report_socket.h"
+#include "crash_report_data.h"
+#include <QTimer>
+#include <QTextStream>
+#include <QFile>
+#include <QMessageBox>
+#include <QFile>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QCheckBox>
+
+CCrashReportWidget::CCrashReportWidget( QWidget *parent ) :
+QWidget( parent )
+{
+	m_developerMode = false;
+	m_forceSend = false;
+	m_devSendReport = false;
+	m_returnValue = ERET_NULL;
+
+	m_ui.setupUi( this );
+
+	m_socket = new CCrashReportSocket( this );
+
+	QTimer::singleShot( 1, this, SLOT( onLoad() ) );
+
+	connect( m_ui.emailCB, SIGNAL( stateChanged( int ) ), this, SLOT( onCBClicked() ) );
+
+	connect( m_socket, SIGNAL( reportSent() ), this, SLOT( onReportSent() ) );
+	connect( m_socket, SIGNAL( reportFailed() ), this, SLOT( onReportFailed() ) );
+}
+
+CCrashReportWidget::~CCrashReportWidget()
+{
+	m_socket = NULL;
+}
+
+void CCrashReportWidget::setup( const std::vector< std::pair< std::string, std::string > > &params )
+{
+	for( int i = 0; i < params.size(); i++ )
+	{
+		const std::pair< std::string, std::string > &p = params[ i ];
+		const std::string &k = p.first;
+		const std::string &v = p.second;
+
+		if( k == "log" )
+		{
+			m_fileName = v.c_str();
+			if( !QFile::exists( m_fileName ) )
+				m_fileName.clear();
+		}
+		else
+		if( k == "host" )
+		{
+			m_socket->setURL( v.c_str() );
+		}
+		else
+		if( k == "title" )
+		{
+			setWindowTitle( v.c_str() );
+		}
+		else
+		if( k == "dev" )
+		{
+			m_developerMode = true;
+		}
+		else
+		if( k == "sendreport" )
+		{
+			m_forceSend = true;
+		}
+	}
+
+	if( m_fileName.isEmpty() )
+	{
+		m_ui.reportLabel->hide();
+		m_ui.reportEdit->hide();
+	}
+
+	
+	if( m_socket->url().isEmpty() || m_fileName.isEmpty() )
+	{
+		m_ui.descriptionEdit->hide();
+		m_ui.emailCB->hide();
+		m_ui.emailEdit->hide();
+		m_ui.descrLabel->hide();
+	}
+
+	QHBoxLayout *hbl = new QHBoxLayout( this );
+
+	if( m_developerMode )
+	{
+		if( !m_socket->url().isEmpty() && !m_fileName.isEmpty() )
+		{
+			m_ui.emailCB->setEnabled( false );
+
+			QCheckBox *cb = new QCheckBox( tr( "Send report" ), this );
+			m_ui.gridLayout->addWidget( cb, 4, 0, 1, 1 );
+
+			m_ui.gridLayout->addWidget( m_ui.emailCB, 5, 0, 1, 1 );
+			m_ui.gridLayout->addWidget( m_ui.emailEdit, 6, 0, 1, 1 );
+
+			connect(cb, SIGNAL(stateChanged(int)), this, SLOT(onSendCBClicked()));
+			if (m_forceSend)
+				cb->setChecked(true);
+		}
+
+		hbl->addStretch();
+
+		QPushButton *alwaysIgnoreButton = new QPushButton( tr( "Always Ignore" ), this );
+		QPushButton *ignoreButton = new QPushButton( tr( "Ignore" ), this );
+		QPushButton *abortButton = new QPushButton( tr( "Abort" ), this );
+		QPushButton *breakButton = new QPushButton(tr("Break"), this);
+		breakButton->setAutoDefault(true);
+
+		hbl->addWidget( alwaysIgnoreButton );
+		hbl->addWidget( ignoreButton );
+		hbl->addWidget( abortButton );
+		hbl->addWidget( breakButton );
+
+		m_ui.gridLayout->addLayout( hbl, 7, 0, 1, 3 );
+
+		connect( alwaysIgnoreButton, SIGNAL( clicked( bool ) ), this, SLOT( onAlwaysIgnoreClicked() ) );
+		connect( ignoreButton, SIGNAL( clicked( bool ) ), this, SLOT( onIgnoreClicked() ) );
+		connect( abortButton, SIGNAL( clicked( bool ) ), this, SLOT( onAbortClicked() ) );
+		connect( breakButton, SIGNAL( clicked( bool ) ), this, SLOT( onBreakClicked() ) );
+	}
+	else
+	{
+		hbl->addStretch();
+
+		// If -host is specified, offer the send function
+		if( !m_socket->url().isEmpty() && !m_fileName.isEmpty() )
+		{
+			if (!m_forceSend)
+			{
+				QPushButton *cancelButton = new QPushButton(tr("Don't send report"), this);
+				connect(cancelButton, SIGNAL(clicked(bool)), this, SLOT(onCancelClicked()));
+				hbl->addWidget(cancelButton);
+			}
+
+			QPushButton *sendButton = new QPushButton( tr( "Send report" ), this );
+			sendButton->setAutoDefault(true);
+			connect( sendButton, SIGNAL( clicked( bool ) ), this, SLOT( onSendClicked() ) );
+			hbl->addWidget( sendButton );
+		}
+		// Otherwise only offer exit
+		else
+		{
+			QPushButton *exitButton = new QPushButton( tr( "Exit" ), this );
+			connect( exitButton, SIGNAL( clicked( bool ) ), this, SLOT( onCancelClicked() ) );
+			hbl->addWidget(exitButton);
+			exitButton->setAutoDefault(true);
+		}
+
+		m_ui.gridLayout->addLayout( hbl, 6, 0, 1, 3 );
+	}
+}
+
+void CCrashReportWidget::onLoad()
+{
+	if( m_fileName.isEmpty() )
+		return;
+
+	QFile f( m_fileName );
+	bool b = f.open( QFile::ReadOnly | QFile::Text );
+	if( !b )
+	{
+		m_fileName.clear();
+		return;
+	}
+
+	QTextStream ss( &f );
+	m_ui.reportEdit->setPlainText( ss.readAll() );
+	f.close();
+}
+
+void CCrashReportWidget::onSendClicked()
+{
+	if( m_developerMode && !m_devSendReport )
+	{
+		close();
+		return;
+	}
+
+	if( m_socket->url().isEmpty() || m_fileName.isEmpty() )
+	{
+		close();
+		return;
+	}
+
+	QApplication::setOverrideCursor( Qt::WaitCursor );
+
+	SCrashReportData data;
+	data.description = m_ui.descriptionEdit->toPlainText();
+	data.report = m_ui.reportEdit->toPlainText();
+	
+	if( m_ui.emailCB->isChecked() )
+		data.email = m_ui.emailEdit->text();
+
+	m_socket->sendReport( data );
+}
+
+void CCrashReportWidget::onCancelClicked()
+{
+	removeAndQuit();
+}
+
+void CCrashReportWidget::onCBClicked()
+{
+	m_ui.emailEdit->setEnabled( m_ui.emailCB->isChecked() );
+}
+
+void CCrashReportWidget::onSendCBClicked()
+{
+	bool b = m_ui.emailCB->isEnabled();
+
+	if( b )
+	{
+		m_ui.emailCB->setChecked( false );
+	}
+
+	m_ui.emailCB->setEnabled( !b );
+
+	m_devSendReport = !m_devSendReport;
+}
+
+void CCrashReportWidget::onAlwaysIgnoreClicked()
+{
+	m_returnValue = ERET_ALWAYS_IGNORE;
+	onSendClicked();
+}
+
+void CCrashReportWidget::onIgnoreClicked()
+{
+	m_returnValue = ERET_IGNORE;
+	onSendClicked();
+}
+
+void CCrashReportWidget::onAbortClicked()
+{
+	m_returnValue = ERET_ABORT;
+	onSendClicked();
+}
+
+void CCrashReportWidget::onBreakClicked()
+{
+	m_returnValue = ERET_BREAK;
+	onSendClicked();
+}
+
+
+void CCrashReportWidget::onReportSent()
+{
+	QApplication::setOverrideCursor( Qt::ArrowCursor );
+
+	QMessageBox::information( this,
+								tr( "Report sent" ),
+								tr( "The report has been sent." ) );
+
+	removeAndQuit();
+}
+
+void CCrashReportWidget::onReportFailed()
+{
+	QApplication::setOverrideCursor( Qt::ArrowCursor );
+
+	QMessageBox::information( this,
+								tr( "Report failed" ),
+								tr( "Failed to send the report..." ) );
+
+	removeAndQuit();
+}
+
+void CCrashReportWidget::removeAndQuit()
+{
+	if( !m_fileName.isEmpty() )
+		QFile::remove( m_fileName );
+
+	close();
+}
+
diff --git a/code/nel/tools/misc/crash_report/crash_report_widget.h b/code/nel/tools/misc/crash_report/crash_report_widget.h
new file mode 100644
index 000000000..f40e40854
--- /dev/null
+++ b/code/nel/tools/misc/crash_report/crash_report_widget.h
@@ -0,0 +1,82 @@
+// Nel MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+
+#ifndef RCERROR_WIDGET
+#define RCERROR_WIDGET
+
+
+#include "ui_crash_report_widget.h"
+#include <vector>
+#include <string>
+
+class CCrashReportSocket;
+
+class CCrashReportWidget : public QWidget
+{
+	Q_OBJECT
+public:
+
+	enum EReturnValue
+	{
+		ERET_NULL          = 0,
+		ERET_ALWAYS_IGNORE = 21,
+		ERET_IGNORE        = 22,
+		ERET_ABORT         = 23,
+		ERET_BREAK         = 24
+	};
+
+	CCrashReportWidget( QWidget *parent = NULL );
+	~CCrashReportWidget();
+
+	void setFileName( const char *fn ){ m_fileName = fn; }
+
+	void setup( const std::vector< std::pair< std::string, std::string > > &params );
+
+	EReturnValue getReturnValue() const{ return m_returnValue; }
+
+private Q_SLOTS:
+	void onLoad();
+	void onSendClicked();
+	void onCancelClicked();
+	void onCBClicked();
+	void onSendCBClicked();
+
+	void onAlwaysIgnoreClicked();
+	void onIgnoreClicked();
+	void onAbortClicked();
+	void onBreakClicked();
+	
+	void onReportSent();
+	void onReportFailed();
+
+private:
+	void removeAndQuit();
+
+	Ui::CrashReportWidget m_ui;
+	QString m_fileName;
+	CCrashReportSocket *m_socket;
+	bool m_developerMode;
+	bool m_forceSend;
+	bool m_devSendReport;
+
+	EReturnValue m_returnValue;
+};
+
+#endif
+
diff --git a/code/nel/tools/misc/crash_report/crash_report_widget.ui b/code/nel/tools/misc/crash_report/crash_report_widget.ui
new file mode 100644
index 000000000..da1e38618
--- /dev/null
+++ b/code/nel/tools/misc/crash_report/crash_report_widget.ui
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CrashReportWidget</class>
+ <widget class="QWidget" name="CrashReportWidget">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>406</width>
+    <height>430</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>NeL report</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="descrLabel">
+     <property name="text">
+      <string>What were you doing when the crash occured?</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="reportLabel">
+     <property name="text">
+      <string>Contents of the report ( automatically generated )</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="QPlainTextEdit" name="descriptionEdit"/>
+   </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QCheckBox" name="emailCB">
+     <property name="text">
+      <string>Email me if you have further questions, or updates on this issue</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="3">
+    <widget class="QLineEdit" name="emailEdit">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Enter your email address here</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QPlainTextEdit" name="reportEdit">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/code/nel/tools/misc/data_mirror/StdAfx.h b/code/nel/tools/misc/data_mirror/StdAfx.h
index 90fe14511..a065be4ed 100644
--- a/code/nel/tools/misc/data_mirror/StdAfx.h
+++ b/code/nel/tools/misc/data_mirror/StdAfx.h
@@ -10,9 +10,6 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "nel/misc/types_nl.h"
-#include "nel/misc/file.h"
-
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
 #include <afxwin.h>         // MFC core and standard components
diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
index 53d515fdd..851dfe6df 100644
--- a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
+++ b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
@@ -163,7 +163,7 @@ void readFormId( string& outputFileName )
 				map<string,uint8>::iterator itFT = FileTypeToId.find(fileType);
 				if( itFT == FileTypeToId.end() )
 				{
-					FileTypeToId.insert( make_pair(fileType,fid.FormIDInfos.Type) );
+					FileTypeToId.insert( std::pair<std::string, uint8>(fileType,fid.FormIDInfos.Type) );
 				}
 			}
 			else
diff --git a/code/nel/tools/misc/xml_packer/xml_packer.cpp b/code/nel/tools/misc/xml_packer/xml_packer.cpp
index 6f82b5426..2d7695de4 100644
--- a/code/nel/tools/misc/xml_packer/xml_packer.cpp
+++ b/code/nel/tools/misc/xml_packer/xml_packer.cpp
@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
 					CSString subFileName = parser.leftCrop(sizeof("	<nel:xml_file name=")-1);
 					subFileName = subFileName.matchDelimiters(false, false, true, false);
 					subFileName = subFileName.unquoteIfQuoted();
-					subFileName = dirName+"/"+subFileName;
+					subFileName = dirName + "/" + subFileName.c_str();
 					
 					printf("Extracting file '%s'...\n", CFile::getFilename(subFileName).c_str());
 					// open the output file 
diff --git a/code/nel/tools/pacs/build_rbank/build_rbank.cpp b/code/nel/tools/pacs/build_rbank/build_rbank.cpp
index 2285873c0..833c6c749 100644
--- a/code/nel/tools/pacs/build_rbank/build_rbank.cpp
+++ b/code/nel/tools/pacs/build_rbank/build_rbank.cpp
@@ -990,7 +990,7 @@ void	processGlobalRetriever()
 		{
 			if (Verbose)
 				nlinfo("unlink: %s", unlinkstr.c_str());
-			faultyInstances.insert(make_pair<uint, CFaultyInstance>(i, fi));
+			faultyInstances.insert(std::pair<uint, CFaultyInstance>(i, fi));
 		}
 	}
 
@@ -1046,7 +1046,7 @@ void	processGlobalRetriever()
 			{
 				if (Verbose)
 					nlinfo("after fix: unlink: %s", unlinkstr.c_str());
-				faultyInstances.insert(make_pair<uint, CFaultyInstance>(i, fi));
+				faultyInstances.insert(std::pair<uint, CFaultyInstance>(i, fi));
 			}
 		}
 	}
diff --git a/code/nel/tools/pacs/build_rbank/build_surf.cpp b/code/nel/tools/pacs/build_rbank/build_surf.cpp
index 9546e19f1..10d4c6a19 100644
--- a/code/nel/tools/pacs/build_rbank/build_surf.cpp
+++ b/code/nel/tools/pacs/build_rbank/build_surf.cpp
@@ -201,8 +201,7 @@ template<class A>
 class CHashPtr
 {
 public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 
 	typedef	A	*ptrA;
 	size_t	operator() (const ptrA &a) const
diff --git a/code/nelns/login_service/connection_client.cpp b/code/nelns/login_service/connection_client.cpp
index 8ff713ec2..ebdef1b9a 100644
--- a/code/nelns/login_service/connection_client.cpp
+++ b/code/nelns/login_service/connection_client.cpp
@@ -126,7 +126,7 @@ retry:
 
 		// now the user is on the database
 
-		uid = atoi(row[0]);
+		NLMISC::fromString(row[0], uid);
 
 		if(cpassword != row[2])
 		{
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/Configuration.cpp b/code/nelns/login_system/nel_launcher_windows_ext/Configuration.cpp
index f9092e56b..88b0d854a 100644
--- a/code/nelns/login_system/nel_launcher_windows_ext/Configuration.cpp
+++ b/code/nelns/login_system/nel_launcher_windows_ext/Configuration.cpp
@@ -52,7 +52,7 @@ BOOL CConfiguration::Load()
 
 		// Reading the configuration file version
 		GetValue(csBuffer, KEY_VERSION, csValue);
-		m_dVersion	= atof(csValue);
+		NLMISC::fromString(csValue, m_dVersion);
 		nlinfo("Config' version %s", csValue);
 
 		if(m_dVersion < APP.m_dVersion)
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cpp b/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cpp
index 8ace867f7..2e36702d8 100644
--- a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cpp
+++ b/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cpp
@@ -324,7 +324,7 @@ void CNel_launcherApp::LoadVersion()
 	else
 	{
 		nlinfo("Launcher' version %s", csVersion);
-		m_dVersion	= atof(csVersion);
+		NLMISC::fromString(csVersion, m_dVersion);
 	}
 }
 
diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index 2846713fc..55e56b012 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -419,7 +419,7 @@ PrintfCommandsFreeTrial = {
 
 DisplayMissingAnimFile = 0;
 
-LoadingStringCount = 54;
+LoadingStringCount = 0;
 
 
 // Some R2 parameters ...
diff --git a/code/ryzom/client/src/3d_notes.cpp b/code/ryzom/client/src/3d_notes.cpp
index 7156854e4..618525de4 100644
--- a/code/ryzom/client/src/3d_notes.cpp
+++ b/code/ryzom/client/src/3d_notes.cpp
@@ -57,9 +57,10 @@ void cbNotesChanged()
 			Notes.Notes.clear();
 			return;
 		}
-		pos.x = (float)atof(posstr[0].c_str());
-		pos.y = (float)atof(posstr[1].c_str());
-		pos.z = (float)atof(posstr[2].c_str());
+
+		NLMISC::fromString(posstr[0], pos.x);
+		NLMISC::fromString(posstr[1], pos.y);
+		NLMISC::fromString(posstr[2], pos.z);
 
 		string note(var.asString(i+2));
 		if(note.empty())
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index c20d9d0dc..9c2b4b431 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 # Need clientsheets lib for sheets packer tool
 ADD_SUBDIRECTORY(client_sheets)
 
@@ -84,6 +83,7 @@ INCLUDE_DIRECTORIES(
 			${LUABIND_INCLUDE_DIR}
 			${LIBWWW_INCLUDE_DIR}
 			${CURL_INCLUDE_DIRS}
+			${ZLIB_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(ryzom_client
@@ -121,6 +121,14 @@ NL_ADD_RUNTIME_FLAGS(ryzom_client)
 
 NL_ADD_LIB_SUFFIX(ryzom_client)
 
+IF(WITH_RYZOM_CLIENT_UAC)
+  IF(CMAKE_GENERATOR MATCHES "Visual Studio")
+    SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/level='requireAdministrator'")
+  ELSEIF(CMAKE_GENERATOR MATCHES "NMake Makefiles")
+    SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"")
+  ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio")
+ENDIF(WITH_RYZOM_CLIENT_UAC)
+
 IF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS))
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS))
diff --git a/code/ryzom/client/src/actions.h b/code/ryzom/client/src/actions.h
index e9b9d53e0..b177c1818 100644
--- a/code/ryzom/client/src/actions.h
+++ b/code/ryzom/client/src/actions.h
@@ -30,8 +30,8 @@
 ///////////
 // CLASS //
 class CCombo;
-class CActionsManager;
 class CAction;
+class CActionsManager;
 
 /**
  * The goal of CCombo is to gather together Inputs that will validate an Action.
@@ -281,8 +281,7 @@ public:
 // HashMapTraits for NLMISC::TKey
 struct CTKeyHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CTKeyHashMapTraits() { }
 	size_t operator() (NLMISC::TKey key) const
 	{
diff --git a/code/ryzom/client/src/cdb_synchronised.cpp b/code/ryzom/client/src/cdb_synchronised.cpp
index 45c57dd55..2ad3022cf 100644
--- a/code/ryzom/client/src/cdb_synchronised.cpp
+++ b/code/ryzom/client/src/cdb_synchronised.cpp
@@ -41,7 +41,7 @@
 
 #include <string>
 
-#include "../../common/src/game_share/ryzom_database_banks.h"
+#include "game_share/ryzom_database_banks.h"
 
 
 ////////////////
diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index 23fdb78e2..89c9b805b 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -4537,7 +4537,7 @@ void CCharacterCL::applyBehaviourFlyingHPs(const CBehaviourContext &bc, const MB
 	{
 		if(behaviour.DeltaHP != 0)
 		{
-			CRGBA deltaHPColor( 0, 0, 0 );
+			CRGBA deltaHPColor(0, 0, 0);
 			// if it's a hit
 			if( behaviour.DeltaHP < 0 )
 			{
diff --git a/code/ryzom/client/src/client.cpp b/code/ryzom/client/src/client.cpp
index 19af0545d..1b4285dd5 100644
--- a/code/ryzom/client/src/client.cpp
+++ b/code/ryzom/client/src/client.cpp
@@ -26,7 +26,6 @@
 #include "nel/misc/types_nl.h"
 
 #ifdef NL_OS_WINDOWS
-#include <windows.h>
 #include <shellapi.h>
 #else
 #include <csignal>
@@ -366,6 +365,8 @@ int main(int argc, char **argv)
 
 	createDebug();
 
+	INelContext::getInstance().setWindowedApplication(true);
+
 #ifndef NL_DEBUG
 	INelContext::getInstance().getDebugLog()->removeDisplayer("DEFAULT_SD");
 	INelContext::getInstance().getInfoLog()->removeDisplayer("DEFAULT_SD");
diff --git a/code/ryzom/client/src/client_chat_manager.cpp b/code/ryzom/client/src/client_chat_manager.cpp
index 09f874b96..141edea27 100644
--- a/code/ryzom/client/src/client_chat_manager.cpp
+++ b/code/ryzom/client/src/client_chat_manager.cpp
@@ -969,8 +969,6 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
 					name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name), bWoman);
 				}
 			}
-
-
 		}
 		else
 		{
@@ -1052,8 +1050,6 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 					senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName), bWoman);
 				}
 			}
-
-
 		}
 
 		switch(type)
@@ -1208,7 +1204,7 @@ class CHandlerTell : public IActionHandler
 		ucstring s = CI18N::get("youTellPlayer");
 		strFindReplace(s, "%name", receiver);
 		strFindReplace(finalMsg, CI18N::get("youTell"), s);
-		CInterfaceManager::getInstance()->log(finalMsg);
+		CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerTell, "tell");
diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp
index ad8a328ba..90287955d 100644
--- a/code/ryzom/client/src/commands.cpp
+++ b/code/ryzom/client/src/commands.cpp
@@ -3890,7 +3890,6 @@ NLMISC_COMMAND(displayInventoryCounter, "display the Inventory counter to compar
 
 NLMISC_COMMAND(displayActionCounter, "display the action counters", "")
 {
-
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CSPhraseManager		*pPM= CSPhraseManager::getInstance();
 
diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp
index 8b07cc7f2..3f3a3d809 100644
--- a/code/ryzom/client/src/connection.cpp
+++ b/code/ryzom/client/src/connection.cpp
@@ -31,7 +31,7 @@
 // 3D Interface.
 #include "nel/3d/u_driver.h"
 #include "nel/3d/u_text_context.h"
-#include <nel/3d/stereo_display.h>
+#include "nel/3d/stereo_display.h"
 // Game Share
 //#include "game_share/gd_time.h"		// \todo GUIGUI : TO DELETE/CHANGE
 #include "game_share/gender.h"
@@ -103,7 +103,6 @@ extern uint32			Version;	// Client Version.
 extern UDriver			*Driver;
 extern UTextContext		*TextContext;
 extern bool				game_exit;
-extern CMsgBoxDisplayer MsgBoxError;
 
 extern CSoundManager	*SoundMngr;
 
diff --git a/code/ryzom/client/src/debug_client.cpp b/code/ryzom/client/src/debug_client.cpp
index 8800384ba..0af4207ae 100644
--- a/code/ryzom/client/src/debug_client.cpp
+++ b/code/ryzom/client/src/debug_client.cpp
@@ -345,6 +345,7 @@ void displayStreamingDebug ()
 		//----------------//
 		// Create a shadow when displaying a text.
 		TextContext->setShaded(true);
+		TextContext->setShadeOutline(false);
 		// Set the font size.
 		TextContext->setFontSize(ClientCfg.DebugFontSize);
 		// Set the text color
@@ -390,6 +391,7 @@ void displayStreamingDebug ()
 
 		// No more shadow when displaying a text.
 		TextContext->setShaded(false);
+		TextContext->setShadeOutline(false);
 	}
 }
 
@@ -567,6 +569,7 @@ void displayNetDebug ()
 	//----------------//
 	// Create a shadow when displaying a text.
 	TextContext->setShaded(true);
+	TextContext->setShadeOutline(false);
 	// Set the font size.
 	TextContext->setFontSize(ClientCfg.DebugFontSize);
 	// Set the text color
diff --git a/code/ryzom/client/src/entities.cpp b/code/ryzom/client/src/entities.cpp
index 7bc478ce7..516232108 100644
--- a/code/ryzom/client/src/entities.cpp
+++ b/code/ryzom/client/src/entities.cpp
@@ -426,7 +426,7 @@ void CEntityManager::initialize(uint nbMaxEntity)
 		_Entities.resize(_NbMaxEntity, 0);
 		_EntityGroundFXHandle.resize(_NbMaxEntity);
 	}
-	
+
 	ICDBNode::CTextId textId;
 
 	// Add an observer on the mission database
diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp
index 0063c93f4..6a14d6400 100644
--- a/code/ryzom/client/src/entity_cl.cpp
+++ b/code/ryzom/client/src/entity_cl.cpp
@@ -2296,6 +2296,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 			}
 			
 			ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle));
+
 			// Sometimes translation contains another title
 			{
 				ucstring::size_type pos = replacement.find('$');
@@ -2308,7 +2309,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 					replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle);
 				}
 			}
-			
+
 			_Tags = STRING_MANAGER::CStringManagerClient::getTitleInfos(_TitleRaw, womanTitle);
 
 			if (!replacement.empty() || !ClientCfg.DebugStringManager)
@@ -2949,7 +2950,7 @@ void CEntityCL::dataSetId(CLFECOMMON::TClientDataSetIndex dataSet)
 {
 	_DataSetId = dataSet;
 
-	if (_Primitive &&  _Primitive->UserData == UserDataEntity)
+	if (_Primitive && _Primitive->UserData == UserDataEntity)
 		_Primitive->UserData |= (((uint64)_DataSetId)<<16);
 
 	// additionaly, on a UID change, must check the IsInTeam and IsAniml flags
diff --git a/code/ryzom/client/src/events_listener.cpp b/code/ryzom/client/src/events_listener.cpp
index 89963a2ab..760a5dc08 100644
--- a/code/ryzom/client/src/events_listener.cpp
+++ b/code/ryzom/client/src/events_listener.cpp
@@ -184,8 +184,8 @@ void CEventsListener::operator()(const CEvent& event)
 			}
 
 			// NOTE: No 0, 0 center mouse message in Windows (lower mouse message rate), but safe to assume any movement messages are requeued relative to our new position
-			// In case free look bugs on other platform, we may need to push in our own message on setMousePos for Windows
-			if (s_MouseFreeLookWaitCenter) // scX == 0 && scY == 0)
+			bool outsideBounds = ((abs(scX) > (drW >> 3)) || (abs(scY) > (drH >> 3)));
+			if (s_MouseFreeLookWaitCenter && !outsideBounds)
 			{
 				// Centered, set last to 0
 				s_MouseFreeLookLastX = 0;
@@ -204,8 +204,7 @@ void CEventsListener::operator()(const CEvent& event)
 			// updateFreeLookPos is called in updateMouseSmoothing per frame
 
 			// Center cursor
-			bool outsideBounds = ((abs(scX) > (drW >> 3)) || (abs(scY) > (drH >> 3)));
-			if (outsideBounds)
+			if (outsideBounds && !s_MouseFreeLookWaitCenter)
 			{
 				s_MouseFreeLookWaitCenter = true;
 				Driver->setMousePos(0.5f, 0.5f);
diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp
index 4f48d2ff5..5b9b0c836 100644
--- a/code/ryzom/client/src/far_tp.cpp
+++ b/code/ryzom/client/src/far_tp.cpp
@@ -188,7 +188,6 @@ const std::string& CLoginStateMachine::toString(CLoginStateMachine::TEvent event
 			_CurrentState = stateId;	\
 			break;						\
 		}								\
-		
 
 extern std::string LoginLogin, LoginPassword;
 extern bool noUserChar;
diff --git a/code/ryzom/client/src/graph.cpp b/code/ryzom/client/src/graph.cpp
index 1bf370db0..8270762fb 100644
--- a/code/ryzom/client/src/graph.cpp
+++ b/code/ryzom/client/src/graph.cpp
@@ -134,6 +134,7 @@ void CGraph::renderGraph ()
 	if (TextContext != NULL)
 	{
 		TextContext->setShaded (false);
+		TextContext->setShadeOutline(false);
 		TextContext->setHotSpot (UTextContext::MiddleLeft);
 		TextContext->setColor (frontCol);
 		TextContext->setFontSize (10);
diff --git a/code/ryzom/client/src/ground_fx_manager.cpp b/code/ryzom/client/src/ground_fx_manager.cpp
index dc064415f..f13309183 100644
--- a/code/ryzom/client/src/ground_fx_manager.cpp
+++ b/code/ryzom/client/src/ground_fx_manager.cpp
@@ -807,6 +807,7 @@ void CTestGroundFX::displayFXBoxes() const
 	Driver->setFrustum(fr);
 	TextContext->setColor(CRGBA::Green);
 	TextContext->setShaded(false);
+	TextContext->setShadeOutline(false);
 	TextContext->setFontSize(12);
 	//
 	float size = 0.4f;
diff --git a/code/ryzom/client/src/hair_set.cpp b/code/ryzom/client/src/hair_set.cpp
index d82733162..5d44e2857 100644
--- a/code/ryzom/client/src/hair_set.cpp
+++ b/code/ryzom/client/src/hair_set.cpp
@@ -45,20 +45,20 @@ void CHairSet::init (NLMISC::IProgressCallback &progress)
 		progress.progress ((float)k/(float)numHairItem);
 
 		const CItemSheet *item = SheetMngr.getItem(SLOTTYPE::HEAD_SLOT, k);
-		if( (item) && (!item->getShape().empty()) )
+		if (item && !item->getShape().empty())
 		{
-			std::string itemName = NLMISC::toLower(item->getShape());
-
 			if (item->getShape().find("cheveux", 0) != std::string::npos)
 			{
 				// get race
-				uint16 race = (uint16) itemName[1] | ((uint16) itemName[0] << 8);
-				switch(race)
+				std::string itemName = NLMISC::toLower(item->getShape());
+
+				// fortunately, first character of each race is distinct
+				switch(itemName[0])
 				{
-					case 'ma': _Hairs[Matis].push_back(k); break;
-					case 'tr': _Hairs[Tryker].push_back(k); break;
-					case 'zo': _Hairs[Zorai].push_back(k); break;
-					case 'fy': _Hairs[Fyros].push_back(k); break;
+					case 'm': _Hairs[Matis].push_back(k); break;
+					case 't': _Hairs[Tryker].push_back(k); break;
+					case 'z': _Hairs[Zorai].push_back(k); break;
+					case 'f': _Hairs[Fyros].push_back(k); break;
 				}
 			}
 		}
diff --git a/code/ryzom/client/src/http_client_curl.cpp b/code/ryzom/client/src/http_client_curl.cpp
index db830a9df..008bef19a 100644
--- a/code/ryzom/client/src/http_client_curl.cpp
+++ b/code/ryzom/client/src/http_client_curl.cpp
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdpch.h"
-#define CURL_STATICLIB 1
 #include <curl/curl.h>
 #include "http_client_curl.h"
 
diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp
index 1644f7e2d..5484141a2 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -142,7 +142,6 @@ using namespace std;
 // Ligo primitive class
 CLigoConfig				LigoConfig;
 
-CMsgBoxDisplayer		MsgBoxError;
 CClientChatManager		ChatMngr;
 
 bool					LastScreenSaverEnabled = false;
@@ -554,27 +553,6 @@ void checkDriverDepth ()
 	}
 }
 
-static std::string replaceApplicationDirToken(const std::string &dir)
-{
-
-#ifdef NL_OS_MAC
-	// if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory
-	if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/')
-	{
-		return getAppBundlePath() + "/Contents/Resources/" + dir;
-	}
-#else
-	static const std::string token = "<ApplicationDir>";
-	std::string::size_type pos = dir.find(token);
-	if (pos != std::string::npos)
-		return dir.substr(0, pos) + getAppBundlePath() + dir.substr(pos + token.length());
-#endif
-
-//	preDataPath = getAppBundlePath() + "/Contents/Resources/" + preDataPath;
-
-	return dir;
-}
-
 void listStereoDisplayDevices(std::vector<NL3D::CStereoDeviceInfo> &devices)
 {
 	bool cache = VRDeviceCache.empty();
@@ -589,7 +567,7 @@ void listStereoDisplayDevices(std::vector<NL3D::CStereoDeviceInfo> &devices)
 		std::stringstream name;
 		name << IStereoDisplay::getLibraryName(it->Library) << " - " << it->Manufacturer << " - " << it->ProductName;
 		std::stringstream fullname;
-		fullname << std::string("[") << name << "] [" << it->Serial << "]";
+		fullname << std::string("[") << name.str() << "] [" << it->Serial << "]";
 		nlinfo("VR [C]: Stereo Display: %s", name.str().c_str());
 		if (cache)
 		{
@@ -678,39 +656,94 @@ void addSearchPaths(IProgressCallback &progress)
 			progress.progress ((float)i/(float)ClientCfg.DataPath.size());
 			progress.pushCropedValues ((float)i/(float)ClientCfg.DataPath.size(), (float)(i+1)/(float)ClientCfg.DataPath.size());
 
-			CPath::addSearchPath(replaceApplicationDirToken(ClientCfg.DataPath[i]), true, false, &progress);
+			CPath::addSearchPath(ClientCfg.DataPath[i], true, false, &progress);
 
 			progress.popCropedValues ();
 		}
 
 		CPath::loadRemappedFiles("remap_files.csv");
 	}
+
 	for (uint i = 0; i < ClientCfg.DataPathNoRecurse.size(); i++)
 	{
 		progress.progress ((float)i/(float)ClientCfg.DataPathNoRecurse.size());
 		progress.pushCropedValues ((float)i/(float)ClientCfg.DataPathNoRecurse.size(), (float)(i+1)/(float)ClientCfg.DataPathNoRecurse.size());
 
-		CPath::addSearchPath(replaceApplicationDirToken(ClientCfg.DataPathNoRecurse[i]), false, false, &progress);
+		CPath::addSearchPath(ClientCfg.DataPathNoRecurse[i], false, false, &progress);
 
 		progress.popCropedValues ();
 	}
-}
 
+	std::string defaultDirectory;
+
+#ifdef NL_OS_MAC
+	defaultDirectory = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources");
+#elif defined(NL_OS_UNIX) && defined(RYZOM_SHARE_PREFIX)
+	defaultDirectory = CPath::standardizePath(std::string(RYZOM_SHARE_PREFIX));
+#endif
+
+	// add in last position, a specific possibly read only directory
+	if (!defaultDirectory.empty())
+	{
+		for (uint i = 0; i < ClientCfg.DataPath.size(); i++)
+		{
+			// don't prepend default directory if path is absolute
+			if (!ClientCfg.DataPath[i].empty() && ClientCfg.DataPath[i][0] != '/')
+			{
+				progress.progress ((float)i/(float)ClientCfg.DataPath.size());
+				progress.pushCropedValues ((float)i/(float)ClientCfg.DataPath.size(), (float)(i+1)/(float)ClientCfg.DataPath.size());
+
+				CPath::addSearchPath(defaultDirectory + ClientCfg.DataPath[i], true, false, &progress);
+
+				progress.popCropedValues ();
+			}
+		}
+	}
+}
 
 void addPreDataPaths(NLMISC::IProgressCallback &progress)
 {
 	NLMISC::TTime initPaths = ryzomGetLocalTime ();
-	H_AUTO(InitRZAddSearchPaths)
+
+	H_AUTO(InitRZAddSearchPaths);
+
 	for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++)
 	{
 		progress.progress ((float)i/(float)ClientCfg.PreDataPath.size());
 		progress.pushCropedValues ((float)i/(float)ClientCfg.PreDataPath.size(), (float)(i+1)/(float)ClientCfg.PreDataPath.size());
 
-		CPath::addSearchPath(replaceApplicationDirToken(ClientCfg.PreDataPath[i]), true, false, &progress);
+		CPath::addSearchPath(ClientCfg.PreDataPath[i], true, false, &progress);
 
 		progress.popCropedValues ();
 	}
+
 	//nlinfo ("PROFILE: %d seconds for Add search paths Predata", (uint32)(ryzomGetLocalTime ()-initPaths)/1000);
+
+	std::string defaultDirectory;
+
+#ifdef NL_OS_MAC
+	defaultDirectory = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources");
+#elif defined(NL_OS_UNIX) && defined(RYZOM_SHARE_PREFIX)
+	defaultDirectory = CPath::standardizePath(std::string(RYZOM_SHARE_PREFIX));
+#endif
+
+	// add in last position, a specific possibly read only directory
+	if (!defaultDirectory.empty())
+	{
+		for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++)
+		{
+			// don't prepend default directory if path is absolute
+			if (!ClientCfg.PreDataPath[i].empty() && ClientCfg.PreDataPath[i][0] != '/')
+			{
+				progress.progress ((float)i/(float)ClientCfg.PreDataPath.size());
+				progress.pushCropedValues ((float)i/(float)ClientCfg.PreDataPath.size(), (float)(i+1)/(float)ClientCfg.PreDataPath.size());
+
+				CPath::addSearchPath(defaultDirectory + ClientCfg.PreDataPath[i], true, false, &progress);
+
+				progress.popCropedValues ();
+			}
+		}
+	}
 }
 
 static void addPackedSheetUpdatePaths(NLMISC::IProgressCallback &progress)
@@ -719,7 +752,7 @@ static void addPackedSheetUpdatePaths(NLMISC::IProgressCallback &progress)
 	{
 		progress.progress((float)i/(float)ClientCfg.UpdatePackedSheetPath.size());
 		progress.pushCropedValues ((float)i/(float)ClientCfg.UpdatePackedSheetPath.size(), (float)(i+1)/(float)ClientCfg.UpdatePackedSheetPath.size());
-		CPath::addSearchPath(replaceApplicationDirToken(ClientCfg.UpdatePackedSheetPath[i]), true, false, &progress);
+		CPath::addSearchPath(ClientCfg.UpdatePackedSheetPath[i], true, false, &progress);
 		progress.popCropedValues();
 	}
 }
@@ -754,12 +787,12 @@ void prelogInit()
 #ifdef NL_OS_WINDOWS
 		_control87 (_EM_INVALID|_EM_DENORMAL/*|_EM_ZERODIVIDE|_EM_OVERFLOW*/|_EM_UNDERFLOW|_EM_INEXACT, _MCW_EM);
 #endif // NL_OS_WINDOWS
-		
+
 		CTime::CTimerInfo timerInfo;
 		NLMISC::CTime::probeTimerInfo(timerInfo);
 		if (timerInfo.RequiresSingleCore) // TODO: Also have a FV configuration value to force single core.
 			setCPUMask();
-		
+
 		FPU_CHECKER_ONCE
 
 		NLMISC::TTime initStart = ryzomGetLocalTime ();
@@ -896,7 +929,6 @@ void prelogInit()
 		switch(ClientCfg.Driver3D)
 		{
 #ifdef NL_OS_WINDOWS
-
 			case CClientConfig::Direct3D:
 				driver = UDriver::Direct3d;
 			break;
@@ -949,7 +981,7 @@ void prelogInit()
 			Driver->setSwapVBLInterval(1);
 		else
 			Driver->setSwapVBLInterval(0);
-		
+
 		if (StereoDisplay) // VR_CONFIG // VR_DRIVER
 		{
 			// override mode TODO
@@ -1077,7 +1109,7 @@ void prelogInit()
 
 		// Set the monitor color properties
 		CMonitorColorProperties monitorColor;
-		for ( uint i=0; i<3; i++)
+		for (uint i=0; i<3; i++)
 		{
 			monitorColor.Contrast[i] = ClientCfg.Contrast;
 			monitorColor.Luminosity[i] = ClientCfg.Luminosity;
diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
index 63d2c93b7..b76bbce21 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -1950,13 +1950,14 @@ public:
 						womanTitle = pChar->getGender() == GSGENDER::female;
 					
 					STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
-					
+
 					// Sometimes translation contains another title
 					ucstring::size_type pos = copyInout.find('$');
 					if (pos != ucstring::npos)
 					{
 						copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
 					}
+
 					CStringPostProcessRemoveTitle::cbIDStringReceived(copyInout);
 					inout = copyInout;
 				}
diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.cpp b/code/ryzom/client/src/interface_v3/action_handler_help.cpp
index e519bb2d0..ed2b34ce3 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -1117,6 +1117,11 @@ class CHandlerHTMLSubmitForm : public IActionHandler
 		fromString(getParam (sParams, "form"), form);
 
 		string submit_button = getParam (sParams, "submit_button");
+		string type = getParam (sParams, "submit_button_type");
+		string value = getParam (sParams, "submit_button_value");
+
+		sint32 x = pCaller->getEventX();
+		sint32 y = pCaller->getEventY();
 
 		CInterfaceElement *element = CWidgetManager::getInstance()->getElementFromId(container);
 		{
@@ -1125,7 +1130,7 @@ class CHandlerHTMLSubmitForm : public IActionHandler
 			if (groupHtml)
 			{
 				// Submit the form the url
-				groupHtml->submitForm (form, submit_button.c_str ());
+				groupHtml->submitForm (form, type.c_str(), submit_button.c_str(), value.c_str(), x, y);
 			}
 		}
 	}
@@ -3613,7 +3618,7 @@ public:
 		uint8 index;
 		fromString(Params, index);
 		--index; // Param is 1-based so subtract 1
-		if ( index >= MAX_INVENTORY_ANIMAL)
+		if (index >= MAX_INVENTORY_ANIMAL)
 		{
 			return;
 		}
diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.cpp b/code/ryzom/client/src/interface_v3/action_handler_item.cpp
index 24f59cecc..f6dec2d1f 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -815,7 +815,6 @@ public:
 		CurrentStackDst= NULL;
 		validateStackItem(pCSSrc, pCSDst, val, CurrentStackMode);
 	}
-
 };
 REGISTER_ACTION_HANDLER( CHandlerStackOk, "stack_item");
 
@@ -826,17 +825,17 @@ class CPlayerTradePutBagItemToExchange : public IActionHandler
 public:
 	virtual void execute (CCtrlBase *pCaller, const string &/* Params */)
 	{
-			CInterfaceManager *im = CInterfaceManager::getInstance();
-			CDBCtrlSheet *src = dynamic_cast<CDBCtrlSheet *>(pCaller);
-			CDBCtrlSheet *dest = dynamic_cast<CDBCtrlSheet *>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
-			if (src->getSheetId() == 0)
-			{
-				putExchangedItemToInventory(dest);
-			}
-			else
-			{
-				putInventoryItemToExchange(src, dest);
-			}
+		CInterfaceManager *im = CInterfaceManager::getInstance();
+		CDBCtrlSheet *src = dynamic_cast<CDBCtrlSheet *>(pCaller);
+		CDBCtrlSheet *dest = dynamic_cast<CDBCtrlSheet *>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
+		if (src->getSheetId() == 0)
+		{
+			putExchangedItemToInventory(dest);
+		}
+		else
+		{
+			putInventoryItemToExchange(src, dest);
+		}
 	}
 };
 REGISTER_ACTION_HANDLER(CPlayerTradePutBagItemToExchange, "put_bag_item_to_exchange");
diff --git a/code/ryzom/client/src/interface_v3/action_handler_misc.cpp b/code/ryzom/client/src/interface_v3/action_handler_misc.cpp
index 688c27635..4e8966e16 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -520,7 +520,7 @@ CCameraBackup setupCameraForScreenshot(UScene &scene, uint left, uint right, uin
 	// Build a viewport
 	CViewport viewport;
 	NL3D::UDriver *Driver = CViewRenderer::getInstance()->getDriver();
-	viewport.init (0, 0, (float)(right-left)/Driver->getWindowWidth(),(float)(bottom-top)/Driver->getWindowHeight());
+	viewport.init (0, 0, (float)(right-left)/Driver->getWindowWidth(), (float)(bottom-top)/Driver->getWindowHeight());
 
 	// Activate all this
 	scene.getCam().setFrustum (frustumPart);
diff --git a/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index efd19fe45..67f798cb8 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -777,7 +777,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 	sint32 dstPhraseId= pCSDst->getSPhraseId();
 	sint32 dstMacroId= pCSDst->getMacroId();
 
-	if ((src.empty()) && (CHandlerPhraseMemoryCopy::haveLastPhraseElement))
+	if (src.empty() && (CHandlerPhraseMemoryCopy::haveLastPhraseElement))
 	{		
 		// get the slot ids from save
 		srcIsMacro= CHandlerPhraseMemoryCopy::isMacro;
@@ -1600,7 +1600,6 @@ public:
 		}
 	}
 };
-
 REGISTER_ACTION_HANDLER(CHandlerPhraseSelectMemory2, "phrase_select_memory_2");
 
 // ***************************************************************************
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
index bb16353f5..caa90cdda 100644
--- a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
+++ b/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
@@ -53,7 +53,6 @@ void CBotChatPageMission::init()
 		NLGUI::CDBManager::getInstance()->addBranchObserver("SERVER:CHOOSE_MISSIONS", &_MissionPagesObs);
 }
 
-
 // ***************************************************************************************
 void CBotChatPageMission::begin()
 {
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 17aaead48..966a3886a 100644
--- a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -1808,7 +1808,6 @@ void	CBotChatPageTrade::giveFocusToMaxEBChangeBuyFilterDialog()
 	setFocusOnEditBox(ig->getGroup("edit_max:eb"));
 }
 
-
 // ***************************************************************************
 void		CBotChatPageTrade::startChangeBuyFilterMPDialog()
 {
@@ -1822,7 +1821,6 @@ void		CBotChatPageTrade::startChangeBuyFilterMPDialog()
 	CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
 }
 
-
 // ***************************************************************************
 void		CBotChatPageTrade::confirmChangeBuyFilterMPDialog(uint ft)
 {
@@ -1840,7 +1838,6 @@ void		CBotChatPageTrade::confirmChangeBuyFilterMPDialog(uint ft)
 	CWidgetManager::getInstance()->disableModalWindow();
 }
 
-
 // ***************************************************************************
 void	CBotChatPageTrade::resetItemPartAndTypeFilters()
 {
diff --git a/code/ryzom/client/src/interface_v3/character_3d.cpp b/code/ryzom/client/src/interface_v3/character_3d.cpp
index c76407f11..f711fb764 100644
--- a/code/ryzom/client/src/interface_v3/character_3d.cpp
+++ b/code/ryzom/client/src/interface_v3/character_3d.cpp
@@ -797,7 +797,7 @@ void CCharacter3D::setup (const SCharacter3DSetup &c3ds)
 		}
 
 		// Instance skin color
-		if (c3ds.People != -1)
+		if (c3ds.People != EGSPD::CPeople::Undefined)
 		if ((c3ds.People != _CurrentSetup.People) || bInstanceRebuilt || bQualityRebuilt)
 		{
 			if (!_Instances[i].empty())
diff --git a/code/ryzom/client/src/interface_v3/chat_displayer.h b/code/ryzom/client/src/interface_v3/chat_displayer.h
index e84179f94..e2afc7207 100644
--- a/code/ryzom/client/src/interface_v3/chat_displayer.h
+++ b/code/ryzom/client/src/interface_v3/chat_displayer.h
@@ -30,7 +30,6 @@
 #undef LOG_WARNING
 #endif
 
-
 /**
  * class used to display console text commands in the chat window
  * \author Nicolas Brigand
diff --git a/code/ryzom/client/src/interface_v3/chat_text_manager.cpp b/code/ryzom/client/src/interface_v3/chat_text_manager.cpp
index 10fd2d29c..83ef7474e 100644
--- a/code/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -47,7 +47,6 @@ CChatTextManager::~CChatTextManager()
 	_TextShadowed = NULL;
 	delete _ShowTimestamps;
 	_ShowTimestamps = NULL;
-
 }
 //=================================================================================
 uint CChatTextManager::getTextFontSize() const
@@ -96,6 +95,7 @@ bool CChatTextManager::showTimestamps() const
 	}
 	return _ShowTimestamps->getValueBool();
 }
+
 //=================================================================================
 static CInterfaceGroup *parseCommandTag(ucstring &line)
 {
@@ -157,6 +157,7 @@ CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA
 	CViewText *vt = new CViewText(CViewText::TCtorParam());
 	// get parameters from config.xml
 	vt->setShadow(isTextShadowed());
+	vt->setShadowOutline(false);
 	vt->setFontSize(getTextFontSize());
 	vt->setMultiLine(true);
 	vt->setTextMode(justified ? CViewText::Justified : CViewText::DontClipWord);
@@ -185,7 +186,6 @@ CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA
 			msg = cur_time + msg;
 		}
 		
-
 		vt->setTextFormatTaged(msg);
 		vt->setColor(NLMISC::CRGBA::White);
 	}
diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp
index e74392432..0bb192fc5 100644
--- a/code/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_window.cpp
@@ -483,7 +483,7 @@ void CChatWindow::displayLocalPlayerTell(const ucstring &receiver, const ucstrin
 	strFindReplace(s, "%name", receiver);
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
 	displayMessage(finalMsg, prop.getRGBA(), CChatGroup::tell, 0, numBlinks);
-	CInterfaceManager::getInstance()->log(finalMsg);
+	CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
 }
 
 void CChatWindow::encodeColorTag(const NLMISC::CRGBA &color, ucstring &text, bool append)
@@ -601,10 +601,14 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 					if (pos == ucstring::npos || (colonpos < pos))
 					{
 						// No timestamp, so put it right after the color and add a space
-						pos = newmsg.find(ucstring("}"));;
+						pos = newmsg.find(ucstring("}"));
 						prefix += " ";
 					}
-					newmsg = newmsg.substr(0, pos + 1) + prefix + newmsg.substr(pos + 1);
+					
+					if (pos == ucstring::npos)
+						newmsg = prefix + newmsg;
+					else
+						newmsg = newmsg.substr(0, pos + 1) + prefix + newmsg.substr(pos + 1);
 
 					// Add dynchannel number and optionally name before text if user channel
 					CCDBNodeLeaf* node = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB", false);
@@ -615,7 +619,11 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
 						prefix = title.empty() ? ucstring("") : ucstring(" ") + title;
 						pos = newmsg.find(ucstring("] "));
-						newmsg = newmsg.substr(0, pos) + prefix + newmsg.substr(pos);
+
+						if (pos == ucstring::npos)
+							newmsg = prefix + newmsg;
+						else
+							newmsg = newmsg.substr(0, pos) + prefix + newmsg.substr(pos);
 					}
 				}
 				break;
diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 293582f52..d72a975f3 100644
--- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -333,29 +333,29 @@ bool CCtrlSheetInfo::parseCtrlInfo(xmlNodePtr cur, CInterfaceGroup * /* parentGr
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"nature" );
 	if (prop)
 	{
-		if (NLMISC::strlwr(prop) == "item")
+		if (NLMISC::strlwr(prop.str()) == "item")
 			_Type = CCtrlSheetInfo::SheetType_Item;
-		else if (NLMISC::strlwr(prop) == "pact")
+		else if (NLMISC::strlwr(prop.str()) == "pact")
 			_Type = CCtrlSheetInfo::SheetType_Pact;
-		else if (NLMISC::strlwr(prop) == "skill")
+		else if (NLMISC::strlwr(prop.str()) == "skill")
 			_Type = CCtrlSheetInfo::SheetType_Skill;
-		else if (NLMISC::strlwr(prop) == "auto")
+		else if (NLMISC::strlwr(prop.str()) == "auto")
 			_Type = CCtrlSheetInfo::SheetType_Auto;
-		else if (NLMISC::strlwr(prop) == "macro")
+		else if (NLMISC::strlwr(prop.str()) == "macro")
 			_Type = CCtrlSheetInfo::SheetType_Macro;
-		else if (NLMISC::strlwr(prop) == "guild_flag")
+		else if (NLMISC::strlwr(prop.str()) == "guild_flag")
 			_Type = CCtrlSheetInfo::SheetType_GuildFlag;
-		else if (NLMISC::strlwr(prop) == "mission")
+		else if (NLMISC::strlwr(prop.str()) == "mission")
 			_Type = CCtrlSheetInfo::SheetType_Mission;
-		else if (NLMISC::strlwr(prop) == "sbrick")
+		else if (NLMISC::strlwr(prop.str()) == "sbrick")
 			_Type = CCtrlSheetInfo::SheetType_SBrick;
-		else if (NLMISC::strlwr(prop) == "sphraseid")
+		else if (NLMISC::strlwr(prop.str()) == "sphraseid")
 			_Type = CCtrlSheetInfo::SheetType_SPhraseId;
-		else if (NLMISC::strlwr(prop) == "sphrase")
+		else if (NLMISC::strlwr(prop.str()) == "sphrase")
 			_Type = CCtrlSheetInfo::SheetType_SPhrase;
-		else if (NLMISC::strlwr(prop) == "elevator_destination")
+		else if (NLMISC::strlwr(prop.str()) == "elevator_destination")
 			_Type = CCtrlSheetInfo::SheetType_ElevatorDestination;
-		else if (NLMISC::strlwr(prop) == "outpost_building")
+		else if (NLMISC::strlwr(prop.str()) == "outpost_building")
 			_Type = CCtrlSheetInfo::SheetType_OutpostBuilding;
 	}
 
@@ -456,7 +456,7 @@ bool CCtrlSheetInfo::parseCtrlInfo(xmlNodePtr cur, CInterfaceGroup * /* parentGr
 			else
 			{
 				// must not have so much brick type, else must change code!
-				nlassert(brickType<32);
+				// nlassert(brickType<32);
 
 				// Ok set the bit associated
 				_BrickTypeBitField|= 1<<brickType;
@@ -1741,7 +1741,6 @@ void CDBCtrlSheet::resetCharBitmaps()
 	_CharBitmaps.clear();
 }
 
-
 // ***************************************************************************
 void CDBCtrlSheet::setupCharBitmaps(sint32 maxW, sint32 maxLine, sint32 maxWChar, bool topDown)
 {
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
index 74bd2be47..2966e65b4 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
@@ -115,7 +115,7 @@ bool CDBGroupListSheet::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 	if (prop)
 	{
 		// get a branch in the database.
-		CCDBNodeBranch *branch= NLGUI::CDBManager::getInstance()->getDbBranch(prop);
+		CCDBNodeBranch *branch = NLGUI::CDBManager::getInstance()->getDbBranch(prop.str());
 		if(!branch)
 		{
 			nlinfo ("Branch not found in the database %s", (const char*)prop);
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
index a05d1e4aa..2294d3926 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
@@ -98,7 +98,7 @@ bool CDBGroupListSheetText::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 	if (prop)
 	{
 		// get a branch in the database.
-		CCDBNodeBranch *branch= NLGUI::CDBManager::getInstance()->getDbBranch(prop);
+		CCDBNodeBranch *branch = NLGUI::CDBManager::getInstance()->getDbBranch(prop.str());
 		if(!branch)
 		{
 			nlinfo ("Branch not found in the database %s", (const char*)prop);
@@ -880,6 +880,7 @@ void CDBGroupListSheetText::setup()
 		text->setFontSize(_TextTemplate.getFontSize());
 		text->setColor(_TextTemplate.getColor());
 		text->setShadow(_TextTemplate.getShadow());
+		text->setShadowOutline(_TextTemplate.getShadowOutline());
 		text->setLineMaxW(_TextTemplate.getLineMaxW());
 		text->setMultiLine(_TextTemplate.getMultiLine());
 		if(text->getMultiLine())
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
index 67079ba55..c67e69660 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
@@ -95,6 +95,7 @@ void CDBGroupListSheetTextBrickComposition::CSheetChildBrick::init(CDBGroupListS
 	text->setFontSize(compoList->getTextTemplate().getFontSize());
 	text->setColor(compoList->getTextTemplate().getColor());
 	text->setShadow(compoList->getTextTemplate().getShadow());
+	text->setShadowOutline(compoList->getTextTemplate().getShadowOutline());
 	text->setMultiLine(false);
 	text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
 
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp
index 35cd90a7e..112ec3e9e 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp
@@ -121,6 +121,7 @@ void CDBGroupListSheetTextShare::CSheetChildShare::init(CDBGroupListSheetText *p
 	text->setFontSize(compoList->getTextTemplate().getFontSize());
 	text->setColor(compoList->getTextTemplate().getColor());
 	text->setShadow(compoList->getTextTemplate().getShadow());
+	text->setShadowOutline(compoList->getTextTemplate().getShadowOutline());
 	text->setMultiLine(false);
 	text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
 	// Add it to the scrolled list.
@@ -139,6 +140,7 @@ void CDBGroupListSheetTextShare::CSheetChildShare::init(CDBGroupListSheetText *p
 	text->setFontSize(compoList->getTextTemplate().getFontSize());
 	text->setColor(compoList->getTextTemplate().getColor());
 	text->setShadow(compoList->getTextTemplate().getShadow());
+	text->setShadowOutline(compoList->getTextTemplate().getShadowOutline());
 	text->setMultiLine(false);
 	text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
 	// Add it to the scrolled list.
@@ -173,7 +175,6 @@ void CDBGroupListSheetTextShare::CSheetChildShare::init(CDBGroupListSheetText *p
 	pNL = NLGUI::CDBManager::getInstance()->getDbProp(sTmp, false);
 	nlassert(pNL != NULL);
 	CurrentWanted.link ( sTmp.c_str() );
-
 }
 
 
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index 0028ad964..d4fc5da86 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -728,7 +728,6 @@ void CDBGroupListSheetTrade::sort()
 	}
 }
 
-
 bool CDBGroupListSheetTrade::needCheckAllItems()
 {
 	if (_LastFamePriceFactor != _FamePriceFactorLeaf->getValue16())
diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.cpp b/code/ryzom/client/src/interface_v3/group_html_webig.cpp
index 8ffa25878..680a26273 100644
--- a/code/ryzom/client/src/interface_v3/group_html_webig.cpp
+++ b/code/ryzom/client/src/interface_v3/group_html_webig.cpp
@@ -22,6 +22,7 @@
 #include "../user_entity.h"
 #include "../entities.h"
 #include "interface_manager.h"
+#include "user_agent.h"
 
 // used for login cookie to be sent to the web server
 #include "../net_manager.h"
@@ -157,7 +158,7 @@ struct CWebigNotificationThread : public NLMISC::IRunnable
 		if(!Curl) return;
 		curl_easy_setopt(Curl, CURLOPT_COOKIEFILE, "");
 		curl_easy_setopt(Curl, CURLOPT_NOPROGRESS, 1);
-		curl_easy_setopt(Curl, CURLOPT_USERAGENT, "Ryzom");
+		curl_easy_setopt(Curl, CURLOPT_USERAGENT, getUserAgent().c_str());
 		curl_easy_setopt(Curl, CURLOPT_FOLLOWLOCATION, 1);
 		curl_easy_setopt(Curl, CURLOPT_WRITEFUNCTION, writeDataFromCurl);
 		//nlinfo("ctor CWebigNotificationThread");
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index 76d97c519..53cddc93b 100644
--- a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -198,7 +198,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 	ucstring theTribeName;
 	ucstring entityName = entity->getDisplayName();
 	ucstring entityTitle = entity->getTitle();
-	
+
 	// For some NPC's the name is empty and only a title is given,
 	// in that case, treat the title as the name.
 	if (entityName.empty())
@@ -652,7 +652,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 				if (pPlayer == NULL)
 					needPvPLogo = false;
 
-
 				if (pPlayer != NULL && needPvPLogo)
 				{
 					if (pvpFactionLogo) 
@@ -756,7 +755,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 				view = leftGroup->getView ("win_jauge_bot");
 				if (view)
 					leftGroup->delView (view);
-
 			}
 
 			// Delete remaining strings
@@ -771,8 +769,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 			CViewBase *win_mid = leftGroup->getView ("win_mid");
 			if (win_mid)
 			{
-				win_mid->setH (win_mid->getH() - spaceBar/2 );
-
+				win_mid->setH (win_mid->getH() - spaceBar/2);
 			}
 
 			// Set player name
@@ -963,7 +960,7 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 
 		if (pPlayer != NULL)
 			if (pPlayer->isAFK())
-				entityName += CI18N::get("uiAFK");				
+				entityName += CI18N::get("uiAFK");
 		_Name->setText(entityName);
 
 		// Title color get the PVP color
diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/code/ryzom/client/src/interface_v3/group_map.cpp
index 31d70d0d7..371673a00 100644
--- a/code/ryzom/client/src/interface_v3/group_map.cpp
+++ b/code/ryzom/client/src/interface_v3/group_map.cpp
@@ -2333,6 +2333,7 @@ void CGroupMap::createLMWidgets(const std::vector<CContLandMark> &lms)
 
 			pNewText->setColor(CRGBA(255,255,255,255));
 			pNewText->setShadow(true);
+			pNewText->setShadowOutline(false);
 			pNewText->setShadowColor(CRGBA(0,0,0,255));
 			pNewText->setModulateGlobalColor(false);
 			pNewText->Type = rCLM.Type;
@@ -3212,7 +3213,7 @@ class CAHValidateUserLandMarkName : public IActionHandler
 		CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(ig->getGroup("eb"));
 		if (!eb) return;
 		ig->setActive(false);
-		
+
 		CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(WIN_LANDMARK_NAME));
 		if (!gc) return;
 		// Retrieve ComboBox to get the position(ordered landmark type) of the selected item
diff --git a/code/ryzom/client/src/interface_v3/group_skills.cpp b/code/ryzom/client/src/interface_v3/group_skills.cpp
index e414ab4e4..b5e5c5d34 100644
--- a/code/ryzom/client/src/interface_v3/group_skills.cpp
+++ b/code/ryzom/client/src/interface_v3/group_skills.cpp
@@ -87,7 +87,7 @@ bool CGroupSkills::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 
 	string sTmp;
 	ICDBNode::CTextId textId;
-	
+
 	for (uint k = 0; k < SKILLS::NUM_SKILLS; ++k)
 	{
 		sTmp = string(DB_SKILLS)+":"+NLMISC::toString((sint32)k)+":BaseSKILL";
diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp
index 9edf86c56..2e0e4e3e7 100644
--- a/code/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -378,13 +378,13 @@ void CGuildManager::update()
 							// Online status not changed for this member
 							continue;
 						}
-						
+
 						if ( (*it).second.Online != ccs_offline && _GuildMembers[i].Online != ccs_offline)
 						{
 							// Not from offline, or to offline, so don't show anything
 							continue;
 						}
-						
+
 						ucstring msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
 						strFindReplace(msg, "%s", _GuildMembers[i].Name);
 						string cat = getStringCategory(msg, msg);
@@ -398,7 +398,6 @@ void CGuildManager::update()
 						bool dummy;
 						PeopleInterraction.ChatInput.Guild.displayMessage(msg, col, 2, &dummy);
 						break;
-
 					}
 				}
 
diff --git a/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp b/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp
index 0d51a538e..6acc2a17b 100644
--- a/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp
@@ -162,13 +162,13 @@ bool CInterface3DScene::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 	_Ref3DScene = NULL;
 	if (ptr)
 	{
-		CInterfaceElement *pIE = CWidgetManager::getInstance()->getElementFromId(this->getId(), ptr);
+		CInterfaceElement *pIE = CWidgetManager::getInstance()->getElementFromId(this->getId(), ptr.str());
 		_Ref3DScene = dynamic_cast<CInterface3DScene*>(pIE);
 	}
 	if (_Ref3DScene != NULL)
 	{
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"curcam" );
-		if (ptr) setCurrentCamera (ptr);
+		if (ptr) setCurrentCamera (ptr.str());
 		return true;
 	}
 
@@ -294,7 +294,7 @@ bool CInterface3DScene::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 			CXMLAutoPtr ptr((const char*)xmlGetProp (cur, (xmlChar*)"name"));
 			string animName;
 			if (ptr)
-				animName = strlwr (CFile::getFilenameWithoutExtension(ptr));
+				animName = strlwr (CFile::getFilenameWithoutExtension(ptr.str()));
 
 			if (!animName.empty())
 			{
@@ -340,7 +340,7 @@ bool CInterface3DScene::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 
 	// Get the current camera
 	ptr = (char*) xmlGetProp( cur, (xmlChar*)"curcam" );
-	if (ptr) setCurrentCamera (ptr);
+	if (ptr) setCurrentCamera(ptr.str());
 
 	return true;
 }
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index b89566ecd..70be8abe4 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -467,8 +467,8 @@ CInterfaceManager::CInterfaceManager()
 
 	CGroupHTML::options.trustedDomains = ClientCfg.WebIgTrustedDomains;
 	CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
-	CGroupHTML::options.appName = "Ryzom";
-	CGroupHTML::options.appVersion = getUserAgent();
+	CGroupHTML::options.appName = getUserAgentName();
+	CGroupHTML::options.appVersion = getUserAgentVersion();
 
 	NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
 	interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();
@@ -2684,7 +2684,7 @@ bool CInterfaceManager::deletePlayerKeys (const std::string &playerFileIdent)
 }
 
 // ***************************************************************************
-void CInterfaceManager::log(const ucstring &str)
+void CInterfaceManager::log(const ucstring &str, const std::string &cat)
 {
 	if (_LogState)
 	{
@@ -2693,7 +2693,7 @@ void CInterfaceManager::log(const ucstring &str)
 		FILE *f = fopen(fileName.c_str(), "at");
 		if (f != NULL)
 		{
-			const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " * " + str.toUtf8();
+			const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " (" + NLMISC::toUpper(cat) + ") * " + str.toUtf8();
 			fprintf(f, "%s\n", finalString.c_str());
 		}
 		fclose(f);
@@ -2925,7 +2925,7 @@ void CInterfaceManager::initEmotes()
 	CSkillManager		*pSM = CSkillManager::getInstance();
 
 	betaTester = pSM->isTitleUnblocked(CHARACTER_TITLE::FBT);
-	string	previousMind = "";
+	string	previousMind;
 	CGroupSubMenu *pFirstMenu = 0;
 
 	for (list<CEmoteEntry>::const_iterator it = entries.begin(); it != entries.end(); it++)
@@ -3982,5 +3982,3 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 	ucstr = str;
 	return true;;
 }
-
-
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.h b/code/ryzom/client/src/interface_v3/interface_manager.h
index 36bd909e3..d947f4912 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.h
+++ b/code/ryzom/client/src/interface_v3/interface_manager.h
@@ -218,7 +218,7 @@ public:
 	// Log system (all chat/tell
 	void setLogState(bool state) { _LogState = state; }
 	bool getLogState() const { return _LogState; }
-	void log(const ucstring &str);
+	void log(const ucstring &str, const std::string &cat = "");
 
 	/// Text from here and from server
 
diff --git a/code/ryzom/client/src/interface_v3/interface_observer.h b/code/ryzom/client/src/interface_v3/interface_observer.h
index 4261f10a4..6da93637e 100644
--- a/code/ryzom/client/src/interface_v3/interface_observer.h
+++ b/code/ryzom/client/src/interface_v3/interface_observer.h
@@ -119,7 +119,7 @@ public:
 		char * end = ptr.getDatas() + strlen( ptr.getDatas() );
 		char * dataTok = strtok( ptr.getDatas()," ,");
 		NLMISC::ICDBNode::CTextId textId;
-		
+
 		while(dataTok)
 		{
 			std::string data (dataTok);
diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/code/ryzom/client/src/interface_v3/inventory_manager.cpp
index 5e7d66075..7a56e470e 100644
--- a/code/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -1981,7 +1981,7 @@ bool SBagOptions::parse(xmlNodePtr cur, CInterfaceGroup * /* parentGroup */)
 	prop = xmlGetProp (cur, (xmlChar*)"inv_type");
 	if (prop)
 	{
-		InvType = CInventoryManager::invTypeFromString(prop);
+		InvType = CInventoryManager::invTypeFromString(prop.str());
 	}
 	else
 	{
@@ -1990,22 +1990,22 @@ bool SBagOptions::parse(xmlNodePtr cur, CInterfaceGroup * /* parentGroup */)
 	}
 
 	prop = xmlGetProp (cur, (xmlChar*)"filter_armor");
-	if (prop) DbFilterArmor = NLGUI::CDBManager::getInstance()->getDbProp(prop);
+	if (prop) DbFilterArmor = NLGUI::CDBManager::getInstance()->getDbProp(prop.str());
 
 	prop = xmlGetProp (cur, (xmlChar*)"filter_weapon");
-	if (prop) DbFilterWeapon = NLGUI::CDBManager::getInstance()->getDbProp(prop);
+	if (prop) DbFilterWeapon = NLGUI::CDBManager::getInstance()->getDbProp(prop.str());
 
 	prop = xmlGetProp (cur, (xmlChar*)"filter_tool");
-	if (prop) DbFilterTool = NLGUI::CDBManager::getInstance()->getDbProp(prop);
+	if (prop) DbFilterTool = NLGUI::CDBManager::getInstance()->getDbProp(prop.str());
 
 	prop = xmlGetProp (cur, (xmlChar*)"filter_mp");
-	if (prop) DbFilterMP = NLGUI::CDBManager::getInstance()->getDbProp(prop);
+	if (prop) DbFilterMP = NLGUI::CDBManager::getInstance()->getDbProp(prop.str());
 
 	prop = xmlGetProp (cur, (xmlChar*)"filter_missmp");
-	if (prop) DbFilterMissMP = NLGUI::CDBManager::getInstance()->getDbProp(prop);
+	if (prop) DbFilterMissMP = NLGUI::CDBManager::getInstance()->getDbProp(prop.str());
 
 	prop = xmlGetProp (cur, (xmlChar*)"filter_tp");
-	if (prop) DbFilterTP = NLGUI::CDBManager::getInstance()->getDbProp(prop);
+	if (prop) DbFilterTP = NLGUI::CDBManager::getInstance()->getDbProp(prop.str());
 
 	return true;
 }
diff --git a/code/ryzom/client/src/interface_v3/parser_modules.cpp b/code/ryzom/client/src/interface_v3/parser_modules.cpp
index ff1c93645..58158ea62 100644
--- a/code/ryzom/client/src/interface_v3/parser_modules.cpp
+++ b/code/ryzom/client/src/interface_v3/parser_modules.cpp
@@ -369,7 +369,7 @@ bool CCommandParser::parse( xmlNodePtr cur, NLGUI::CInterfaceGroup *parentGroup
 					// if prop "ctrlchar" is declared with false, then disable ctrlchar for this command
 					CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)"ctrlchar" ));
 					if( (const char*)prop && (CInterfaceElement::convertBool((const char*)prop)==false) )
-						ICommand::enableControlCharForCommand(ptrName, false);
+						ICommand::enableControlCharForCommand(ptrName.str(), false);
 
 					// Done
 					ret = true;
diff --git a/code/ryzom/client/src/interface_v3/people_interraction.cpp b/code/ryzom/client/src/interface_v3/people_interraction.cpp
index 332bcac57..c2eb972dd 100644
--- a/code/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/code/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -2193,7 +2193,6 @@ class CHandlerTellContact : public IActionHandler
 		CInterfaceGroup *ig = pCaller->getParent();
 		if (!ig) return;
 		CGroupContainer *gc = static_cast< CGroupContainer* >( ig->getEnclosingContainer() );
-
 		if (!gc) return;
 		CPeopleList *list;
 		uint peopleIndex;
diff --git a/code/ryzom/client/src/interface_v3/people_list.cpp b/code/ryzom/client/src/interface_v3/people_list.cpp
index a2ee04808..c2167358f 100644
--- a/code/ryzom/client/src/interface_v3/people_list.cpp
+++ b/code/ryzom/client/src/interface_v3/people_list.cpp
@@ -478,7 +478,7 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 	strFindReplace(s, "%name", receiver);
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
 	gl->addChild(getChatTextMngr().createMsgText(finalMsg, prop.getRGBA()));
-	CInterfaceManager::getInstance()->log(finalMsg);
+	CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
 
 	// if the group is closed, make it blink
 	if (!gc->isOpen())
@@ -895,7 +895,7 @@ class CHandlerContactEntry : public IActionHandler
 		// it is simpler to keep it as it and to just use this action handler to manage user input.
 		if (!pCaller || !pCaller->getParent()) return;
 		CGroupContainer *gc = static_cast< CGroupContainer* >( pCaller->getParent()->getEnclosingContainer() );
-		
+
 		// title gives the name of the player
 		ucstring playerName = gc->getUCTitle();
 
@@ -946,7 +946,7 @@ class CHandlerContactEntry : public IActionHandler
 				ucstring s = CI18N::get("youTellPlayer");
 				strFindReplace(s, "%name", pWin->getFreeTellerName(str));
 				strFindReplace(final, CI18N::get("youTell"), s);
-				CInterfaceManager::getInstance()->log(final);
+				CInterfaceManager::getInstance()->log(final, CChatGroup::groupTypeToString(CChatGroup::tell));
 			}
 		}
 	}
diff --git a/code/ryzom/client/src/interface_v3/skill_manager.cpp b/code/ryzom/client/src/interface_v3/skill_manager.cpp
index e71225cc2..d8656d925 100644
--- a/code/ryzom/client/src/interface_v3/skill_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/skill_manager.cpp
@@ -159,10 +159,8 @@ void CSkillManager::initInGame()
 	_TrackSkillChange= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TRACK_SKILL_CHANGE", true);
 	// Add a branch observer on skill value change
 	NLGUI::CDBManager::getInstance()->addBranchObserver( "SERVER:CHARACTER_INFO:SKILLS", &_SkillChangeObs );
-
 }
 
-
 // ***************************************************************************
 void CSkillManager::uninitInGame()
 {
diff --git a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp b/code/ryzom/client/src/interface_v3/sphrase_manager.cpp
index 790657e2e..d214d1150 100644
--- a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -474,16 +474,16 @@ void				CSPhraseManager::memorizePhrase(uint32 memoryLine, uint32 memorySlot, ui
 	}
 }
 
-void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
+// ***************************************************************************
+void CSPhraseManager::selectMemoryLineDB(sint32 memoryLine)
 {
 	if(memoryLine<0)
 		memoryLine= -1;
-	
-	if(_SelectedMemoryDBalt!=memoryLine)
+
+	if(_SelectedMemoryDB!=memoryLine)
 	{
-		_SelectedMemoryDBalt= memoryLine;
+		_SelectedMemoryDB= memoryLine;
 		// since memory selection changes then must update all the DB and the Ctrl states
-		
 		updateMemoryDBAll();
 		updateAllMemoryCtrlState();
 		updateAllMemoryCtrlRegenTickRange();
@@ -492,14 +492,14 @@ void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
 	}
 }
 
-// ***************************************************************************
-void				CSPhraseManager::selectMemoryLineDB(sint32 memoryLine)
+void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
 {
 	if(memoryLine<0)
 		memoryLine= -1;
-	if(_SelectedMemoryDB!=memoryLine)
+
+	if(_SelectedMemoryDBalt!=memoryLine)
 	{
-		_SelectedMemoryDB= memoryLine;
+		_SelectedMemoryDBalt= memoryLine;
 		// since memory selection changes then must update all the DB and the Ctrl states
 		updateMemoryDBAll();
 		updateAllMemoryCtrlState();
@@ -573,7 +573,7 @@ void		CSPhraseManager::updateMemoryDBSlot(uint32 memorySlot)
 			_MemoryDbLeaves[memorySlot]->setValue32(0);
 		else
 			_MemoryDbLeaves[memorySlot]->setValue32(slot.Id);
-		
+
 		CMemorySlot		&slotAlt= _Memories[_SelectedMemoryDBalt].Slot[memorySlot];
 
 		if(!slotAlt.isPhrase())
@@ -1126,7 +1126,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 		uint32	totalActionMalus= 0;
 		CCDBNodeLeaf *actMalus = _TotalMalusEquipLeaf ? &*_TotalMalusEquipLeaf
 			: &*(_TotalMalusEquipLeaf = NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false));
-		
+
 		// root brick must not be Power or aura, because Action malus don't apply to them
 		// (ie leave 0 ActionMalus for Aura or Powers
 		if(actMalus && !rootBrick->isSpecialPower())
@@ -4519,7 +4519,7 @@ uint32 CSPhraseManager::getTotalActionMalus(const CSPhraseCom &phrase) const
 		if (!rootBrick)
 			nlerror("Invalid root sbrick in sphrase_com '%s'", phrase.Name.toUtf8().c_str());
 		else if (actMalus && !rootBrick->isSpecialPower())
-			totalActionMalus = actMalus->getValue32();	
+			totalActionMalus = actMalus->getValue32();
 	}
 	return totalActionMalus;
 }
diff --git a/code/ryzom/client/src/interface_v3/view_radar.cpp b/code/ryzom/client/src/interface_v3/view_radar.cpp
index 8c8cd1de8..5ebb7fd64 100644
--- a/code/ryzom/client/src/interface_v3/view_radar.cpp
+++ b/code/ryzom/client/src/interface_v3/view_radar.cpp
@@ -177,7 +177,7 @@ void CViewRadar::draw ()
 		// Select the icon to display and draw it
 		uint spotId = CNPCIconCache::getInstance().getNPCIcon(entity).getSpotId();
 		CRadarSpotDesc spotDesc = _SpotDescriptions[spotId];
-			
+
 		if (!_MissionIconsObs._displayMissionSpots)
 			spotDesc = _SpotDescriptions[0];
 
diff --git a/code/ryzom/client/src/interfaces_manager/interf_script.cpp b/code/ryzom/client/src/interfaces_manager/interf_script.cpp
index f083eda18..734b99098 100644
--- a/code/ryzom/client/src/interfaces_manager/interf_script.cpp
+++ b/code/ryzom/client/src/interfaces_manager/interf_script.cpp
@@ -37,7 +37,11 @@ float getFloat()
 	char delimiter[] = "[] \t";
 	char *ptr = strtok(NULL, delimiter);
 	if(ptr != NULL)
-		return (float) atof(ptr);
+	{
+		float val;
+		NLMISC::fromString(ptr, val);
+		return val;
+	}
 	return 0.f;
 }// getFloat //
 
@@ -94,7 +98,7 @@ std::vector<float> getVectorOfFloat(uint8 nbCol)
 		ptr = strtok(NULL, delimiter);
 		if(ptr != NULL)
 		{
-			val = (float)atof(ptr);
+			NLMISC::fromString(ptr, val);
 			if (val != 0.0f)
 				vect.push_back(val);
 		}
diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 5b9a83c83..3cc14e6d2 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -26,6 +26,10 @@
 	#include <unistd.h>
 #endif
 
+#ifdef NL_OS_MAC
+	#include "app_bundle_utils.h"
+#endif
+
 #include <memory>
 #include <errno.h>
 
@@ -207,9 +211,18 @@ CPatchManager::CPatchManager() : State("t_state"), DataScanState("t_data_scan_st
 // ****************************************************************************
 void CPatchManager::setClientRootPath(const std::string& clientRootPath)
 {
-	ClientRootPath = clientRootPath;
-	ClientPatchPath = ClientRootPath + "unpack/";
-	ClientDataPath = ClientRootPath + "data/";
+	ClientRootPath = CPath::standardizePath(clientRootPath);
+	ClientPatchPath = CPath::standardizePath(ClientRootPath + "unpack");
+	
+	WritableClientDataPath = CPath::standardizePath(ClientRootPath + "data");
+
+#ifdef NL_OS_MAC
+	ReadableClientDataPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/data");
+#elif defined(NL_OS_UNIX) && defined(RYZOM_SHARE_PREFIX)
+	ReadableClientDataPath = CPath::standardizePath(std::string(RYZOM_SHARE_PREFIX) + "/data");
+#else
+	ReadableClientDataPath = WritableClientDataPath;
+#endif
 }
 
 // ****************************************************************************
@@ -253,7 +266,7 @@ void CPatchManager::init(const std::vector<std::string>& patchURIs, const std::s
 		DisplayedServerPath = ServerPath;
 
 	NLMISC::CFile::createDirectory(ClientPatchPath);
-	NLMISC::CFile::createDirectory(ClientDataPath);
+	NLMISC::CFile::createDirectory(WritableClientDataPath);
 
 
 	// try to read the version file from the server (that will replace the version number)
@@ -787,7 +800,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 
 			if (!result)
 			{
-//:TODO: handle exception?
+				// TODO: handle exception?
 				string err = toString("Error unpacking %s", rFilename.c_str());
 
 				if (useBatchFile)
@@ -913,7 +926,6 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 			throw NLMISC::EWriteError(UpdateBatchFilename.c_str());
 		}
 	}
-
 }
 
 // ****************************************************************************
@@ -1068,12 +1080,12 @@ float CPatchManager::getCurrentFileProgress() const
 }
 
 // ****************************************************************************
-void CPatchManager::setRWAccess (const string &filename)
+void CPatchManager::setRWAccess (const string &filename, bool bThrowException)
 {
 	ucstring s = CI18N::get("uiSetAttrib") + " " + filename;
 	setState(true, s);
 
-	if (!NLMISC::CFile::setRWAccess(filename))
+	if (!NLMISC::CFile::setRWAccess(filename) && bThrowException)
 	{
 		s = CI18N::get("uiAttribErr") + " " + filename + " (" + toString(errno) + "," + strerror(errno) + ")";
 		setState(true, s);
@@ -1351,7 +1363,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
 		// create the local file
 		if (NLMISC::CFile::fileExists(dest))
 		{
-			setRWAccess(dest);
+			setRWAccess(dest, false);
 			NLMISC::CFile::deleteFile(dest.c_str());
 		}
 		FILE *fp = fopen (dest.c_str(), "wb");
@@ -1492,7 +1504,7 @@ void CPatchManager::decompressFile (const string &filename)
 	}
 
 	string dest = filename.substr(0, filename.size ()-4);
-	setRWAccess(dest);
+	setRWAccess(dest, false);
 	//if(isVerboseLog()) nlinfo("Calling fopen('%s','wb')", dest.c_str());
 	FILE *fp = fopen (dest.c_str(), "wb");
 	if (fp == NULL)
@@ -1566,7 +1578,7 @@ void CPatchManager::applyDate (const string &sFilename, uint32 nDate)
 	{
 //		_utimbuf utb;
 //		utb.actime = utb.modtime = nDate;
-		setRWAccess(sFilename);
+		setRWAccess(sFilename, false);
 		ucstring s = CI18N::get("uiChangeDate") + " " + NLMISC::CFile::getFilename(sFilename) + " " + toString(NLMISC::CFile::getFileModificationDate (sFilename)) +
 						" -> " + toString(nDate);
 		setState(true,s);
@@ -1616,9 +1628,25 @@ void CPatchManager::getPatchFromDesc(SFileToPatch &ftpOut, const CBNPFile &fIn,
 	// Only look in data path if the file should not be unpack (otherwise it should only remains in the "unpack" directory)
 	if (!needUnpack)
 	{
-		if (sFilePath.empty() && NLMISC::CFile::fileExists(ClientDataPath + rFilename))		sFilePath = ClientDataPath + rFilename;
+		if (sFilePath.empty())
+		{
+			if (NLMISC::CFile::fileExists(WritableClientDataPath + rFilename))
+			{
+				// if file exists in writable directory, use it
+				sFilePath = WritableClientDataPath + rFilename;
+			}
+			else if (NLMISC::CFile::fileExists(ReadableClientDataPath + rFilename))
+			{
+				// if file exists in readable directory, use it
+				sFilePath = ReadableClientDataPath + rFilename;
+			}
+		}
+	}
+
+	if (sFilePath.empty() && NLMISC::CFile::fileExists(ClientPatchPath + rFilename))
+	{
+		sFilePath = ClientPatchPath + rFilename;
 	}
-	if (sFilePath.empty() && NLMISC::CFile::fileExists(ClientPatchPath + rFilename))		sFilePath = ClientPatchPath + rFilename;
 
 // following lines removed by Sadge to ensure that the correct file is patched
 //	string sFilePath = CPath::lookup(rFilename, false, false);
@@ -2039,7 +2067,8 @@ uint CPatchManager::applyScanDataResult()
 	if(ScanDataThread)
 		return 0;
 
-	uint	numError= 0;
+	uint numError= 0;
+
 	{
 		TSyncDataScanState::CAccessor	ac(&DataScanState);
 		CDataScanState	&val= ac.value();
@@ -2057,7 +2086,8 @@ uint CPatchManager::applyScanDataResult()
 			// get file path
 			// following lines added by Sadge to ensure that the correct file gets patched
 			string sFilePath;
-			if (NLMISC::CFile::fileExists(ClientDataPath + ftp.FileName))	sFilePath = ClientDataPath + ftp.FileName;
+			if (NLMISC::CFile::fileExists(WritableClientDataPath + ftp.FileName)) sFilePath = WritableClientDataPath + ftp.FileName;
+			if (sFilePath.empty() && NLMISC::CFile::fileExists(ReadableClientDataPath + ftp.FileName)) sFilePath = ReadableClientDataPath + ftp.FileName;
 			if (sFilePath.empty() && NLMISC::CFile::fileExists(ClientPatchPath + ftp.FileName))	sFilePath = ClientPatchPath + ftp.FileName;
 
 // following lines removed by Sadge to ensure that the correct file gets patched
@@ -2768,15 +2798,31 @@ public:
 void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 {
 	CPatchManager *pPM = CPatchManager::getInstance();
-	// Source File Name
+
+	// Source File Name (in writable or readable directory)
 	string SourceName;
+
+	// Destination File Name (in writable directory)
+	string DestinationName;
+
 	if (rFTP.ExtractPath.empty())
 	{
+		DestinationName = pPM->WritableClientDataPath + rFTP.FileName;
+
 		if (rFTP.LocalFileExists)
 		{
 			// following lines added by Sadge to ensure that the correct file gets patched
 			SourceName.clear();
-			if (NLMISC::CFile::fileExists(pPM->ClientDataPath + rFTP.FileName))		SourceName = pPM->ClientDataPath + rFTP.FileName;
+
+			if (NLMISC::CFile::fileExists(pPM->WritableClientDataPath + rFTP.FileName))
+			{
+				SourceName = pPM->WritableClientDataPath + rFTP.FileName;
+			}
+			else if (NLMISC::CFile::fileExists(pPM->ReadableClientDataPath + rFTP.FileName))
+			{
+				SourceName = pPM->ReadableClientDataPath + rFTP.FileName;
+			}
+
 			// version from previous download
 			if (SourceName.empty())	throw Exception (std::string("ERROR: Failed to find file: ")+rFTP.FileName);
 
@@ -2788,12 +2834,13 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 			// note : if file was background downloaded, we have :
 			// rFTP.LocalFileExists = false
 			// rFTP.SrcFileName = "unpack/filename.bnp.tmp"
-			SourceName = pPM->ClientDataPath + rFTP.FileName;
+			SourceName = DestinationName;
 		}
 	}
 	else
 	{
 		SourceName = pPM->ClientPatchPath + rFTP.FileName;
+		DestinationName = SourceName;
 	}
 
 	if (rFTP.LocalFileToDelete)
@@ -2838,7 +2885,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 		for (uint i=0; i<rFTP.PatcheSizes.size(); ++i)
 			totalPatchSize += rFTP.PatcheSizes[i];
 	}
-	else
+	else if (!rFTP.PatcheSizes.empty())
 	{
 		totalPatchSize = rFTP.PatcheSizes.back();
 	}
@@ -2930,11 +2977,11 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 			pPM->deleteFile(SourceName, false, false); // File can exists if bad BNP loading
 			if (_CommitPatch)
 			{
-				pPM->renameFile(OutFilename+".tmp", SourceName);
+				pPM->renameFile(OutFilename+".tmp", DestinationName);
 			}
 		}
 	}
-	if (usePatchFile && !rFTP.Patches.empty())
+	if (usePatchFile)
 	{
 		uint32 currentPatchedSize = 0;
 		for (uint32 j = 0; j < rFTP.Patches.size(); ++j)
@@ -2987,21 +3034,14 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 				SourceNameXD = SourceNameXD.substr(0, SourceNameXD.rfind('.'));
 				SourceNameXD += "_.ref";
 
-				std::string refPath;
-				if (_CommitPatch)
-				{
-					refPath = pPM->ClientDataPath;
-				}
-				else
+				if (!_CommitPatch)
 				{
 					// works
-					refPath = pPM->ClientPatchPath;
 					std::string tmpRefFile = SourceNameXD + ".tmp";
 					if (!NLMISC::CFile::fileExists(pPM->ClientPatchPath + tmpRefFile))
 					{
 						// Not found in the patch directory -> version in data directory should be good, or would have been
 						// detected by the check thread else.
-						refPath = pPM->ClientDataPath;
 					}
 					else
 					{
@@ -3018,7 +3058,14 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 				//			if (SourceNameXDFull.empty())
 				//				SourceNameXDFull = pPM->ClientDataPath + SourceNameXD;
 				//			SourceNameXD = SourceNameXDFull;
-				SourceNameXD = pPM->ClientDataPath + SourceNameXD;
+				if (CFile::fileExists(pPM->WritableClientDataPath + SourceNameXD))
+				{
+					SourceNameXD = pPM->WritableClientDataPath + SourceNameXD;
+				}
+				else if (CFile::fileExists(pPM->ReadableClientDataPath + SourceNameXD))
+				{
+					SourceNameXD = pPM->ReadableClientDataPath + SourceNameXD;
+				}
 			}
 
 			PatchName = pPM->ClientPatchPath + PatchName;
@@ -3042,7 +3089,8 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 			PatchSizeProgress += rFTP.PatcheSizes[j];
 			currentPatchedSize += rFTP.PatcheSizes[j];
 		}
-		if (tmpSourceName != SourceName)
+
+		if (tmpSourceName != DestinationName)
 		{
 			pPM->deleteFile(SourceName, false, false); // File can exists if bad BNP loading
 			if (!_CommitPatch)
@@ -3052,7 +3100,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 			}
 			else
 			{
-				pPM->renameFile(tmpSourceName, SourceName);
+				pPM->renameFile(tmpSourceName, DestinationName);
 			}
 		}
 	}
@@ -3060,9 +3108,10 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 	{
 		PatchSizeProgress += totalPatchSize;
 	}
+
 	// If all patches applied with success so file size should be ok
 	// We just have to change file date to match the last patch applied
-	pPM->applyDate(SourceName, rFTP.LastFileDate);
+	pPM->applyDate(DestinationName, rFTP.LastFileDate);
 	//progress.progress(1.f);
 }
 
@@ -3398,6 +3447,7 @@ bool CPatchManager::extract(const std::string& patchPath,
 			ok = true;
 		}
 	}
+
 	if (!ok)
 	{
 		// nothing to extract
@@ -3407,15 +3457,21 @@ bool CPatchManager::extract(const std::string& patchPath,
 	// extract
 	uint nblab = 0;
 	pPM->deleteFile(updateBatchFilename, false, false);
+
 	FILE *fp = fopen (updateBatchFilename.c_str(), "wt");
+
 	if (fp == 0)
 	{
 		string err = toString("Can't open file '%s' for writing: code=%d %s (error code 29)", updateBatchFilename.c_str(), errno, strerror(errno));
 		throw Exception (err);
 	}
+
+#ifdef NL_OS_WINDOWS
 	fprintf(fp, "@echo off\n");
 	fprintf(fp, "ping 127.0.0.1 -n 7 -w 1000 > nul\n"); // wait
-
+#else
+	// TODO: for Linux and OS X
+#endif
 
 	// Unpack files with category ExtractPath non empty
 	for (uint32 j = 0; j < sourceFilename.size(); ++j)
@@ -3442,21 +3498,32 @@ bool CPatchManager::extract(const std::string& patchPath,
 					string DstPath = CPath::standardizeDosPath(extractPath[j]);
 					string DstName = DstPath + vFilenames[fff];
 					NLMISC::CFile::createDirectoryTree(extractPath[j]);
-					// this file must be moved
 
+					// this file must be moved
+#ifdef NL_OS_WINDOWS
 					fprintf(fp, ":loop%u\n", nblab);
 					fprintf(fp, "attrib -r -a -s -h %s\n", DstName.c_str());
 					fprintf(fp, "del %s\n", DstName.c_str());
 					fprintf(fp, "if exist %s goto loop%u\n", DstName.c_str(), nblab);
 					fprintf(fp, "move %s %s\n", SrcName.c_str(), DstPath.c_str());
+#else
+					// TODO: for Linux and OS X
+#endif
+
 					nblab++;
+
 				}
 			}
 		}
 	}
 
 
+#ifdef NL_OS_WINDOWS
 	fprintf(fp, "start %s %%1 %%2 %%3\n", execName.c_str());
+#else
+	// TODO: for Linux and OS X
+#endif
+
 	fclose(fp);
 
 	if (stopFun)
diff --git a/code/ryzom/client/src/login_patch.h b/code/ryzom/client/src/login_patch.h
index de7351775..509a74f9a 100644
--- a/code/ryzom/client/src/login_patch.h
+++ b/code/ryzom/client/src/login_patch.h
@@ -302,7 +302,7 @@ private:
 	/// Read the description of the highest client version file found
 	void				readClientVersionAndDescFile();
 
-	void		setRWAccess (const std::string &filename);
+	void		setRWAccess (const std::string &filename, bool bThrowException=true);
 
 	std::string deleteFile (const std::string &filename, bool bThrowException=true, bool bWarning=true);
 
@@ -447,8 +447,9 @@ private:
 	std::string UpdateBatchFilename;
 
 	// Where the client get all delta and desc file
-	std::string ClientPatchPath;
-	std::string ClientDataPath;
+	std::string ClientPatchPath; // Temporary path
+	std::string ReadableClientDataPath; // Where original data can be found
+	std::string WritableClientDataPath; // Where data can be written
 
 	/// Output useful information for debugging in the log file
 	bool VerboseLog;
diff --git a/code/ryzom/client/src/login_progress_post_thread.cpp b/code/ryzom/client/src/login_progress_post_thread.cpp
index bc833fb04..76ce9c2e3 100644
--- a/code/ryzom/client/src/login_progress_post_thread.cpp
+++ b/code/ryzom/client/src/login_progress_post_thread.cpp
@@ -85,7 +85,7 @@ static std::string sizeToHumanStd(uint64 size)
 static std::string getVideoInfoDeviceName()
 {
 	uint64 version;
-	std::string ret = "";
+	std::string ret;
 	bool ok = CSystemInfo::getVideoInfo(ret, version);
 	if (ok)
 	{
diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp
index 1ac6a4a0c..9b39c53c9 100644
--- a/code/ryzom/client/src/main_loop.cpp
+++ b/code/ryzom/client/src/main_loop.cpp
@@ -1013,6 +1013,7 @@ bool mainLoop()
 	SetMouseCursor ();
 	// Set the cursor.
 	ContextCur.context("STAND BY");
+	UserControls.reset();
 
 	// set the default box for keyboard
 	setDefaultChatWindow(PeopleInterraction.ChatGroup.Window);
@@ -1924,6 +1925,7 @@ bool mainLoop()
 
 						// Create a shadow when displaying a text.
 						TextContext->setShaded(true);
+						TextContext->setShadeOutline(false);
 						// Set the font size.
 						TextContext->setFontSize(10);
 						// Set the text color
@@ -2462,6 +2464,7 @@ bool mainLoop()
 				SetMouseCursor ();
 				// Set the cursor.
 				ContextCur.context("STAND BY");
+				UserControls.reset();
 
 				// set the default box for keyboard
 				CChatWindow *defaultChatWindow;
@@ -2586,6 +2589,7 @@ void	displaySpecialTextProgress(const char *text)
 {
 	// Create a shadow when displaying a text.
 	TextContext->setShaded(true);
+	TextContext->setShadeOutline(false);
 	// Set the font size.
 	TextContext->setFontSize(12);
 	// Set the text color
diff --git a/code/ryzom/client/src/main_loop_debug.cpp b/code/ryzom/client/src/main_loop_debug.cpp
index 8b224f27f..992325c54 100644
--- a/code/ryzom/client/src/main_loop_debug.cpp
+++ b/code/ryzom/client/src/main_loop_debug.cpp
@@ -80,6 +80,7 @@ void displayDebug()
 	//----------------//
 	// Create a shadow when displaying a text.
 	TextContext->setShaded(true);
+	TextContext->setShadeOutline(false);
 	// Set the font size.
 	TextContext->setFontSize(ClientCfg.DebugFontSize);
 	// Set the text color
@@ -370,6 +371,9 @@ void displayDebug()
 	// Current GameCycle
 	TextContext->printfAt(1.f, line, "Ms per Cycle : %d", NetMngr.getMsPerTick());
 	line += lineStep;
+	// Smoothed Client Date
+	TextContext->printfAt(1.f, line, "Smoothed Client Date : %u %f", SmoothedClientDate.Day, SmoothedClientDate.Hour);
+	line += lineStep;
 	// Packet Loss
 	TextContext->printfAt(1.f, line, "Packet Loss : %.1f %%", NetMngr.getMeanPacketLoss()*100.0f);
 	line += lineStep;
@@ -470,6 +474,7 @@ void displayDebug()
 
 	// No more shadow when displaying a text.
 	TextContext->setShaded(false);
+	TextContext->setShadeOutline(false);
 }// displayDebug //
 
 // ********************************************************************
@@ -491,6 +496,7 @@ void displayDebugFps()
 	//----------------//
 	// Create a shadow when displaying a text.
 	TextContext->setShaded(true);
+	TextContext->setShadeOutline(false);
 	// Set the font size.
 	TextContext->setFontSize(ClientCfg.DebugFontSize);
 	// Set the text color
@@ -533,6 +539,7 @@ void displayDebugUIUnderMouse()
 	//----------------//
 	// Create a shadow when displaying a text.
 	TextContext->setShaded(true);
+	TextContext->setShadeOutline(false);
 	// Set the font size.
 	TextContext->setFontSize(ClientCfg.DebugFontSize);
 
@@ -707,6 +714,7 @@ void displayHelp()
 
 	// Create a shadow when displaying a text.
 	TextContext->setShaded(true);
+	TextContext->setShadeOutline(false);
 	// Set the font size.
 	TextContext->setFontSize(ClientCfg.HelpFontSize);
 	// Set the text color
@@ -763,6 +771,7 @@ void displayHelp()
 
 	// No more shadow when displaying a text.
 	TextContext->setShaded(false);
+	TextContext->setShadeOutline(false);
 }// displayHelp //
 
 // ********************************************************************
diff --git a/code/ryzom/client/src/misc.cpp b/code/ryzom/client/src/misc.cpp
index 9adf00a9a..7e018a576 100644
--- a/code/ryzom/client/src/misc.cpp
+++ b/code/ryzom/client/src/misc.cpp
@@ -920,7 +920,7 @@ std::string getStringCategory(const ucstring &src, ucstring &dest, bool alwaysAd
 
 std::string getStringCategoryIfAny(const ucstring &src, ucstring &dest)
 {
-	std::string colorCode = "";
+	std::string colorCode;
 	if (src.size() >= 3)
 	{
 		uint startPos = 0;
diff --git a/code/ryzom/client/src/misc.h b/code/ryzom/client/src/misc.h
index d74010c03..463f02b66 100644
--- a/code/ryzom/client/src/misc.h
+++ b/code/ryzom/client/src/misc.h
@@ -225,6 +225,7 @@ uint getCurrentColorDepth();
 // get maximized
 bool isWindowMaximized();
 
+// get all supported video modes
 sint getRyzomModes(std::vector<NL3D::UDriver::CMode> &videoModes, std::vector<std::string> &stringModeList);
 
 #endif // CL_MISC_H
diff --git a/code/ryzom/client/src/motion/user_controls.cpp b/code/ryzom/client/src/motion/user_controls.cpp
index 285848120..897cba9c1 100644
--- a/code/ryzom/client/src/motion/user_controls.cpp
+++ b/code/ryzom/client/src/motion/user_controls.cpp
@@ -174,6 +174,10 @@ void CUserControls::init()
 
 }// init //
 
+void CUserControls::reset()
+{
+	init();
+}
 
 //-----------------------------------------------
 // needReleaseForward :
diff --git a/code/ryzom/client/src/motion/user_controls.h b/code/ryzom/client/src/motion/user_controls.h
index eb4de2020..018b2c8e9 100644
--- a/code/ryzom/client/src/motion/user_controls.h
+++ b/code/ryzom/client/src/motion/user_controls.h
@@ -152,6 +152,8 @@ public:
 	/// Constructor
 	CUserControls();
 
+	void reset();
+
 	/// Return the string associated to the motion Mode.
 	std::string modeStr() const;
 	/// Return the motion Mode.
diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp
index 4b37b698a..ecadce14e 100644
--- a/code/ryzom/client/src/net_manager.cpp
+++ b/code/ryzom/client/src/net_manager.cpp
@@ -879,7 +879,28 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 	}
 
 	// Log
-	pIM->log (finalString);
+
+	string channel;
+	if (mode == CChatGroup::dyn_chat)
+	{
+		sint32	dbIndex = ChatMngr.getDynamicChannelDbIndexFromId(dynChatId);
+		clamp(dbIndex, (sint32)0 , (sint32)CChatGroup::MaxDynChanPerPlayer);
+
+		channel = "dyn" + toString(dbIndex);
+	}
+	else
+	{
+		channel = CChatGroup::groupTypeToString(mode);
+		if (channel.empty())
+		{
+			channel = "#" + toString((uint32)mode);
+		}
+	}
+	if (!stringCategory.empty() && NLMISC::toUpper(stringCategory) != "SYS")
+	{
+		channel = channel + "/" + stringCategory;
+	}
+	pIM->log (finalString, channel);
 
 }
 
@@ -911,7 +932,7 @@ void CInterfaceChatDisplayer::displayTell(/*TDataSetIndex senderIndex, */const u
  	colorizeSender(finalString, senderPart, prop.getRGBA());
 
 	PeopleInterraction.ChatInput.Tell.displayTellMessage(/*senderIndex, */finalString, goodSenderName, prop.getRGBA(), 2, &windowVisible);
-	CInterfaceManager::getInstance()->log(finalString);
+	CInterfaceManager::getInstance()->log(finalString, CChatGroup::groupTypeToString(CChatGroup::tell));
 
 	// Open the free teller window
 	CChatGroupWindow *pCGW = PeopleInterraction.getChatGroupWindow();
@@ -4109,7 +4130,7 @@ void	CNetManagerMulti::init( const std::string& cookie, const std::string& addr
 
 //
 uint32					ShardId = 0;
-std::string				WebServer = "";
+std::string				WebServer;
 
 
 
diff --git a/code/ryzom/client/src/network_connection.h b/code/ryzom/client/src/network_connection.h
index 3eb5cd95b..da47f925e 100644
--- a/code/ryzom/client/src/network_connection.h
+++ b/code/ryzom/client/src/network_connection.h
@@ -776,16 +776,10 @@ protected:
 
 	/// @name NLMISC::CEntityId handling (for gamedev)
 	//@{
-	class CHash
+	struct CHash
 	{
-	public:
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
-
-		CHash() {}
-
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t	operator () (const CLFECOMMON::TSheetId &id) const { return id; }
-
 		inline bool operator() (const CLFECOMMON::TSheetId &id1, const CLFECOMMON::TSheetId &id2) const { return (size_t)id1 < (size_t)id2; }
 	};
 
diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp
index 4166dbec8..a050ac197 100644
--- a/code/ryzom/client/src/player_cl.cpp
+++ b/code/ryzom/client/src/player_cl.cpp
@@ -673,7 +673,7 @@ void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle *
 	}
 
 	// update title when gender changed
-	const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw,_Gender == GSGENDER::female));
+	const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, _Gender == GSGENDER::female));
 	if (!replacement.empty() || !ClientCfg.DebugStringManager)
 	{
 		// Get extended name
diff --git a/code/ryzom/client/src/progress.cpp b/code/ryzom/client/src/progress.cpp
index 8b5f72941..2631984e7 100644
--- a/code/ryzom/client/src/progress.cpp
+++ b/code/ryzom/client/src/progress.cpp
@@ -225,7 +225,7 @@ void CProgress::internalProgress (float value)
 
 		if (!stereoHMD || StereoDisplay->wantInterface2D())
 		{
-			nldebug("Draw progress 2D");
+			// nldebug("Draw progress 2D");
 
 			// Font factor
 			float fontFactor = 1;
diff --git a/code/ryzom/client/src/r2/displayer_visual_entity.cpp b/code/ryzom/client/src/r2/displayer_visual_entity.cpp
index 37632f4d4..5bc8638f0 100644
--- a/code/ryzom/client/src/r2/displayer_visual_entity.cpp
+++ b/code/ryzom/client/src/r2/displayer_visual_entity.cpp
@@ -564,7 +564,7 @@ void CDisplayerVisualEntity::updateWorldMapPresence()
 				_MapDeco.setDisplayedInstance(getDisplayedInstance(), true);
 				// retrieve icon from the displayed object (lua code)
 				CLuaState &ls = getEditor().getLua();
-				std::string texName = "";
+				std::string texName;
 				{
 					CLuaStackChecker lsc(&ls);
 					if (getDisplayedInstance()->getLuaProjection().callMethodByNameNoThrow("getSelectBarIcon", 0, 1))
@@ -984,7 +984,7 @@ void CDisplayerVisualEntity::updateName()
 				break;
 			}
 		}
-		std::string firstPart = "";
+		std::string firstPart;
 		if(actNb>0)
 			firstPart = CI18N::get("uiR2EDDefaultActTitle").toString() + " " + NLMISC::toString(actNb);
 
diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
index 0a5f74cc5..5d00cdc2b 100644
--- a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
+++ b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
@@ -1116,12 +1116,12 @@ void CClientEditionModule::startingScenario(class NLNET::IModuleProxy * /* serve
 
 
 		uint32 myUserId = NetMngr.getUserId();
-		std::string connectionState = "";
+		std::string connectionState;
 
 		if (myUserId == (charId>>4) || ClientCfg.Local)
 		{
 
-			std::string errorMsg = "";
+			std::string errorMsg;
 
 			CObject* hlScenario = _Scenario->getHighLevel();
 			hlData.setData(hlScenario); // clone before modify by translateFeatures
@@ -1352,8 +1352,8 @@ bool CClientEditionModule::loadUserComponent(const std::string& filename, bool m
 		}
 	}
 
-	std::string sourceExtension = UserComponentsSourceExtension;
-	std::string componentExtension = UserComponentsComponentExtension;
+	std::string sourceExtension = UserComponentsSourceExtension.get();
+	std::string componentExtension = UserComponentsComponentExtension.get();
 
 
 	uint32 uncompressedFileLength = 0;
@@ -2425,10 +2425,10 @@ bool CClientEditionModule::addToLoadList( const std::string& filename, CScenario
 void CClientEditionModule::loadScenarioSucceded(const std::string& filename, const std::string& body, const CScenarioValidator::TValues& values)
 {
 	//H_AUTO(R2_CClientEditionModule_loadScenarioSucceded)
-	string initialIsland="", initialEntryPoint="", initialSeason = "";
-	string creatorMD5 = "", modifiedByMD5="";
-	string name = "";
-	string locked = "";
+	string initialIsland, initialEntryPoint, initialSeason;
+	string creatorMD5, modifiedByMD5;
+	string name;
+	string locked;
 	for(uint i=0; i<values.size(); i++)
 	{
 		const std::pair<std::string, std::string>& pair = values[i];
diff --git a/code/ryzom/client/src/r2/dmc/com_lua_module.cpp b/code/ryzom/client/src/r2/dmc/com_lua_module.cpp
index c9b6a6df2..b73813786 100644
--- a/code/ryzom/client/src/r2/dmc/com_lua_module.cpp
+++ b/code/ryzom/client/src/r2/dmc/com_lua_module.cpp
@@ -834,7 +834,7 @@ sint CComLuaModule::luaRequestEraseNode(lua_State* state)
 	if (args>2) { luaL_checknumber(state, 3); }
 
 	std::string instanceId(lua_tostring(state, 1));
-	std::string attrName = "";
+	std::string attrName;
 	sint position = -1;
 	if (args>1){ attrName = lua_tostring(state, 2);}
 	if (args>2){ position = static_cast<sint>(lua_tonumber(state, 3));}
@@ -1255,7 +1255,7 @@ CObject* CComLuaModule::getObjectFromLua(lua_State* state, sint idx)
 			lua_pushnil(state);
 			while (lua_next(state, -2) != 0)
 			{
-				std::string key = "";
+				std::string key;
 				if ( lua_type(state, -2) == LUA_TSTRING)
 				{
 					key = lua_tostring(state, -2);
@@ -1285,7 +1285,7 @@ CObject* CComLuaModule::getObjectFromLua(lua_State* state, sint idx)
 CObject* CComLuaModule::loadLocal(const std::string& filename, const CScenarioValidator::TValues& values)
 {
 	CScenarioValidator::TValues::const_iterator first(values.begin()), last(values.end());
-	std::string name = "";
+	std::string name;
 	for (; first != last; ++first)
 	{
 		if (first->first == "Name" ) { name = first->second; }
@@ -1347,7 +1347,7 @@ bool CComLuaModule::loadUserComponent(const std::string& filename)
 CObject* CComLuaModule::loadFromBuffer(const std::string& data, const std::string& filename, const CScenarioValidator::TValues& values)
 {
 	CScenarioValidator::TValues::const_iterator first(values.begin()), last(values.end());
-	std::string name = "";
+	std::string name;
 	for (; first != last; ++first)
 	{
 		if (first->first == "Name" ) { name = first->second; }
diff --git a/code/ryzom/client/src/r2/dmc/dmc.cpp b/code/ryzom/client/src/r2/dmc/dmc.cpp
index 4642dfa10..0659f0a56 100644
--- a/code/ryzom/client/src/r2/dmc/dmc.cpp
+++ b/code/ryzom/client/src/r2/dmc/dmc.cpp
@@ -267,7 +267,7 @@ void CDynamicMapClient::save(const std::string& /* filename */)
 void CDynamicMapClient::saveRtData(const std::string& filename)
 {
 	//H_AUTO(R2_CDynamicMapClient_saveRtData)
-	std::string name = "";
+	std::string name;
 	name += filename;
 	//std::ostringstream out2;
 	std::string out2;
diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp
index bb09bec52..aa5995b05 100644
--- a/code/ryzom/client/src/r2/editor.cpp
+++ b/code/ryzom/client/src/r2/editor.cpp
@@ -1789,6 +1789,7 @@ void CEditor::waitScenarioScreen()
 		if (!waitScreen)
 		{
 			TextContext->setShaded(true);
+			TextContext->setShadeOutline(false);
 			TextContext->setFontSize(40);
 			TextContext->setColor(CRGBA::White);
 
@@ -5292,10 +5293,8 @@ void  CEditor::onTestModeDisconnected(TSessionId sessionId, uint32 lastAct, TSce
 	//H_AUTO(R2_CEditor_onTestModeDisconnected)
 	CHECK_EDITOR
 	_DMC->CDynamicMapClient::onTestModeDisconnected(sessionId, lastAct, sessionType);
-
 }
 
-
 // *********************************************************************************************************
 void CEditor::nodeInserted(const std::string& instanceId, const std::string& attrName, sint32 position, const std::string& key, CObject* value)
 {
@@ -6610,7 +6609,7 @@ NLMISC::CVectorD getVectorD(const CObject *obj)
 CObject *buildVector(const NLMISC::CVectorD &vector, const std::string &instanceId /*= ""*/)
 {
 	CObject *table;
-	if (instanceId.empty() )
+	if (instanceId.empty())
 	{
 		table = getEditor().getDMC().newComponent("Position");
 		table->set("x", vector.x);
diff --git a/code/ryzom/client/src/scene_parser.cpp b/code/ryzom/client/src/scene_parser.cpp
index 1108f3a19..484c00129 100644
--- a/code/ryzom/client/src/scene_parser.cpp
+++ b/code/ryzom/client/src/scene_parser.cpp
@@ -123,7 +123,7 @@ void CSceneParser::load(const string &filename)
 
 				char *ptr = strtok(tmpBuff, delimiter);
 				if(ptr != NULL)
-					_FrameRate = atof(ptr);
+					NLMISC::fromString(ptr, _FrameRate);
 			}
 
 			// Close the speed file.
@@ -1693,7 +1693,7 @@ void CSceneParser::loadScene(const string &filename)
 				ptr = strtok(NULL, delimiter);
 				if(ptr != NULL)
 				{
-					seq.second = atof(ptr);
+					NLMISC::fromString(ptr, seq.second);
 					_Scene.push_back(seq);
 				}
 			}
diff --git a/code/ryzom/client/src/session_browser_impl.h b/code/ryzom/client/src/session_browser_impl.h
index 6235128b0..302da2864 100644
--- a/code/ryzom/client/src/session_browser_impl.h
+++ b/code/ryzom/client/src/session_browser_impl.h
@@ -21,7 +21,6 @@
 #include "session_browser.h"
 #include "game_share/ring_session_manager_itf.h"
 #include "nel/gui/lua_helper.h"
-using namespace NLGUI;
 #include "far_tp.h"
 
 class CSessionBrowserImpl : public CSessionBrowser,
@@ -37,7 +36,7 @@ public:
 	  *              - RingAccessPoint:onConnectionClosed()
 	  *              - RingAccessPoint:onConnectionFailed()
 	  */
-	void init(CLuaState *ls);
+	void init(NLGUI::CLuaState *ls);
 	// from CSessionBrowser
 	virtual void on_connectionFailed();
 	virtual void on_connectionClosed();
@@ -99,17 +98,17 @@ public:
 
 	static const std::string &getFrontEndAddress();
 private:
-	CLuaState::TRefPtr _Lua;
-	static int luaGetRingSessionList(CLuaState &ls);
-	static int luaGetRingCharList(CLuaState &ls);
-	static int luaJoinRingSession(CLuaState &ls);
-	static int luaCheckRingAccess(CLuaState &ls);
-	static int luaGetFileHeader(CLuaState &ls);
-	static int luaGetRingStats(CLuaState &ls);
-	static int luaGetScenarioScores(CLuaState &ls);
-	static int luaUpdateScenarioScores(CLuaState &ls);
-	static int luaGetSessionAverageScores(CLuaState &ls);
-	static int luaGetScenarioAverageScores(CLuaState &ls);
+	NLGUI::CLuaState::TRefPtr _Lua;
+	static int luaGetRingSessionList(NLGUI::CLuaState &ls);
+	static int luaGetRingCharList(NLGUI::CLuaState &ls);
+	static int luaJoinRingSession(NLGUI::CLuaState &ls);
+	static int luaCheckRingAccess(NLGUI::CLuaState &ls);
+	static int luaGetFileHeader(NLGUI::CLuaState &ls);
+	static int luaGetRingStats(NLGUI::CLuaState &ls);
+	static int luaGetScenarioScores(NLGUI::CLuaState &ls);
+	static int luaUpdateScenarioScores(NLGUI::CLuaState &ls);
+	static int luaGetSessionAverageScores(NLGUI::CLuaState &ls);
+	static int luaGetScenarioAverageScores(NLGUI::CLuaState &ls);
 	// Call a method inside the 'RingAccessPoint' lua table
 	void callRingAccessPointMethod(const char *name, int numArg, int numResult);
 	void callRingCharTrackingMethod(const char *name, int numArg, int numResult);
diff --git a/code/ryzom/client/src/sky.cpp b/code/ryzom/client/src/sky.cpp
index d5a9216ce..855ab3387 100644
--- a/code/ryzom/client/src/sky.cpp
+++ b/code/ryzom/client/src/sky.cpp
@@ -235,7 +235,7 @@ uint CSky::setup(const CClientDate &date, const CClientDate &animationDate, floa
 	// animate objects
 	if (_PlayListManager)
 	{
-		double globalDate = ((double) _NumHourInDay * date.Day + (double) date.Hour) / _NumHourInDay;
+		double globalDate = (double)date.Hour / (double)_NumHourInDay;
 		//nlinfo("global date = %f", (float) globalDate);
 		_PlayListManager->animate(_AnimLengthInSeconds * globalDate);
 	}
diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp
index f87c6cdee..4a981366d 100644
--- a/code/ryzom/client/src/sound_manager.cpp
+++ b/code/ryzom/client/src/sound_manager.cpp
@@ -106,11 +106,11 @@ enum TFilterMapping
 // constructor
 //-----------------------------------------------
 CSoundManager::CSoundManager(IProgressCallback * /* progressCallBack */)
-:	_AudioMixer(NULL), 
+:	_AudioMixer(NULL),
 	_GroupControllerEffects(NULL),
-	_GroupControllerEffectsGame(NULL),  
-	_EnvSoundRoot(NULL), 
-	_Sources(NULL), 
+	_GroupControllerEffectsGame(NULL),
+	_EnvSoundRoot(NULL),
+	_Sources(NULL),
 	_UserEntitySoundLevel(1.0f)
 {
 	_EnableBackgroundMusicAtTime= 0;
diff --git a/code/ryzom/client/src/time_client.h b/code/ryzom/client/src/time_client.h
index 9243a908d..b3327ee76 100644
--- a/code/ryzom/client/src/time_client.h
+++ b/code/ryzom/client/src/time_client.h
@@ -48,7 +48,7 @@ extern sint64	DT64;		// Diff time with current and last frame in ms.
 extern float	DT;			// Diff time with current and last frame in sec.
 extern TTime	TSend;		// Next Time to send motions.
 extern TTime	DTSend;		// Delta of time to generate the next time to send motions.
-                                 extern double	TimeInSec;	// Time for the current frame in second.
+extern double	TimeInSec;	// Time for the current frame in second.
 extern double	FirstTimeInSec;	// Game local origin time
 
 
diff --git a/code/ryzom/client/src/timed_fx_manager.cpp b/code/ryzom/client/src/timed_fx_manager.cpp
index 9f7f40caf..d37ab782f 100644
--- a/code/ryzom/client/src/timed_fx_manager.cpp
+++ b/code/ryzom/client/src/timed_fx_manager.cpp
@@ -829,6 +829,7 @@ void CTimedFXManager::displayFXBoxes(TDebugDisplayMode displayMode) const
 	Driver->setFrustum(fr);
 	TextContext->setColor(CRGBA::Blue);
 	TextContext->setShaded(false);
+	TextContext->setShadeOutline(false);
 	TextContext->setFontSize(10);
 	//
 	float size = 0.4f;
diff --git a/code/ryzom/client/src/user_agent.cpp b/code/ryzom/client/src/user_agent.cpp
index af07e8b86..1452aa584 100644
--- a/code/ryzom/client/src/user_agent.cpp
+++ b/code/ryzom/client/src/user_agent.cpp
@@ -21,7 +21,7 @@
 
 #include "game_share/ryzom_version.h"
 
-#ifdef HAVE_REVISION_H
+#if defined(RYZOM_COMPATIBILITY_VERSION) && defined(HAVE_REVISION_H)
 #include "revision.h"
 #endif
 
@@ -45,6 +45,16 @@
 #endif
 
 std::string getUserAgent()
+{
+	return getUserAgentName() + "/" + getUserAgentVersion();
+}
+
+std::string getUserAgentName()
+{
+	return "Ryzom";
+}
+
+std::string getUserAgentVersion()
 {
 	static std::string s_userAgent;
 
@@ -52,8 +62,9 @@ std::string getUserAgent()
 	{
 		char buffer[256];
 
-#ifdef REVISION
-		sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
+#if defined(REVISION) && defined(RYZOM_COMPATIBILITY_VERSION)
+		// we don't need RYZOM_VERSION if we already have a numeric form a.b.c, we just need to append revision to it
+		sprintf(buffer, "%s.%s-%s-%s", RYZOM_COMPATIBILITY_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
 #else
 		sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
 #endif
diff --git a/code/ryzom/client/src/user_agent.h b/code/ryzom/client/src/user_agent.h
index e42635871..bc508273d 100644
--- a/code/ryzom/client/src/user_agent.h
+++ b/code/ryzom/client/src/user_agent.h
@@ -18,6 +18,8 @@
 #define CL_USER_AGENT_H
 
 std::string getUserAgent();
+std::string getUserAgentName();
+std::string getUserAgentVersion();
 
 #endif // CL_USER_AGENT_H
 
diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp
index bb632cf4e..62d45f330 100644
--- a/code/ryzom/client/src/user_entity.cpp
+++ b/code/ryzom/client/src/user_entity.cpp
@@ -518,7 +518,7 @@ void CUserEntity::updateVisualPropertyName(const NLMISC::TGameCycle &gameCycle,
 				html->browse("home");
 		}
 	}
-*/	
+*/
 }// updateVisualPropertyName //
 
 //-----------------------------------------------
diff --git a/code/ryzom/common/data_common/r2/r2_misc.lua b/code/ryzom/common/data_common/r2/r2_misc.lua
index 827e91579..d85744bd0 100644
--- a/code/ryzom/common/data_common/r2/r2_misc.lua
+++ b/code/ryzom/common/data_common/r2/r2_misc.lua
@@ -187,7 +187,7 @@ end
 function strify(str) 
 	return [["]] .. tostring(str) .. [["]]
 end	
-		
+
 -------------------------------------------------------------------------------------------------
 -- enclose a string by double quotes
 function strifyXml(str)
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml b/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
index de424f76f..d9aae794a 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
+++ b/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
@@ -1112,7 +1112,7 @@
 		<PARAMETER NAME="faction/quantity" TYPE="string" VISIBLE="true"/>
 		<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
 	</PRIMITIVE>
-	
+
 	<PRIMITIVE CLASS_NAME="talk_to" TYPE="node"  PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="talk_to $npc_name$"/>
 		<!-- talk to param-->
@@ -1126,7 +1126,7 @@
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="cast $spell$"/>
 						
 		<PARAMETER NAME="action" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>		
+		<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
 	</PRIMITIVE>
 	
 	<PRIMITIVE CLASS_NAME="forage" TYPE="node" PARENT_CLASS="objective_parent">
@@ -5023,13 +5023,13 @@
 		</PARAMETER>
 		<PARAMETER NAME="entity id" TYPE="string" VISIBLE="true" READ_ONLY="true">
 		</PARAMETER>
-		<PARAMETER NAME= "Sheet"			TYPE="string" READ_ONLY="true" VISIBLE="true">
+		<PARAMETER NAME= "Sheet" TYPE="string" READ_ONLY="true" VISIBLE="true">
 			<DEFAULT_VALUE VALUE="unknown"/>
 		</PARAMETER>
-		<PARAMETER NAME= "HitPoints"		TYPE="string" READ_ONLY="true" VISIBLE="true"> 
+		<PARAMETER NAME= "HitPoints" TYPE="string" READ_ONLY="true" VISIBLE="true"> 
 			<DEFAULT_VALUE VALUE="0"/>
 		</PARAMETER>
-		<PARAMETER NAME= "MaxHitPoints"		TYPE="string" READ_ONLY="true" VISIBLE="true"> 
+		<PARAMETER NAME= "MaxHitPoints" TYPE="string" READ_ONLY="true" VISIBLE="true"> 
 			<DEFAULT_VALUE VALUE="0"/>
 		</PARAMETER>
 		<PARAMETER NAME= "Mode"		TYPE="string" READ_ONLY="true" VISIBLE="true"> 
diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp b/code/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp
index 2e1d474b2..801d78433 100644
--- a/code/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp
+++ b/code/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp
@@ -381,7 +381,7 @@ void CBSIINonModule::activate()
 	// setup the callback array
 	CUnifiedNetwork::getInstance()->addCallbackArray( CbArray, sizeof(CbArray)/sizeof(CbArray[0]) );
 
-	string host = BackupServiceIP;
+	string host = BackupServiceIP.get();
 	if(host.empty())
 	{
 		nlwarning("Can't use backup because BSHost variable is empty");
diff --git a/code/ryzom/common/src/game_share/base_types.h b/code/ryzom/common/src/game_share/base_types.h
index 250e5f5e4..5330537b7 100644
--- a/code/ryzom/common/src/game_share/base_types.h
+++ b/code/ryzom/common/src/game_share/base_types.h
@@ -238,8 +238,7 @@ public:
 
 		CHashCode() {}
 
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 
 		size_t	operator () ( const TDataSetRow &index ) const { return index.getHashCode(); }
 
diff --git a/code/ryzom/common/src/game_share/brick_types.h b/code/ryzom/common/src/game_share/brick_types.h
index fafdb2e4f..871a02cfb 100644
--- a/code/ryzom/common/src/game_share/brick_types.h
+++ b/code/ryzom/common/src/game_share/brick_types.h
@@ -43,7 +43,7 @@ namespace BRICK_TYPE
 		TIMED_ACTION,
 		BRICK_TYPE_COUNT,
 		BONUS,
-		UNKNOWN
+		UNKNOWN // Warning: Shouldn't exceed 32
 	};
 
 
diff --git a/code/ryzom/common/src/game_share/crypt.cpp b/code/ryzom/common/src/game_share/crypt.cpp
index 0da908817..1750d5d20 100644
--- a/code/ryzom/common/src/game_share/crypt.cpp
+++ b/code/ryzom/common/src/game_share/crypt.cpp
@@ -18,16 +18,15 @@
 
 #include "crypt.h"
 
-char * rz_crypt(register const char *key, register const char *setting);
-
+char * rz_crypt(register const char *key, register const char *setting, char *buf);
+char *__crypt_sha512(const char *key, const char *setting, char *output);
 
 
 // Crypts password using salt
 std::string	CCrypt::crypt(const std::string& password, const std::string& salt)
 {
-	std::string		result = ::rz_crypt(password.c_str(), salt.c_str());
-
-	return result;
+	char buf[128];
+	return ::rz_crypt(password.c_str(), salt.c_str(), buf);
 }
 
 
@@ -506,7 +505,7 @@ static char	cryptresult[1+4+4+11+1];	/* encrypted result */
  * Return a pointer to static data consisting of the "setting"
  * followed by an encryption produced by the "key" and "setting".
  */
-char * rz_crypt(register const char *key, register const char *setting) {
+char * rz_crypt(register const char *key, register const char *setting, char *buf) {
 	register char *encp;
 	register long i;
 	register int t;
@@ -521,6 +520,10 @@ char * rz_crypt(register const char *key, register const char *setting) {
 	return buff;
 #endif
 
+	if (strlen(setting) >= 2 && setting[0] == '$' && setting[1] == '6') {
+		return __crypt_sha512(key, setting, buf);
+	}
+
 	for (i = 0; i < 8; i++) {
 		if ((t = 2*(unsigned char)(*key)) != 0)
 			key++;
diff --git a/code/ryzom/common/src/game_share/crypt.h b/code/ryzom/common/src/game_share/crypt.h
index ea479d74f..b9fa8556b 100644
--- a/code/ryzom/common/src/game_share/crypt.h
+++ b/code/ryzom/common/src/game_share/crypt.h
@@ -32,7 +32,7 @@ class CCrypt
 public:
 
 	/// Crypts password using salt
-	static std::string	crypt(const std::string& password, const std::string& salt);
+	static std::string crypt(const std::string& password, const std::string& salt);
 
 };
 
diff --git a/code/ryzom/common/src/game_share/crypt_sha512.cpp b/code/ryzom/common/src/game_share/crypt_sha512.cpp
new file mode 100644
index 000000000..4d151880d
--- /dev/null
+++ b/code/ryzom/common/src/game_share/crypt_sha512.cpp
@@ -0,0 +1,375 @@
+/*
+ * public domain sha512 crypt implementation
+ *
+ * original sha crypt design: http://people.redhat.com/drepper/SHA-crypt.txt
+ * in this implementation at least 32bit int is assumed,
+ * key length is limited, the $6$ prefix is mandatory, '\n' and ':' is rejected
+ * in the salt and rounds= setting must contain a valid iteration count,
+ * on error "*" is returned.
+ */
+
+#include <nel/misc/types_nl.h>
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+/* public domain sha512 implementation based on fips180-3 */
+/* >=2^64 bits messages are not supported (about 2000 peta bytes) */
+
+struct sha512 {
+  uint64 len;     /* processed message length */
+  uint64 h[8];    /* hash state */
+  uint8 buf[128]; /* message block buffer */
+};
+
+static uint64 ror(uint64 n, int k) { return (n >> k) | (n << (64-k)); }
+#define Ch(x,y,z)  (z ^ (x & (y ^ z)))
+#define Maj(x,y,z) ((x & y) | (z & (x | y)))
+#define S0(x)      (ror(x,28) ^ ror(x,34) ^ ror(x,39))
+#define S1(x)      (ror(x,14) ^ ror(x,18) ^ ror(x,41))
+#define R0(x)      (ror(x,1) ^ ror(x,8) ^ (x>>7))
+#define R1(x)      (ror(x,19) ^ ror(x,61) ^ (x>>6))
+
+static const uint64 K[80] = {
+  0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
+  0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
+  0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
+  0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
+  0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
+  0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
+  0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
+  0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
+  0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
+  0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
+  0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
+  0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
+  0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
+  0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
+  0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
+  0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
+  0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
+  0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
+  0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
+  0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+};
+
+static void processblock(struct sha512 *s, const uint8 *buf)
+{
+  uint64 W[80], t1, t2, a, b, c, d, e, f, g, h;
+  int i;
+
+  for (i = 0; i < 16; i++) {
+    W[i] = (uint64)buf[8*i]<<56;
+    W[i] |= (uint64)buf[8*i+1]<<48;
+    W[i] |= (uint64)buf[8*i+2]<<40;
+    W[i] |= (uint64)buf[8*i+3]<<32;
+    W[i] |= (uint64)buf[8*i+4]<<24;
+    W[i] |= (uint64)buf[8*i+5]<<16;
+    W[i] |= (uint64)buf[8*i+6]<<8;
+    W[i] |= buf[8*i+7];
+  }
+  for (; i < 80; i++)
+    W[i] = R1(W[i-2]) + W[i-7] + R0(W[i-15]) + W[i-16];
+  a = s->h[0];
+  b = s->h[1];
+  c = s->h[2];
+  d = s->h[3];
+  e = s->h[4];
+  f = s->h[5];
+  g = s->h[6];
+  h = s->h[7];
+  for (i = 0; i < 80; i++) {
+    t1 = h + S1(e) + Ch(e,f,g) + K[i] + W[i];
+    t2 = S0(a) + Maj(a,b,c);
+    h = g;
+    g = f;
+    f = e;
+    e = d + t1;
+    d = c;
+    c = b;
+    b = a;
+    a = t1 + t2;
+  }
+  s->h[0] += a;
+  s->h[1] += b;
+  s->h[2] += c;
+  s->h[3] += d;
+  s->h[4] += e;
+  s->h[5] += f;
+  s->h[6] += g;
+  s->h[7] += h;
+}
+
+static void pad(struct sha512 *s)
+{
+  unsigned r = s->len % 128;
+
+  s->buf[r++] = 0x80;
+  if (r > 112) {
+    memset(s->buf + r, 0, 128 - r);
+    r = 0;
+    processblock(s, s->buf);
+  }
+  memset(s->buf + r, 0, 120 - r);
+  s->len *= 8;
+  s->buf[120] = s->len >> 56;
+  s->buf[121] = s->len >> 48;
+  s->buf[122] = s->len >> 40;
+  s->buf[123] = s->len >> 32;
+  s->buf[124] = s->len >> 24;
+  s->buf[125] = s->len >> 16;
+  s->buf[126] = s->len >> 8;
+  s->buf[127] = s->len;
+  processblock(s, s->buf);
+}
+
+static void sha512_init(struct sha512 *s)
+{
+  s->len = 0;
+  s->h[0] = 0x6a09e667f3bcc908ULL;
+  s->h[1] = 0xbb67ae8584caa73bULL;
+  s->h[2] = 0x3c6ef372fe94f82bULL;
+  s->h[3] = 0xa54ff53a5f1d36f1ULL;
+  s->h[4] = 0x510e527fade682d1ULL;
+  s->h[5] = 0x9b05688c2b3e6c1fULL;
+  s->h[6] = 0x1f83d9abfb41bd6bULL;
+  s->h[7] = 0x5be0cd19137e2179ULL;
+}
+
+static void sha512_sum(struct sha512 *s, uint8 *md)
+{
+  int i;
+
+  pad(s);
+  for (i = 0; i < 8; i++) {
+    md[8*i] = s->h[i] >> 56;
+    md[8*i+1] = s->h[i] >> 48;
+    md[8*i+2] = s->h[i] >> 40;
+    md[8*i+3] = s->h[i] >> 32;
+    md[8*i+4] = s->h[i] >> 24;
+    md[8*i+5] = s->h[i] >> 16;
+    md[8*i+6] = s->h[i] >> 8;
+    md[8*i+7] = s->h[i];
+  }
+}
+
+static void sha512_update(struct sha512 *s, const void *m, unsigned long len)
+{
+  const uint8 *p = (uint8 *)m;
+  unsigned r = s->len % 128;
+
+  s->len += len;
+  if (r) {
+    if (len < 128 - r) {
+      memcpy(s->buf + r, p, len);
+      return;
+    }
+    memcpy(s->buf + r, p, 128 - r);
+    len -= 128 - r;
+    p += 128 - r;
+    processblock(s, s->buf);
+  }
+  for (; len >= 128; len -= 128, p += 128)
+    processblock(s, p);
+  memcpy(s->buf, p, len);
+}
+
+static const unsigned char b64[] =
+  "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+static char *to64(char *s, unsigned int u, int n)
+{
+  while (--n >= 0) {
+    *s++ = b64[u % 64];
+    u /= 64;
+  }
+  return s;
+}
+
+/* key limit is not part of the original design, added for DoS protection.
+ * rounds limit has been lowered (versus the reference/spec), also for DoS
+ * protection. runtime is O(klen^2 + klen*rounds) */
+#define KEY_MAX 256
+#define SALT_MAX 16
+#define ROUNDS_DEFAULT 5000
+#define ROUNDS_MIN 1000
+#define ROUNDS_MAX 9999999
+
+/* hash n bytes of the repeated md message digest */
+static void hashmd(struct sha512 *s, unsigned int n, const void *md)
+{
+  unsigned int i;
+
+  for (i = n; i > 64; i -= 64)
+    sha512_update(s, md, 64);
+  sha512_update(s, md, i);
+}
+
+static char *sha512crypt(const char *key, const char *setting, char *output)
+{
+  struct sha512 ctx;
+  unsigned char md[64], kmd[64], smd[64];
+  unsigned int i, r, klen, slen;
+  char rounds[20] = "";
+  const char *salt;
+  char *p;
+
+  /* reject large keys */
+  for (i = 0; i <= KEY_MAX && key[i]; i++);
+  if (i > KEY_MAX)
+    return 0;
+  klen = i;
+
+  /* setting: $6$rounds=n$salt$ (rounds=n$ and closing $ are optional) */
+  if (strncmp(setting, "$6$", 3) != 0)
+    return 0;
+  salt = setting + 3;
+
+  r = ROUNDS_DEFAULT;
+  if (strncmp(salt, "rounds=", sizeof "rounds=" - 1) == 0) {
+    unsigned long u;
+    char *end;
+
+    /*
+     * this is a deviation from the reference:
+     * bad rounds setting is rejected if it is
+     * - empty
+     * - unterminated (missing '$')
+     * - begins with anything but a decimal digit
+     * the reference implementation treats these bad
+     * rounds as part of the salt or parse them with
+     * strtoul semantics which may cause problems
+     * including non-portable hashes that depend on
+     * the host's value of ULONG_MAX.
+     */
+    salt += sizeof "rounds=" - 1;
+    if (!isdigit(*salt))
+      return 0;
+    u = strtoul(salt, &end, 10);
+    if (*end != '$')
+      return 0;
+    salt = end+1;
+    if (u < ROUNDS_MIN)
+      r = ROUNDS_MIN;
+    else if (u > ROUNDS_MAX)
+      r = ROUNDS_MAX;
+    else
+      r = u;
+    /* needed when rounds is zero prefixed or out of bounds */
+    sprintf(rounds, "rounds=%u$", r);
+  }
+
+  for (i = 0; i < SALT_MAX && salt[i] && salt[i] != '$'; i++)
+    /* reject characters that interfere with /etc/shadow parsing */
+    if (salt[i] == '\n' || salt[i] == ':')
+      return 0;
+  slen = i;
+
+  /* B = sha(key salt key) */
+  sha512_init(&ctx);
+  sha512_update(&ctx, key, klen);
+  sha512_update(&ctx, salt, slen);
+  sha512_update(&ctx, key, klen);
+  sha512_sum(&ctx, md);
+
+  /* A = sha(key salt repeat-B alternate-B-key) */
+  sha512_init(&ctx);
+  sha512_update(&ctx, key, klen);
+  sha512_update(&ctx, salt, slen);
+  hashmd(&ctx, klen, md);
+  for (i = klen; i > 0; i >>= 1)
+    if (i & 1)
+      sha512_update(&ctx, md, sizeof md);
+    else
+      sha512_update(&ctx, key, klen);
+  sha512_sum(&ctx, md);
+
+  /* DP = sha(repeat-key), this step takes O(klen^2) time */
+  sha512_init(&ctx);
+  for (i = 0; i < klen; i++)
+    sha512_update(&ctx, key, klen);
+  sha512_sum(&ctx, kmd);
+
+  /* DS = sha(repeat-salt) */
+  sha512_init(&ctx);
+  for (i = 0; i < 16 + md[0]; i++)
+    sha512_update(&ctx, salt, slen);
+  sha512_sum(&ctx, smd);
+
+  /* iterate A = f(A,DP,DS), this step takes O(rounds*klen) time */
+  for (i = 0; i < r; i++) {
+    sha512_init(&ctx);
+    if (i % 2)
+      hashmd(&ctx, klen, kmd);
+    else
+      sha512_update(&ctx, md, sizeof md);
+    if (i % 3)
+      sha512_update(&ctx, smd, slen);
+    if (i % 7)
+      hashmd(&ctx, klen, kmd);
+    if (i % 2)
+      sha512_update(&ctx, md, sizeof md);
+    else
+      hashmd(&ctx, klen, kmd);
+    sha512_sum(&ctx, md);
+  }
+
+  /* output is $6$rounds=n$salt$hash */
+  p = output;
+  p += sprintf(p, "$6$%s%.*s$", rounds, slen, salt);
+#if 1
+  static const unsigned char perm[][3] = {
+    0,21,42,22,43,1,44,2,23,3,24,45,25,46,4,
+    47,5,26,6,27,48,28,49,7,50,8,29,9,30,51,
+    31,52,10,53,11,32,12,33,54,34,55,13,56,14,35,
+    15,36,57,37,58,16,59,17,38,18,39,60,40,61,19,
+    62,20,41 };
+  for (i=0; i<21; i++) p = to64(p,
+                                (md[perm[i][0]]<<16)|(md[perm[i][1]]<<8)|md[perm[i][2]], 4);
+#else
+  p = to64(p, (md[0]<<16)|(md[21]<<8)|md[42], 4);
+  p = to64(p, (md[22]<<16)|(md[43]<<8)|md[1], 4);
+  p = to64(p, (md[44]<<16)|(md[2]<<8)|md[23], 4);
+  p = to64(p, (md[3]<<16)|(md[24]<<8)|md[45], 4);
+  p = to64(p, (md[25]<<16)|(md[46]<<8)|md[4], 4);
+  p = to64(p, (md[47]<<16)|(md[5]<<8)|md[26], 4);
+  p = to64(p, (md[6]<<16)|(md[27]<<8)|md[48], 4);
+  p = to64(p, (md[28]<<16)|(md[49]<<8)|md[7], 4);
+  p = to64(p, (md[50]<<16)|(md[8]<<8)|md[29], 4);
+  p = to64(p, (md[9]<<16)|(md[30]<<8)|md[51], 4);
+  p = to64(p, (md[31]<<16)|(md[52]<<8)|md[10], 4);
+  p = to64(p, (md[53]<<16)|(md[11]<<8)|md[32], 4);
+  p = to64(p, (md[12]<<16)|(md[33]<<8)|md[54], 4);
+  p = to64(p, (md[34]<<16)|(md[55]<<8)|md[13], 4);
+  p = to64(p, (md[56]<<16)|(md[14]<<8)|md[35], 4);
+  p = to64(p, (md[15]<<16)|(md[36]<<8)|md[57], 4);
+  p = to64(p, (md[37]<<16)|(md[58]<<8)|md[16], 4);
+  p = to64(p, (md[59]<<16)|(md[17]<<8)|md[38], 4);
+  p = to64(p, (md[18]<<16)|(md[39]<<8)|md[60], 4);
+  p = to64(p, (md[40]<<16)|(md[61]<<8)|md[19], 4);
+  p = to64(p, (md[62]<<16)|(md[20]<<8)|md[41], 4);
+#endif
+  p = to64(p, md[63], 2);
+  *p = 0;
+  return output;
+}
+
+char *__crypt_sha512(const char *key, const char *setting, char *output)
+{
+  static const char testkey[] = "Xy01@#\x01\x02\x80\x7f\xff\r\n\x81\t !";
+  static const char testsetting[] = "$6$rounds=1234$abc0123456789$";
+  static const char testhash[] = "$6$rounds=1234$abc0123456789$BCpt8zLrc/RcyuXmCDOE1ALqMXB2MH6n1g891HhFj8.w7LxGv.FTkqq6Vxc/km3Y0jE0j24jY5PIv/oOu6reg1";
+  char testbuf[128];
+  char *p, *q;
+
+  p = sha512crypt(key, setting, output);
+
+  /* self test and stack cleanup */
+  q = sha512crypt(testkey, testsetting, testbuf);
+  if (!p || q != testbuf || memcmp(testbuf, testhash, sizeof(testhash)))
+    return "*";
+
+  return p;
+}
diff --git a/code/ryzom/common/src/game_share/deployment_configuration.cpp b/code/ryzom/common/src/game_share/deployment_configuration.cpp
index 52fc9087c..8957c89ac 100644
--- a/code/ryzom/common/src/game_share/deployment_configuration.cpp
+++ b/code/ryzom/common/src/game_share/deployment_configuration.cpp
@@ -313,13 +313,13 @@ namespace DEPCFG
 
 	void CInfoBlock::addUseEntry(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
 	{
-		DROP_IF(_UseEntries.find(entry)!=_UseEntries.end(),context+"Ignoring duplicate refference to 'use' clause: "+entry,return);
+		DROP_IF(_UseEntries.find(entry) != _UseEntries.end(), context + "Ignoring duplicate refference to 'use' clause: " + entry.c_str(), return);
 		_UseEntries.insert(entry);
 	}
 
 	void CInfoBlock::addDataEntry(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
 	{
-		DROP_IF(_DataEntries.find(entry)!=_DataEntries.end(),context+"Ignoring duplicate refference to 'data' clause: "+entry,return);
+		DROP_IF(_DataEntries.find(entry) != _DataEntries.end(), context + "Ignoring duplicate refference to 'data' clause: " + entry.c_str(), return);
 		_DataEntries.insert(entry);
 	}
 
@@ -406,10 +406,10 @@ namespace DEPCFG
 			
 			// try to get a pointer to the refferenced info block...
 			CInfoBlock* infoBlockPtr= container->getInfoBlock(theEntry);
-			DROP_IF(infoBlockPtr==NULL,"Failed to find block named '"+theEntry+"' while fixing up children of block: "+_Name, ++errors;continue);
+			DROP_IF(infoBlockPtr == NULL, "Failed to find block named '" + theEntry + "' while fixing up children of block: " + _Name.c_str(), ++errors; continue);
 
 			// make sure that this block doesn't figure amongst the children of the refferenced info block (to avoid circular refs)
-			DROP_IF(_haveCircularRef(infoBlockPtr),"Circular dependency found between definitions of '"+_Name+"' and '"+theEntry+"'", ++errors;continue);
+			DROP_IF(_haveCircularRef(infoBlockPtr), "Circular dependency found between definitions of '" + _Name + "' and '" + theEntry.c_str() + "'", ++errors; continue);
 
 			// add the info block to our children
 			_Children.push_back(infoBlockPtr);
@@ -431,7 +431,7 @@ namespace DEPCFG
 		DROP_IF(!_ShardName.empty() && !theExe.ShardName.empty(),	"more than one shard found in: "+theExe.FullName,	++errors );
 		DROP_IF(!_CmdLine.empty() && !theExe.CmdLine.empty(),		"more than one cmdLine found in: "+theExe.FullName,		++errors );
 		DROP_IF(!_Host.empty() && !theExe.Host.empty(),				"more than one host found in: "+theExe.FullName,	++errors );
-		WARN_IF(!_UniqueName.empty() && !theExe.UniqueName.empty(),	"replacing name '"+theExe.UniqueName+"' with '"+_UniqueName+"' in: "+theExe.FullName);
+		WARN_IF(!_UniqueName.empty() && !theExe.UniqueName.empty(), "replacing name '" + theExe.UniqueName + "' with '" + _UniqueName.c_str() + "' in: " + theExe.FullName.c_str());
 
 		// fill our own data into the exe record
 		if (!_DomainName.empty())	theExe.DomainName =	_DomainName;
@@ -645,22 +645,22 @@ namespace DEPCFG
 			// try to treat the keyword
 			if (keyword=="include")
 			{
-				DROP_IF(args.empty(),context+"No file name found following 'include': "+line, ++errors;continue);
-				DROP_IF(fileNameSet.find(args)!=fileNameSet.end(),context+"Warning: Duplicate 'include' block ignored: "+line, continue);
+				DROP_IF(args.empty(), context + "No file name found following 'include': " + line.c_str(), ++errors; continue);
+				DROP_IF(fileNameSet.find(args) != fileNameSet.end(), context + "Warning: Duplicate 'include' block ignored: " + line.c_str(), continue);
 				fileNameSet.insert(args);
 				_readFile(args.unquoteIfQuoted(),errors,fileNameSet);
 			}
 			else if (keyword=="define")
 			{
-				DROP_IF(args.empty(),context+"No block name found following 'define': "+line, ++errors;continue);
-				DROP_IF(_InfoBlocks.find(args)!=_InfoBlocks.end(),context+"Duplicate 'define' block found: "+line, ++errors;continue);
+				DROP_IF(args.empty(), context + "No block name found following 'define': " + line.c_str(), ++errors; continue);
+				DROP_IF(_InfoBlocks.find(args) != _InfoBlocks.end(), context + "Duplicate 'define' block found: " + line.c_str(), ++errors; continue);
 				// create a new info block and push it into our infoblock set
 				_CurrentInfoBlock= new CInfoBlock(args);
 				_InfoBlocks[args]= _CurrentInfoBlock;
 			}
 			else
 			{
-				DROP_IF(_CurrentInfoBlock==NULL,context+"Expecting 'define <block_name>' but found: "+line, ++errors;continue);
+				DROP_IF(_CurrentInfoBlock == NULL, context + "Expecting 'define <block_name>' but found: " + line.c_str(), ++errors; continue);
 
 				if		(keyword=="domain")			{ _CurrentInfoBlock->setDomainName(args,context,errors); }
 				else if	(keyword=="shard")			{ _CurrentInfoBlock->setShardName(args,context,errors); }
@@ -674,7 +674,7 @@ namespace DEPCFG
 				else if	(keyword=="cfgAfter")		{ _CurrentInfoBlock->addCfgEntryPost(rawArgs,context,errors); }
 				else if	(keyword=="cfgFile")		{ _CurrentInfoBlock->addCfgFile(args,context,errors); }
 				else if	(keyword=="cfgFileAfter")	{ _CurrentInfoBlock->addCfgFilePost(args,context,errors); }
-				else								{ DROP(context+"Unrecognised keyword: "+line, ++errors;continue); }
+				else								{ DROP(context + "Unrecognised keyword: " + line.c_str(), ++errors; continue); }
 			}
 		}
 	}
@@ -725,7 +725,7 @@ namespace DEPCFG
 				// yell if the name already looks like a 'fixed up' name
 				DROP_IF(name.right(3).left(1)=="_" && (name.right(2)=="00" || name.right(2).atoui()!=0),"Appending '_' to name ending in '_00' style format as this can clash with auto renumbering => "+name+'_',name+='_')
 				// compose a second version of the name with the shard name added
-				NLMISC::CSString name_with_shard= name+'_'+it2->ShardName;
+				NLMISC::CSString name_with_shard = name + '_' + it2->ShardName.c_str();
 				// insert both versions of the name into the unique name counter
 				++nameCounts[name];
 				++nameCounts[name_with_shard];
@@ -1123,7 +1123,7 @@ namespace DEPCFG
 			result.CfgFile= 
 				"// Auto generated config file\n"
 				"// Use with commandline: "+theApp.CmdLine+"\n"
-				"AESAliasName= \""+appName+"\";\n"
+				"AESAliasName= \"" + appName.c_str() + "\";\n"
 				"\n";
 
 			// copy the cfg set to the result record (the cfgAfter set should have been merged in already)
diff --git a/code/ryzom/common/src/game_share/fame.cpp b/code/ryzom/common/src/game_share/fame.cpp
index b453bca4e..ca226ecdc 100644
--- a/code/ryzom/common/src/game_share/fame.cpp
+++ b/code/ryzom/common/src/game_share/fame.cpp
@@ -479,10 +479,9 @@ void CStaticFames::loadStaticFame( const string& filename )
 				else
 					NLMISC::fromString(s.substr(sep+1, s.size()-sep-1), factor);
 				// Fames in file are in [-600;600] so don't forget 1000 factor
-				sint32 fame;
 				float fameFloat;
 				NLMISC::fromString(s.substr(0, sep), fameFloat);
-				fame = (sint32)(fameFloat * 1000.f);
+				sint32 fame = (sint32)(fameFloat * 1000.f);
 
 				_FameTable[iFaction*_FameTableSize + jFaction] = fame;
 				_PropagationFactorTable[iFaction*_FameTableSize + jFaction] = factor;
diff --git a/code/ryzom/common/src/game_share/people_pd.h b/code/ryzom/common/src/game_share/people_pd.h
index 379a09378..ffcf8732f 100644
--- a/code/ryzom/common/src/game_share/people_pd.h
+++ b/code/ryzom/common/src/game_share/people_pd.h
@@ -51,6 +51,7 @@ public:
 
 	enum TPeople
 	{
+		Undefined = -1,
 		Humanoid = 0,
 		Playable = 0,
 		Fyros = 0,
diff --git a/code/ryzom/common/src/game_share/persistent_data_inline.h b/code/ryzom/common/src/game_share/persistent_data_inline.h
index 72ef3fc9d..a2d575eef 100644
--- a/code/ryzom/common/src/game_share/persistent_data_inline.h
+++ b/code/ryzom/common/src/game_share/persistent_data_inline.h
@@ -706,7 +706,12 @@ inline float CPersistentDataRecord::CArg::asFloat() const
 	case UINT64:		return (float)(uint64)_Value.i64;
 	case FLOAT32:		return (float)_Value.f32;
 	case FLOAT64:		return (float)_Value.f64;
-	case STRING:		return (float)atof(_String.c_str());
+	case STRING:
+	{
+		float val;
+		NLMISC::fromString(_String, val);
+		return val;
+	}
 	case FLAG:			return 1.0f;
 	case EXTEND_TYPE:
 		switch(_Value.ExType)
@@ -733,7 +738,12 @@ inline double CPersistentDataRecord::CArg::asDouble() const
 	case UINT64:		return (double)(uint64)_Value.i64;
 	case FLOAT32:		return (double)_Value.f32;
 	case FLOAT64:		return (double)_Value.f64;
-	case STRING:		return (double)atof(_String.c_str());
+	case STRING:
+	{
+		double val;
+		NLMISC::fromString(_String, val);
+		return val;
+	}
 	case FLAG:			return 1.0;
 	case EXTEND_TYPE:
 		switch(_Value.ExType)
diff --git a/code/ryzom/common/src/game_share/persistent_data_tree.cpp b/code/ryzom/common/src/game_share/persistent_data_tree.cpp
index 63252a70c..feefbad1c 100644
--- a/code/ryzom/common/src/game_share/persistent_data_tree.cpp
+++ b/code/ryzom/common/src/game_share/persistent_data_tree.cpp
@@ -139,10 +139,10 @@ bool CPersistentDataTreeNode::attachToParent(CPersistentDataTreeNode* parent)
 bool CPersistentDataTreeNode::attachToParent(CPersistentDataTreeNode* parent,uint32 idx)
 {
 	// check value of 'idx'
-	BOMB_IF(parent!=NULL && idx>1024*1024,"Implausibly high number of children requested ("+NLMISC::toString("%d",idx)+") for persistent data tree node: "+parent->getNodeName(),return false);
+	BOMB_IF(parent != NULL && idx>1024 * 1024, "Implausibly high number of children requested (" + NLMISC::toString("%d", idx) + ") for persistent data tree node: " + parent->getNodeName().c_str(), return false);
 
 	// check for attachment to previous parent
-	BOMB_IF(_Parent!=NULL,"Attempting to attach a persistent data node to parent '"+(parent==NULL?"NULL":parent->getNodeName())+"' when it's already attached to another parent as: "+getNodeName(),return false);
+	BOMB_IF(_Parent != NULL, "Attempting to attach a persistent data node to parent '" + (parent == NULL ? "NULL" : parent->getNodeName()) + "' when it's already attached to another parent as: " + getNodeName().c_str(), return false);
 
 	// split the name into its component parts
 	CSString mapIndex= _Name;
@@ -159,7 +159,7 @@ bool CPersistentDataTreeNode::attachToParent(CPersistentDataTreeNode* parent,uin
 	if (parent!=NULL)
 	{
 		// check parent isn't a value
-		BOMB_IF(parent->_IsValue,"Attempting to attach a persistent data node to parent that has a value '"+parent->getNodeName()+"' = "+parent->_Value,return false);
+		BOMB_IF(parent->_IsValue, "Attempting to attach a persistent data node to parent that has a value '" + parent->getNodeName() + "' = " + parent->_Value.c_str(), return false);
 
 		if (hasExplicitIndex)
 		{
@@ -179,7 +179,7 @@ bool CPersistentDataTreeNode::attachToParent(CPersistentDataTreeNode* parent,uin
 				}
 
 				// ensure that there isn't already a node with the same '#' value attached to the same parent
-				DROP_IF(parent->_ChildIndex.find(nameBase+'#'+mapIndex)!=parent->_ChildIndex.end(),"Failed to add child '"+_Name+"' to parent '"+parent->getNodeName()+"' because another child of same name already exists",return false);
+				DROP_IF(parent->_ChildIndex.find(nameBase + '#' + mapIndex.c_str()) != parent->_ChildIndex.end(), "Failed to add child '" + _Name + "' to parent '" + parent->getNodeName().c_str() + "' because another child of same name already exists", return false);
 			}
 		}
 		if (!hasExplicitIndex)
@@ -190,7 +190,7 @@ bool CPersistentDataTreeNode::attachToParent(CPersistentDataTreeNode* parent,uin
 		}
 
 		// construct our cleaned up name from its constituent parts
-		_Name= nameBase+'#'+mapIndex;
+		_Name = nameBase + '#' + mapIndex.c_str();
 
 		// setup own _Parent property and ensure that there are no trailing spaces round the _Name
 		_Parent= parent;
@@ -205,7 +205,7 @@ bool CPersistentDataTreeNode::attachToParent(CPersistentDataTreeNode* parent,uin
 		}
 
 		// ensure that there isn't another child already assigned to this parent slot
-		BOMB_IF(_Parent->_Children[idx]!=NULL,"Ignoring attempt to add second child to same slot ("+NLMISC::toString("%d",idx)+") in persistent data tree node's children: "+_Parent->getNodeName(),return false);
+		BOMB_IF(_Parent->_Children[idx] != NULL, "Ignoring attempt to add second child to same slot (" + NLMISC::toString("%d", idx) + ") in persistent data tree node's children: " + _Parent->getNodeName().c_str(), return false);
 
 		// write own pointer into parent's _Children vector
 		_Parent->_Children[idx]= this;
@@ -239,7 +239,7 @@ bool CPersistentDataTreeNode::readFromPdr(CPersistentDataRecord& pdr)
 				return false;
 
 			// pop the end of block token for the block we just finished processing
-			DROP_IF(pdr.peekNextToken()!=token,"ERROR: End of "+pdr.lookupString(token)+" block expected but not found at: "+getNodeName(),return false);
+			DROP_IF(pdr.peekNextToken() != token, "ERROR: End of " + pdr.lookupString(token) + " block expected but not found at: " + getNodeName().c_str(), return false);
 			pdr.popStructEnd(token);
 		}
 		else if (pdr.isEndOfStruct())
@@ -259,7 +259,7 @@ bool CPersistentDataTreeNode::readFromPdr(CPersistentDataRecord& pdr)
 				// extract the map key and ensure that it's followed by a valid __Val__ entry
 				CSString mapKey;
 				pdr.pop(mapKeyToken,mapKey);
-				DROP_IF(pdr.isEndOfData() || pdr.peekNextToken()!=mapValToken,"ERROR: Ignoring map key (__Key__) because __Val__ token expected but not found at: "+getNodeName()+":"+mapKey,continue);
+				DROP_IF(pdr.isEndOfData() || pdr.peekNextToken() != mapValToken, "ERROR: Ignoring map key (__Key__) because __Val__ token expected but not found at: " + getNodeName() + ":" + mapKey.c_str(), continue);
 				if (needsQuotes(mapKey))
 					mapKey=mapKey.quote();
 
@@ -278,7 +278,7 @@ bool CPersistentDataTreeNode::readFromPdr(CPersistentDataRecord& pdr)
 						return false;
 
 					// pop the end of struct marker
-					DROP_IF(pdr.peekNextToken()!=mapValToken,"ERROR: End of __Val__ block expected but not found at: "+getNodeName()+":"+mapKey,return false);
+					DROP_IF(pdr.peekNextToken() != mapValToken, "ERROR: End of __Val__ block expected but not found at: " + getNodeName() + ":" + mapKey.c_str(), return false);
 					pdr.popStructEnd(mapValToken);
 				}
 				else
@@ -419,9 +419,9 @@ bool CPersistentDataTreeNode::writeToBuffer(NLMISC::CSString& buffer) const
 	{
 		// write a value
 		if (needsQuotes(_Value))
-			buffer+= getNodeName()+"=="+_Value.quote()+"\n";
+			buffer += getNodeName() + "==" + _Value.quote().c_str() + "\n";
 		else
-			buffer+= getNodeName()+"="+_Value+"\n";
+			buffer += getNodeName() + "=" + _Value.c_str() + "\n";
 	}
 	else
 	{
@@ -468,8 +468,8 @@ CSString CPersistentDataTreeNode::getNodeName() const
 
 	// return one of name, parentName.name and parentName:name
 	if (parentName.empty())	return name;
-	if (isMapEntry())		return parentName+":"+name;
-	else					return parentName+"."+name;
+	if (isMapEntry())		return parentName + ":" + name.c_str();
+	else					return parentName + "." + name.c_str();
 }
 
 void   CPersistentDataTreeNode::setValue(const TValue& value)
@@ -507,7 +507,7 @@ bool CPersistentDataTreeNode::isMapEntry() const
 
 bool CPersistentDataTreeNode::flagAsMap()
 {
-	DROP_IF(_IsValue,"ERROR: Failed to flag persistent data tree node '"+getNodeName()+"' as a map as it already has a value: "+_Value,return false);
+	DROP_IF(_IsValue, "ERROR: Failed to flag persistent data tree node '" + getNodeName() + "' as a map as it already has a value: " + _Value.c_str(), return false);
 
 	if (_IsMap)
 		return true;
diff --git a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h b/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
index 55d8b9bbb..134ebe38b 100644
--- a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
+++ b/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
@@ -138,7 +138,7 @@ void	initRyzomVisualPropertyIndices( CMirroredDataSet& dataset );
 #define TYPE_BOT_TRADE_SELECTOR2 uint64
 
 #define TYPE_EVENT_FACTION_ID uint32
-#define TYPE_PVP_MODE uint32
+#define TYPE_PVP_MODE uint16
 #define TYPE_PVP_CLAN uint32
 
 #define TYPE_FUEL bool
diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/code/ryzom/common/src/game_share/ryzom_version.h
index 2dfdca48e..9476ac849 100644
--- a/code/ryzom/common/src/game_share/ryzom_version.h
+++ b/code/ryzom/common/src/game_share/ryzom_version.h
@@ -17,7 +17,10 @@
 #ifndef RYZOM_VERSION_H
 #define RYZOM_VERSION_H
 
-#define RYZOM_VERSION	"RYZOM CORE"
+#define RYZOM_VERSION	"ryzomcore" \
+	"/" \
+	"v0.11.2" \
+	"-dev"
 
 #endif // RYZOM_VERSION_H
 
diff --git a/code/ryzom/common/src/game_share/server_animation_module.cpp b/code/ryzom/common/src/game_share/server_animation_module.cpp
index 51d7ce19e..3d3548d54 100644
--- a/code/ryzom/common/src/game_share/server_animation_module.cpp
+++ b/code/ryzom/common/src/game_share/server_animation_module.cpp
@@ -1017,7 +1017,7 @@ IPrimitive* CServerAnimationModule::getAction(CObject* action, const std::string
 				}
 
 				if(result.size()>=2)
-					result[1] = "DSS_"+toString(scenarioId)+" "+result[1];
+					result[1] = "DSS_"+toString(scenarioId)+" "+result[1].c_str();
 				if(result.size()>=3)
 				{
 					for(uint32 i=2;i<result.size();++i)
diff --git a/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset b/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
index f88263c27..b891b6252 100644
--- a/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
+++ b/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
@@ -292,14 +292,14 @@
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpMode"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint16"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpClan"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint32"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/admin b/code/ryzom/server/patchman_cfg/admin_install/bin/admin
index c7cfa2fb6..f48de0d15 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/bin/admin
+++ b/code/ryzom/server/patchman_cfg/admin_install/bin/admin
@@ -99,14 +99,14 @@ then
 		for f in $DOMAIN_LIST
 		do
 			# see if we're setup to run this domain
-			if [ -e /srv/core/${f}.screen.rc ] && [ -e /srv/core/bin/${f} ]
+			if [ -e /srv/core/${f}.screen.rc ] && [ -e /srv/core/bin/domain_${f} ]
 			then
 				# see whether the domain is alredy running
-				if [ $( screen -list | grep \( | cut  -f2 | cut -d. -f2| grep \^$f\$ | wc -l) == 0 ]
+				if [ $( screen -list | grep \\\.${f} | wc -w ) = 0 ]
 				then
 					# the domain isn't running yet so start it
 					echo '****' starting domain: $f '****'
-					/srv/core/bin/$f batchstart
+					/srv/core/bin/domain_$f batchstart
 				else
 					echo '****' Domain is already running: $f '****'
 				fi
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/run_forever b/code/ryzom/server/patchman_cfg/admin_install/bin/run_forever
index c6f14b074..91a838a02 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/bin/run_forever
+++ b/code/ryzom/server/patchman_cfg/admin_install/bin/run_forever
@@ -3,7 +3,7 @@
 while true
 do
 
-if [ "$2" == "" ]
+if [ "$2" = "" ]
 then
     echo
     echo USAGE: $0 sleep_time command_line
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/startup b/code/ryzom/server/patchman_cfg/admin_install/bin/startup
index 16bf59fd3..a63c6a3f7 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/bin/startup
+++ b/code/ryzom/server/patchman_cfg/admin_install/bin/startup
@@ -4,8 +4,8 @@ cd /srv/core
 rm */*.state */*/*.launch_ctrl */*/*.state
 /bin/bash /srv/core/bin/admin start
 
-# special case for the "ep1.std01.ryzomcore.org" machine - start the admin tool graph sync script
-if [ $(hostname) = "ep1.std01.ryzomcore.org" ]
+# special case for the "ep1.std01.ryzomcore.local" machine - start the admin tool graph sync script
+if [ $(hostname) = "ep1.std01.ryzomcore.local" ]
 	then
 	nohup /bin/sh /srv/core/bin/sync_rrd_graphs.sh &
 fi
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh b/code/ryzom/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh
index b23fc285b..cc78fbaf1 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh
+++ b/code/ryzom/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh
@@ -4,7 +4,7 @@ echo Launched: $(date)
 while true
 do
   # retrieve ATS files from ATS admin tool machine
-  rsync -t ep1.std01.ryzomcore.org:ats/graph_datas/* /srv/core/mini01/rrd_graphs/
+  rsync -t ep1.std01.ryzomcore.local:ats/graph_datas/* /srv/core/mini01/rrd_graphs/
 
   # deal with live files - duplicate files that correspond to unique services to aid with graphing of su & co
   cd /srv/core/std01/rrd_graphs/
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg
index bc7be84e9..0e8af6ed9 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg
@@ -10,7 +10,7 @@ AESAliasName= "aes";
 DontUseStdIn = 0;
 
 // Adress ofthe admin service (default port is 49996)
-ASHost = "ep1.mini01.ryzomcore.org";
+ASHost = "ep1.mini01.ryzomcore.local";
 
 // Config for AES
 AESPort = "46712";
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg
index 7bfb80b27..7a4176b93 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg
@@ -10,7 +10,7 @@ AESAliasName= "aes";
 DontUseStdIn = 0;
 
 // Adress ofthe admin service (default port is 49996)
-ASHost = "ep1.std01.ryzomcore.org";
+ASHost = "ep1.std01.ryzomcore.local";
 
 // Config for AES
 AESPort = "46702";
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman.sh b/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman.sh
index 73b151c43..af057f2ae 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman.sh
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman.sh
@@ -10,6 +10,7 @@ do
 	  chmod 775 bin/ps_services 2> /dev/null
 	  chmod 775 bin/run_forever 2> /dev/null
 	  chmod 775 bin/shard 2> /dev/null
+	  chmod 775 bin/domain_* 2> /dev/null
 	  chmod 775 bin/startup 2> /dev/null
 	  chmod 775 bin/*.sh 2> /dev/null
 	  chmod 775 patchman/*_service 2> /dev/null
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh b/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh
index 0dd697aa4..f7152cada 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh
@@ -3,8 +3,8 @@
 CFGFILENAME=patchman_service.${SERVER_TYPE}.cfg
 echo cfg file: $CFGFILENAME
 
-AESCFGFILENAME=admin_executor_service_default.${SERVER_TYPE}.cfg
-echo aes cfg file: $AESCFGFILENAME
+#AESCFGFILENAME=admin_executor_service_default.${SERVER_TYPE}.cfg
+#echo aes cfg file: $AESCFGFILENAME
 
 cd /srv/core/patchman
 if [ -e $CFGFILENAME ]
@@ -15,8 +15,8 @@ if [ -e $CFGFILENAME ]
 	cp $CFGFILENAME patchman_service.cfg
 
 	# setup the config file for the admin executor service
-	echo Using aes configuration file: $AESCFGFILENAME
-	if [ -e $AESCFGFILENAME ] ; then cp $AESCFGFILENAME admin_executor_service_default.cfg ; fi
+	#echo Using aes configuration file: $AESCFGFILENAME
+	#if [ -e $AESCFGFILENAME ] ; then cp $AESCFGFILENAME admin_executor_service_default.cfg ; fi
 
 	# start the patchman service
 	echo Launching patchman...
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh b/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh
index af1f5b599..6aa9f2ddf 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ "$1" == "" ]
+if [ "$1" = "" ]
 then
     echo
     echo USAGE: $0 command_line
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/make_next_live.sh b/code/ryzom/server/patchman_cfg/admin_install/patchman/make_next_live.sh
index fbaca4ac4..394fc971d 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/make_next_live.sh
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/make_next_live.sh
@@ -84,7 +84,7 @@ rm -v */*.*launch_ctrl *.*launch_ctrl 2> /dev/null
 # initialise the state files for the new services to "xxxxx" and remove directories that are no longer of interest
 for D in $(ls */log.log | sed "s%/.*%%" | sort -u)
 do
-  if [ $(grep \"$D\" admin_executor_service.cfg | wc -l) == 1 ]
+  if [ $(grep \"$D\" admin_executor_service.cfg | wc -l) = 1 ]
   then
 	  printf "xxxxx" > $D/$D.state
   else
@@ -97,7 +97,7 @@ done
 printf "1" > ./global.launch_ctrl
 
 # create a script for accessing the screen for this shard
-SCRIPT_FILE=/srv/core/bin/${DOMAIN}
+SCRIPT_FILE=/srv/core/bin/domain_${DOMAIN}
 echo "#!/bin/sh" > $SCRIPT_FILE
 echo "cd "$(pwd) >> $SCRIPT_FILE
 echo '/bin/sh /srv/core/bin/ryzom_domain_screen_wrapper.sh $*' >> $SCRIPT_FILE
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
index e90230704..9a9341e9a 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
@@ -1,23 +1,23 @@
 // default values for different sites
 
-mini01 ep1.mini01.ryzomcore.org
-std01 ep1.std01.ryzomcore.org
-std01 su1.std01.ryzomcore.org
-std01 pd1.std01.ryzomcore.org
-std01 pd2.std01.ryzomcore.org
-std01 pd3.std01.ryzomcore.org
-std01 pd4.std01.ryzomcore.org
-std01 mla1.std01.ryzomcore.org
-std01 mla2.std01.ryzomcore.org
-std01 mla3.std01.ryzomcore.org
-std01 mla4.std01.ryzomcore.org
-std01 mla5.std01.ryzomcore.org
-std01 mlb1.std01.ryzomcore.org
-std01 mlb2.std01.ryzomcore.org
-std01 mlb3.std01.ryzomcore.org
-std01 mlb4.std01.ryzomcore.org
-std01 mlb5.std01.ryzomcore.org
-std01 rra1.std01.ryzomcore.org
-std01 rra2.std01.ryzomcore.org
-std01 rrb1.std01.ryzomcore.org
-std01 rrb2.std01.ryzomcore.org
+mini01 ep1.mini01.ryzomcore.local
+std01 ep1.std01.ryzomcore.local
+std01 su1.std01.ryzomcore.local
+std01 pd1.std01.ryzomcore.local
+std01 pd2.std01.ryzomcore.local
+std01 pd3.std01.ryzomcore.local
+std01 pd4.std01.ryzomcore.local
+std01 mla1.std01.ryzomcore.local
+std01 mla2.std01.ryzomcore.local
+std01 mla3.std01.ryzomcore.local
+std01 mla4.std01.ryzomcore.local
+std01 mla5.std01.ryzomcore.local
+std01 mlb1.std01.ryzomcore.local
+std01 mlb2.std01.ryzomcore.local
+std01 mlb3.std01.ryzomcore.local
+std01 mlb4.std01.ryzomcore.local
+std01 mlb5.std01.ryzomcore.local
+std01 rra1.std01.ryzomcore.local
+std01 rra2.std01.ryzomcore.local
+std01 rrb1.std01.ryzomcore.local
+std01 rrb2.std01.ryzomcore.local
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg
index 981654046..7473aa9a0 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg
@@ -10,7 +10,7 @@ StartCommands =
 	// Create a gateway module on layer 3 transport and open it
 	"moduleManager.createModule StandardGateway bridge_gw",
 	"bridge_gw.transportAdd L3Client l3client",
-	"bridge_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.org:44749)",
+	"bridge_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44749)",
 
 
 	//------------------------------------------------------------------------------
@@ -19,7 +19,7 @@ StartCommands =
 	// Create a gateway module on layer 3 transport and open it
 	"moduleManager.createModule StandardGateway spm_gw",
 	"spm_gw.transportAdd L3Client l3client",
-	"spm_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.org:44752)",
+	"spm_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44752)",
 
 
 	//------------------------------------------------------------------------------
@@ -28,10 +28,3 @@ StartCommands =
 	"pam.plug spm_gw",
 	"pam.plug bridge_gw",
 };
-
-SpaPreCmdLineText="/bin/sh /srv/core/patchman/service_launcher.sh";
-DeploymentRootDirectory="/srv/core/patchman/";
-MakeInstalledVersionLiveCmdLine="/bin/sh /srv/core/patchman/make_next_live.sh";
-SpaLaunchAESCmdLine="/bin/sh /srv/core/patchman/loop_aes.sh";
-InstallArchiveDirectory="/srv/core/";
-InstallArchiveFileName="admin_install.tgz";
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg
index 41c283b63..f046815ce 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg
@@ -10,7 +10,7 @@ StartCommands =
 	// Create a gateway module on layer 3 transport and open it
 	"moduleManager.createModule StandardGateway bridge_gw",
 	"bridge_gw.transportAdd L3Client l3client",
-	"bridge_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.org:44749)",
+	"bridge_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44749)",
 
 
 	//------------------------------------------------------------------------------
@@ -19,7 +19,7 @@ StartCommands =
 	// Create a gateway module on layer 3 transport and open it
 	"moduleManager.createModule StandardGateway spm_gw",
 	"spm_gw.transportAdd L3Client l3client",
-	"spm_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.org:44751)",
+	"spm_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44751)",
 
 
 	//------------------------------------------------------------------------------
@@ -36,10 +36,3 @@ StartCommands =
 	"pam.plug spm_gw",
 	"pam.plug bridge_gw",
 };
-
-SpaPreCmdLineText="/bin/sh /srv/core/patchman/service_launcher.sh";
-DeploymentRootDirectory="/srv/core/patchman/";
-MakeInstalledVersionLiveCmdLine="/bin/sh /srv/core/patchman/make_next_live.sh";
-SpaLaunchAESCmdLine="/bin/sh /srv/core/patchman/loop_aes.sh";
-InstallArchiveDirectory="/srv/core/";
-InstallArchiveFileName="admin_install.tgz";
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg
index 32166d6bf..737177202 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg
@@ -43,7 +43,7 @@ StartCommands +=
     // Create a gateway module on layer 3 transport and open it
     "moduleManager.createModule StandardGateway spm_gw",
     "spm_gw.transportAdd L3Client l3client",
-    "spm_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.org:44751)",
+    "spm_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44751)",
 
 
 	//------------------------------------------------------------------------------
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg
index e8c2d5787..23175c08b 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg
@@ -10,7 +10,7 @@ StartCommands =
 	// Create a gateway module on layer 3 transport and open it
 	"moduleManager.createModule StandardGateway bridge_gw",
 	"bridge_gw.transportAdd L3Client l3client",
-	"bridge_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.org:44749)",
+	"bridge_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44749)",
 
 
 	//------------------------------------------------------------------------------
@@ -19,7 +19,7 @@ StartCommands =
 	// Create a gateway module on layer 3 transport and open it
 	"moduleManager.createModule StandardGateway spm_gw",
 	"spm_gw.transportAdd L3Client l3client",
-	"spm_gw.transportCmd l3client(connect addr=ep1.std01.ryzomcore.org:44752)",
+	"spm_gw.transportCmd l3client(connect addr=ep1.std01.ryzomcore.local:44752)",
 
 
 	//------------------------------------------------------------------------------
@@ -36,10 +36,3 @@ StartCommands =
 	"pam.plug spm_gw",
 	"pam.plug bridge_gw",
 };
-
-SpaPreCmdLineText="/bin/sh /srv/core/patchman/service_launcher.sh";
-DeploymentRootDirectory="/srv/core/patchman/";
-MakeInstalledVersionLiveCmdLine="/bin/sh /srv/core/patchman/make_next_live.sh";
-SpaLaunchAESCmdLine="/bin/sh /srv/core/patchman/loop_aes.sh";
-InstallArchiveDirectory="/srv/core/";
-InstallArchiveFileName="admin_install.tgz";
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg
index 8aea88a5f..74290a228 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg
@@ -14,4 +14,9 @@ DontUseStdIn = 0;
 // 4 = nothing
 UseYieldMethod = 0;
 
-
+SpaPreCmdLineText="/bin/sh /srv/core/patchman/service_launcher.sh";
+DeploymentRootDirectory="/srv/core/patchman/";
+MakeInstalledVersionLiveCmdLine="/bin/sh /srv/core/patchman/make_next_live.sh";
+SpaLaunchAESCmdLine="/bin/sh /srv/core/patchman/loop_aes.sh";
+InstallArchiveDirectory="/srv/core/";
+InstallArchiveFileName="admin_install.tgz";
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/service_launcher.sh b/code/ryzom/server/patchman_cfg/admin_install/patchman/service_launcher.sh
index 091892af7..435c44bc0 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/service_launcher.sh
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/service_launcher.sh
@@ -1,25 +1,26 @@
 #!/bin/sh
 
-# the object is to make a launcher script that works with a command file to determine when to launch the application that it is responsible for
+# the objective is to make a launcher script that works with a command file to determine when to launch the application that it is responsible for
 
 DOMAIN=$(pwd |sed "s%/srv/core/%%" | sed "s%/.*%%")
 NAME_BASE=$(pwd | sed 's/\/srv\/core\///' | sed 's/^.*\///')
 
 #if [ _$DOMAIN == _pre_live ]
-#	then
-	CTRL_FILE=${NAME_BASE}.launch_ctrl
-	NEXT_CTRL_FILE=${NAME_BASE}.deferred_launch_ctrl
+#    then
+    CTRL_FILE=${NAME_BASE}.launch_ctrl
+    NEXT_CTRL_FILE=${NAME_BASE}.deferred_launch_ctrl
 #elif [ _$DOMAIN == _pre_pre_live ]
-#	then
-#	CTRL_FILE=${NAME_BASE}.launch_ctrl
-#	NEXT_CTRL_FILE=${NAME_BASE}.deferred_launch_ctrl
+#    then
+#    CTRL_FILE=${NAME_BASE}.launch_ctrl
+#    NEXT_CTRL_FILE=${NAME_BASE}.deferred_launch_ctrl
 #else
-#	CTRL_FILE=${NAME_BASE}_immediate.launch_ctrl
-#	NEXT_CTRL_FILE=${NAME_BASE}_waiting.launch_ctrl
+#    CTRL_FILE=${NAME_BASE}_immediate.launch_ctrl
+#    NEXT_CTRL_FILE=${NAME_BASE}_waiting.launch_ctrl
 #fi
 STATE_FILE=${NAME_BASE}.state
 START_COUNTER_FILE=${NAME_BASE}.start_count
 CTRL_CMDLINE=$*
+CTRL_COMMAND=""
 
 echo
 echo ---------------------------------------------------------------------------------
@@ -36,6 +37,13 @@ echo
 echo 0 > $START_COUNTER_FILE
 START_COUNTER=0
 
+# always give ras a first run
+if [ "${NAME_BASE}" = "ras" ]
+then
+    echo Force admin service first startup
+    printf LAUNCH > $CTRL_FILE
+fi
+
 echo Press ENTER to launch program
 while true
 do
@@ -45,37 +53,37 @@ do
       then
 
       # a control file exists so read it's contents
-      CTRL_COMMAND=_$(cat $CTRL_FILE)_
+      CTRL_COMMAND=$(cat $CTRL_FILE)
 
       # do we have a 'launch' command?
-      if [ $CTRL_COMMAND = _LAUNCH_ ]
+      if [ "$CTRL_COMMAND" = "LAUNCH" ]
           then
 
-		  # update the start counter
-		  START_COUNTER=$(( $START_COUNTER + 1 ))
-		  echo $START_COUNTER > $START_COUNTER_FILE
+          # update the start counter
+          START_COUNTER=$(( $START_COUNTER + 1 ))
+          echo $START_COUNTER > $START_COUNTER_FILE
 
-		  # big nasty hack to deal with the special cases of ryzom_naming_service and ryzom_admin_service who have badly names cfg files
-		  for f in ryzom_*cfg
-		    do
-		    cp $f $(echo $f | sed "s/ryzom_//")
-		  done
+          # big nasty hack to deal with the special cases of ryzom_naming_service and ryzom_admin_service who have badly names cfg files
+          for f in ryzom_*cfg
+            do
+            cp $f $(echo $f | sed "s/ryzom_//")
+          done
 
-		  # we have a launch command so prepare, launch, wait for exit and do the housekeeping
-		  echo -----------------------------------------------------------------------
-		  echo Launching ...
-		  echo
-		  printf RUNNING > $STATE_FILE
+          # we have a launch command so prepare, launch, wait for exit and do the housekeeping
+          echo -----------------------------------------------------------------------
+          echo Launching ...
+          echo
+          printf RUNNING > $STATE_FILE
 
-	          $CTRL_CMDLINE
+              $CTRL_CMDLINE
 
-		  echo -----------------------------------------------------------------------
-		  printf STOPPED > $STATE_FILE
+          echo -----------------------------------------------------------------------
+          printf STOPPED > $STATE_FILE
 
-		  # consume (remove) the control file to allow start once
-		  rm $CTRL_FILE
+          # consume (remove) the control file to allow start once
+          rm $CTRL_FILE
 
-		  echo Press ENTER to relaunch
+          echo Press ENTER to relaunch
        fi
   fi
 
@@ -87,9 +95,9 @@ do
   else
       # give the terminal user a chance to press enter to provoke a re-launch
       HOLD=`sh -ic '{ read a; echo "ENTER" 1>&3; kill 0; } | { sleep 2; kill 0; }' 3>&1 2>/dev/null`
-      if [ _${HOLD}_ != _HOLD_ ]
-	  then
-	  printf LAUNCH > $CTRL_FILE
+      if [ "${HOLD}" = "ENTER" ]
+      then
+          printf LAUNCH > $CTRL_FILE
       fi
   fi
 
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list b/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
index b42636e55..bb1114027 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
@@ -1,10 +1,10 @@
 
 // mini01 - mini manager
 
-mini01_spm ep1.mini01.ryzomcore.org
-mini01_bridge ep1.mini01.ryzomcore.org
+mini01_spm ep1.mini01.ryzomcore.local
+mini01_bridge ep1.mini01.ryzomcore.local
 
 
 // std01 - std manager
 
-std01_spm ep1.std01.ryzomcore.org
+std01_spm ep1.std01.ryzomcore.local
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman_service_local.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman_service_local.cfg
index 45f2afe3f..5b2f35f5f 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman_service_local.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman_service_local.cfg
@@ -1 +1 @@
-SPAHost = "ep1.mini01.ryzomcore.org";
+SPAHost = "ep1.mini01.ryzomcore.local";
diff --git a/code/ryzom/server/patchman_cfg/default/ai_service.cfg b/code/ryzom/server/patchman_cfg/default/ai_service.cfg
index 72b278cc0..fdb381b38 100644
--- a/code/ryzom/server/patchman_cfg/default/ai_service.cfg
+++ b/code/ryzom/server/patchman_cfg/default/ai_service.cfg
@@ -6,7 +6,7 @@ SystemCmd	= {};
 //NegFiltersDebug += { "LNET", "HNET", "FEVIS"};
 //NegFiltersInfo += { "LNET", "HNET", "VISION_DELTA", "FEIMPE", "FEVIS" };
 // NegFiltersWarning += { "LNET", "FEHACK", "FERECV"};
-// NegFiltersWarning    += { "positional", "faction", "pet" };
+// NegFiltersWarning	+= { "positional", "faction", "pet" };
 
 //////////////////////////////////////////////////////////////////////////////
 //- Basic (specific) heal profile parameters ---------------------------------
@@ -49,7 +49,7 @@ DefaultNpcAggroDist = 15;
 DefaultEscortRange = 10;
 
 //////////////////////////////////////////////////////////////////////////////
-// Aggro                                                                    //
+// Aggro																	//
 //////////////////////////////////////////////////////////////////////////////
 AggroReturnDistCheck = 15.0;
 AggroReturnDistCheckFauna = 15.0;
@@ -318,25 +318,25 @@ StartCommandsWhenMirrorReadyPost =
 // commands for Ring continents
 StartCommandsWhenMirrorReadyRing = 
 {
-    "loadContinent r2_desert",
+	"loadContinent r2_desert",
 	"createDynamicAIInstance 10000",
 	"loadPrimitiveFile dummy.primitive",
 
-    "loadContinent r2_forest",
-	"createDynamicAIInstance 10001",
-	"loadPrimitiveFile dummy.primitive",
+//	"loadContinent r2_forest",
+//	"createDynamicAIInstance 10001",
+//	"loadPrimitiveFile dummy.primitive",
 
-    "loadContinent r2_lakes",
-	"createDynamicAIInstance 10003",
-	"loadPrimitiveFile dummy.primitive",
+//	"loadContinent r2_lakes",
+//	"createDynamicAIInstance 10003",
+//	"loadPrimitiveFile dummy.primitive",
 
-    "loadContinent r2_jungle",
-	"createDynamicAIInstance 10002",
-	"loadPrimitiveFile dummy.primitive",
+//	"loadContinent r2_jungle",
+//	"createDynamicAIInstance 10002",
+//	"loadPrimitiveFile dummy.primitive",
 
-    "loadContinent r2_roots",
-	"createDynamicAIInstance 10004",
-	"loadPrimitiveFile dummy.primitive",
+//	"loadContinent r2_roots",
+//	"createDynamicAIInstance 10004",
+//	"loadPrimitiveFile dummy.primitive",
 
 //	"spawnInstances",
 	"updateAI",
diff --git a/code/ryzom/server/patchman_cfg/default/dynamic_scenario_service.cfg b/code/ryzom/server/patchman_cfg/default/dynamic_scenario_service.cfg
new file mode 100644
index 000000000..e6d5942ac
--- /dev/null
+++ b/code/ryzom/server/patchman_cfg/default/dynamic_scenario_service.cfg
@@ -0,0 +1,9 @@
+
+DelayBeforeStartAct = 1;
+MaxNpcs = 300;
+MaxStaticObjects = 200;
+
+StartCommands +=
+{
+	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
+};
diff --git a/code/ryzom/server/patchman_cfg/default/log_analyser_service.cfg b/code/ryzom/server/patchman_cfg/default/log_analyser_service.cfg
new file mode 100644
index 000000000..355984ff5
--- /dev/null
+++ b/code/ryzom/server/patchman_cfg/default/log_analyser_service.cfg
@@ -0,0 +1,5 @@
+
+DontUseNS = 1;
+
+QueryTimeout = 300;
+LinePerPage = 50;
diff --git a/code/ryzom/server/patchman_cfg/default/ryzom_as.cfg b/code/ryzom/server/patchman_cfg/default/ryzom_as.cfg
index 2755403b7..4227bac69 100644
--- a/code/ryzom/server/patchman_cfg/default/ryzom_as.cfg
+++ b/code/ryzom/server/patchman_cfg/default/ryzom_as.cfg
@@ -1,7 +1,7 @@
 DontUseNS = 1;
 
 RRDToolPath = "rrdtool";
-RRDVarPath = "../graph_datas";
+RRDVarPath = "../rrd_graphs";
 
 // Variables required to be defined by other cfgs
 //AESHost="localhost";
diff --git a/code/ryzom/server/patchman_cfg/shard_ctrl_definitions.txt b/code/ryzom/server/patchman_cfg/shard_ctrl_definitions.txt
index 87bd0ce4d..8deb9f533 100644
--- a/code/ryzom/server/patchman_cfg/shard_ctrl_definitions.txt
+++ b/code/ryzom/server/patchman_cfg/shard_ctrl_definitions.txt
@@ -26,7 +26,7 @@ define exe_set_mini_ring
 define exe_set_mini_mainland
 	use raes
 	use ms_mini_mainland
-	use ais_newbyland
+	use ais_newbieland
 	use egs_mainland
 	use gpms_mainland
 	use ios_mainland
@@ -100,7 +100,7 @@ define exe_set_std_mainland_be03
 define exe_set_std_mainland_be03_basics
 //	use ais_matis
 //	use ais_tryker
-	use ais_newbyland
+	use ais_newbieland
 
 // unifier and co ------------------
 
@@ -170,12 +170,14 @@ define ais_ring
 	cmdLine ai_service -C. -L. --nobreak --writepid -mCommon:Ring
 	use ais
 	data data_r2_desert
-	data data_r2_forest
-	data data_r2_jungle
-	data data_r2_lakes
-	data data_r2_roots
+	// data data_r2_forest
+	// data data_r2_jungle
+	// data data_r2_lakes
+	// data data_r2_roots
 
 define ais_mainland
+	name ais
+	cmdLine ai_service -C. -L. --nobreak --writepid -mCommon:Indoors:Newbieland:Post
 	use ais
 	data data_mainland_common_primitives
 	data data_newbieland_primitives
@@ -188,8 +190,8 @@ define ais_mini_mainland
 	cmdLine ai_service -C. -L. --nobreak --writepid -mCommon:Indoors:Newbieland:Post
 	use ais_mainland
 
-define ais_newbyland
-	name ais_newbyland
+define ais_newbieland
+	name ais_newbieland
 	cmdLine ai_service -C. -L. --nobreak --writepid -mCommon:Indoors:Newbieland:Post
 	use ais
 	data data_mainland_common_primitives
@@ -213,36 +215,40 @@ define bms_master
 	use bms
 	cmdLine backup_service -C. -L. --nobreak --writepid -P49990
 	//cfg #include "../live/cfg/backup_module_service_master.cfg"
+	cfg #include "../live/service_backup_service/backup_service.cfg"
 	cfgAfter ListeningPort = 49990;
 	cfgAfter L3ListeningPort = 49950;
 	cfgAfter WebPort = 49970;
 	cfgAfter BSReadState = 1;
-	cfgAfter SaveShardRoot = "../save_shard/";
+	cfgAfter SaveShardRoot = "../save_shard_bs/";
 
 define bms_master2
 	use bms
 	cmdLine backup_service -C. -L. --nobreak --writepid -P49994
 	//cfg #include "../live/cfg/backup_module_service_master.cfg"
+	cfg #include "../live/service_backup_service/backup_service.cfg"
 	cfgAfter ListeningPort = 49994;
 	cfgAfter L3ListeningPort = 49954;
 	cfgAfter WebPort = 49974;
 	cfgAfter BSReadState = 1;
-	cfgAfter SaveShardRoot = "../save_shard/";
+	cfgAfter SaveShardRoot = "../save_shard_bs/";
 
 define bms_slave
 	use bms
 	cmdLine backup_service -C. -L. --nobreak --writepid -P49991
-	cfg #include "../live/cfg/backup_module_service_slave.cfg"
+	//cfg #include "../live/cfg/backup_module_service_slave.cfg"
+	cfg #include "../live/service_backup_service/backup_service.cfg"
 	cfgAfter ListeningPort = 49991;
 	cfgAfter L3ListeningPort = 49951;
 	cfgAfter WebPort = 49971;
 	cfgAfter BSReadState = 0;
-	cfgAfter SaveShardRoot = "../save_shard/";
+	cfgAfter SaveShardRoot = "../save_shard_bs/";
 
 define bms_pd_master
 	use bms
 	cmdLine backup_service -C. -L. --nobreak --writepid -P49992
 	//cfg #include "../live/cfg/backup_module_service_master.cfg"
+	cfg #include "../live/service_backup_service/backup_service.cfg"
 	cfgAfter ListeningPort = 49992;
 	cfgAfter L3ListeningPort = 49952;
 	cfgAfter WebPort = 49972;
@@ -252,7 +258,8 @@ define bms_pd_master
 define bms_pd_slave
 	use bms
 	cmdLine backup_service -C. -L. --nobreak --writepid -P49993
-	cfg #include "../live/cfg/backup_module_service_slave.cfg"
+	//cfg #include "../live/cfg/backup_module_service_slave.cfg"
+	cfg #include "../live/service_backup_service/backup_service.cfg"
 	cfgAfter ListeningPort = 49993;
 	cfgAfter L3ListeningPort = 49953;
 	cfgAfter WebPort = 49973;
@@ -263,6 +270,7 @@ define backup_lgs
 	use bms
 	cmdLine backup_service -C. -L. --nobreak --writepid -P49994
 	//cfg #include "../live/cfg/backup_module_service_master.cfg"
+	cfg #include "../live/service_backup_service/backup_service.cfg"
 	cfgAfter ListeningPort = 49994;
 	cfgAfter L3ListeningPort = 49995;
 	cfgAfter WebPort = 49972;
@@ -320,7 +328,7 @@ define dss
 
 define dss_ring
 	use dss
-	cfg #include "../live/cfg/dynamic_scenario_service_ring.cfg"
+	// cfg #include "../live/cfg/dynamic_scenario_service_ring.cfg"
 
 
 // egs -----------------------------
@@ -374,17 +382,17 @@ define egs_mainland
 define egs_ring
 	use egs
 	data data_mainland_common_primitives
-	data data_newbieland_primitives
-	data data_newbieland
-	data data_indoors
-	cfg #include "../live/cfg/entities_game_service_ring.cfg"
+	// data data_newbieland_primitives
+	// data data_newbieland
+	// data data_indoors
+	//cfg #include "../live/cfg/entities_game_service_ring.cfg" // care
 	cfg UsedContinents = 
 	cfg {
 	cfg	"r2_desert", "10000",
-	cfg	"r2_forest", "10001",
-	cfg	"r2_jungle", "10002",
-	cfg	"r2_lakes",  "10003",
-	cfg	"r2_roots",  "10004",
+	// cfg	"r2_forest", "10001",
+	// cfg	"r2_jungle", "10002",
+	// cfg	"r2_lakes",  "10003",
+	// cfg	"r2_roots",  "10004",
 	cfg };
 	cfgAfter MaxXPGainPerPlayer = 30.0;
 	cfgAfter DeathXPFactor = 0.0;
@@ -460,16 +468,16 @@ define gpms_mainland
 	use gpms
 	data data_newbieland
 	data data_indoors
-	cfg #include "../live/cfg/gpm_service_mainland.cfg"
+	//cfg #include "../live/cfg/gpm_service_mainland.cfg"
 
 define gpms_ring
 	use gpms
 	data data_r2_desert
-	data data_r2_forest
-	data data_r2_jungle
-	data data_r2_lakes
-	data data_r2_roots
-	cfg #include "../live/cfg/gpm_service_ring.cfg"
+	// data data_r2_forest
+	// data data_r2_jungle
+	// data data_r2_lakes
+	// data data_r2_roots
+	//cfg #include "../live/cfg/gpm_service_ring.cfg"
 
 
 // pdss ----------------------------
@@ -534,7 +542,7 @@ define ios_mainland
 
 define ios_ring
 	use ios
-	cfg #include "../live/cfg/input_output_service_ring.cfg"
+	//cfg #include "../live/cfg/input_output_service_ring.cfg"
 
 
 // las -----------------------------
diff --git a/code/ryzom/server/patchman_cfg/shard_ctrl_mini01.txt b/code/ryzom/server/patchman_cfg/shard_ctrl_mini01.txt
index a17f6f922..e09f106ac 100644
--- a/code/ryzom/server/patchman_cfg/shard_ctrl_mini01.txt
+++ b/code/ryzom/server/patchman_cfg/shard_ctrl_mini01.txt
@@ -30,15 +30,15 @@ define domain_mini01
 
 	// domain hosts
 	cfg AESHost = "localhost";
-	cfg SUHost = "ep1.mini01.ryzomcore.org";
-	cfg MFSHost = "ep1.mini01.ryzomcore.org";
-	cfg BSHost = "ep1.mini01.ryzomcore.org:49990";
-	cfg SlaveBSHost= "ep1.mini01.ryzomcore.org:49991";
-	cfg MasterLGSHost = "ep1.mini01.ryzomcore.org";
-	cfg SlaveLGSHost = "ep1.mini01.ryzomcore.org";
-	cfg LGSBSHost = "ep1.mini01.ryzomcore.org";
-	cfg DBHost = "localhost"; // FIXME "sql.core.ryzomcore.org";
-	cfgAfter WebSrvHost = "http://ep1.mini01.ryzomcore.org:50000/";
+	cfg SUHost = "ep1.mini01.ryzomcore.local";
+	cfg MFSHost = "ep1.mini01.ryzomcore.local";
+	cfg BSHost = "ep1.mini01.ryzomcore.local:49990";
+	cfg SlaveBSHost= "ep1.mini01.ryzomcore.local:49991";
+	cfg MasterLGSHost = "ep1.mini01.ryzomcore.local";
+	cfg SlaveLGSHost = "ep1.mini01.ryzomcore.local";
+	cfg LGSBSHost = "ep1.mini01.ryzomcore.local";
+	cfg DBHost = "ep1.mini01.ryzomcore.local";
+	cfgAfter WebSrvHost = "http://ep1.mini01.ryzomcore.local:50000/";
 
 	// initial config files
 	cfgFile ../cfg/00_base.cfg
@@ -84,7 +84,7 @@ define shard_mini01_unifier
 	use exe_set_std_lgs_slave
 	use backup_lgs
 	cfg DBPass = DBNelPass;
-	host ep1.mini01.ryzomcore.org
+	host ep1.mini01.ryzomcore.local
 
 
 // shard mainland01 ----------------
@@ -95,10 +95,10 @@ define shard_mini01_mainland01
 	cfg ShardId = 301;
 	cfg BasePort = 52000;
 	cfg SaveFilesDirectory="mini01_mainland01/";
-	cfg NSHost = "ep1.mini01.ryzomcore.org";
-	cfg FSListenHost = "ep1.mini01.ryzomcore.org";
+	cfg NSHost = "ep1.mini01.ryzomcore.local";
+	cfg FSListenHost = "ep1.mini01.ryzomcore.local";
 	cfgFile ../cfg/02_shard_type_mini_mainland.cfg
-	host ep1.mini01.ryzomcore.org
+	host ep1.mini01.ryzomcore.local
 
 
 // shard ring01 --------------------
@@ -110,7 +110,7 @@ define shard_mini01_ring01
 	cfg BasePort = 52400;
 	cfg SaveFilesDirectory="mini01_ring01/";
 	cfg NSPort = 51100;
-	cfg NSHost = "ep1.mini01.ryzomcore.org" + 51100;
+	cfg NSHost = "ep1.mini01.ryzomcore.local" + 51100;
 	cfgFile ../cfg/02_shard_type_std_ring.cfg
-	host ep1.mini01.ryzomcore.org
+	host ep1.mini01.ryzomcore.local
 
diff --git a/code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt b/code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt
index 311261110..5492d6af3 100644
--- a/code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt
+++ b/code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt
@@ -32,15 +32,15 @@ define domain_std01
 
 	// domain hosts
 	cfg AESHost = "localhost";
-	cfg SUHost = "su1.std01.ryzomcore.org";
-	cfg MFSHost = "su1.std01.ryzomcore.org";
-	cfg BSHost = "pd1.std01.ryzomcore.org:49990"; // Backup service host for domain
-	cfg SlaveBSHost= "pd2.std01.ryzomcore.org:49991";
-	cfg MasterLGSHost = "pd3.std01.ryzomcore.org";
-	cfg SlaveLGSHost = "pd4.std01.ryzomcore.org";
-	cfg LGSBSHost = "csr.core.ryzomcore.org"; // Backup service host for log service
-	cfg DBHost = "sql.core.ryzomcore.org";
-	cfgAfter WebSrvHost = "http://su1.std01.ryzomcore.org:50000/";
+	cfg SUHost = "su1.std01.ryzomcore.local";
+	cfg MFSHost = "su1.std01.ryzomcore.local";
+	cfg BSHost = "pd1.std01.ryzomcore.local:49990"; // Backup service host for domain
+	cfg SlaveBSHost= "pd2.std01.ryzomcore.local:49991";
+	cfg MasterLGSHost = "pd3.std01.ryzomcore.local";
+	cfg SlaveLGSHost = "pd4.std01.ryzomcore.local";
+	cfg LGSBSHost = "csr.core.ryzomcore.local"; // Backup service host for log service
+	cfg DBHost = "sql.core.ryzomcore.local";
+	cfgAfter WebSrvHost = "http://su1.std01.ryzomcore.local:50000/";
 
 	// initial config files
 	cfgFile ../cfg/00_base.cfg
@@ -86,11 +86,11 @@ define shard_std01_unifier
 
 define shard_exe_set_std01_ras
 	use ras
-	host ep1.std01.ryzomcore.org
+	host ep1.std01.ryzomcore.local
 	
 define shard_exe_set_std01_unifier
 	use exe_set_std_unifier
-	host su1.std01.ryzomcore.org
+	host su1.std01.ryzomcore.local
 	cfg DBPass = DBNelPass;
 
 
@@ -106,30 +106,30 @@ define shard_std01_mainland01
 	cfg ShardId = 101;
 	cfg BasePort = 51000;
 	cfg SaveFilesDirectory="std01_mainland01/";
-	cfg NSHost = "mla1.std01.ryzomcore.org";
+	cfg NSHost = "mla1.std01.ryzomcore.local";
 	cfgFile ../cfg/02_shard_type_std_mainland.cfg
 
 define shard_exe_set_std01_mainland01_be01
 	use exe_set_std_mainland_be01
-	host mla1.std01.ryzomcore.org
+	host mla1.std01.ryzomcore.local
 
 define shard_exe_set_std01_mainland01_be02
 	use exe_set_std_mainland_be02
-	host mla2.std01.ryzomcore.org
+	host mla2.std01.ryzomcore.local
 
 define shard_exe_set_std01_mainland01_be03
 	use exe_set_std_mainland_be03
-	host mla3.std01.ryzomcore.org
+	host mla3.std01.ryzomcore.local
 
 define shard_exe_set_std01_mainland01_fe01
 	use exe_set_std_mainland_fe
-	host mla4.std01.ryzomcore.org
-	cfg FSListenHost = "mla4.std01.ryzomcore.org";
+	host mla4.std01.ryzomcore.local
+	cfg FSListenHost = "mla4.std01.ryzomcore.local";
 
 define shard_exe_set_std01_mainland01_fe02
 	use exe_set_std_mainland_fe
-	host mla5.std01.ryzomcore.org
-	cfg FSListenHost = "mla5.std01.ryzomcore.org";
+	host mla5.std01.ryzomcore.local
+	cfg FSListenHost = "mla5.std01.ryzomcore.local";
 
 
 // shard mainland02 ----------------
@@ -144,30 +144,30 @@ define shard_std01_mainland02
 	cfg ShardId = 102;
 	cfg BasePort = 51100;
 	cfg SaveFilesDirectory="std01_mainland02/";
-	cfg NSHost = "mlb1.std01.ryzomcore.org";
+	cfg NSHost = "mlb1.std01.ryzomcore.local";
 	cfgFile ../cfg/02_shard_type_std_mainland.cfg
 
 define shard_exe_set_std01_mainland02_be01
 	use exe_set_std_mainland_be01
-	host mlb1.std01.ryzomcore.org
+	host mlb1.std01.ryzomcore.local
 
 define shard_exe_set_std01_mainland02_be02
 	use exe_set_std_mainland_be02
-	host mlb2.std01.ryzomcore.org
+	host mlb2.std01.ryzomcore.local
 
 define shard_exe_set_std01_mainland02_be03
 	use exe_set_std_mainland_be03
-	host mlb3.std01.ryzomcore.org
+	host mlb3.std01.ryzomcore.local
 
 define shard_exe_set_std01_mainland02_fe01
 	use exe_set_std_mainland_fe
-	host mlb4.std01.ryzomcore.org
-	cfg FSListenHost = "mlb4.std01.ryzomcore.org";
+	host mlb4.std01.ryzomcore.local
+	cfg FSListenHost = "mlb4.std01.ryzomcore.local";
 
 define shard_exe_set_std01_mainland02_fe02
 	use exe_set_std_mainland_fe
-	host mlb5.std01.ryzomcore.org
-	cfg FSListenHost = "mlb5.std01.ryzomcore.org";
+	host mlb5.std01.ryzomcore.local
+	cfg FSListenHost = "mlb5.std01.ryzomcore.local";
 
 
 // shard ring01 --------------------
@@ -179,17 +179,17 @@ define shard_std01_ring01
 	cfg ShardId = 201;
 	cfg BasePort = 51400;
 	cfg SaveFilesDirectory="std01_ring01/";
-	cfg NSHost = "rra1.std01.ryzomcore.org";
+	cfg NSHost = "rra1.std01.ryzomcore.local";
 	cfgFile ../cfg/02_shard_type_std_ring.cfg
 
 define shard_exe_set_std01_ring01_be
 	use exe_set_std_ring_be
-	host rra1.std01.ryzomcore.org
+	host rra1.std01.ryzomcore.local
 
 define shard_exe_set_std01_ring01_fe
 	use exe_set_std_ring_fe
-	host rra2.std01.ryzomcore.org
-	cfg FSListenHost = "rra2.std01.ryzomcore.org";
+	host rra2.std01.ryzomcore.local
+	cfg FSListenHost = "rra2.std01.ryzomcore.local";
 
 
 // shard ring02 --------------------
@@ -201,17 +201,17 @@ define shard_std01_ring02
 	cfg ShardId = 202;
 	cfg BasePort = 51500;
 	cfg SaveFilesDirectory="std01_ring02/";
-	cfg NSHost = "rrb1.std01.ryzomcore.org";
+	cfg NSHost = "rrb1.std01.ryzomcore.local";
 	cfgFile ../cfg/02_shard_type_std_ring.cfg
 
 define shard_exe_set_std01_ring02_be
 	use exe_set_std_ring_be
-	host rrb1.std01.ryzomcore.org
+	host rrb1.std01.ryzomcore.local
 
 define shard_exe_set_std01_ring02_fe
 	use exe_set_std_ring_fe
-	host rrb2.std01.ryzomcore.org
-	cfg FSListenHost = "rrb2.std01.ryzomcore.org";
+	host rrb2.std01.ryzomcore.local
+	cfg FSListenHost = "rrb2.std01.ryzomcore.local";
 
 
 // the std01 backup domain ----------
@@ -260,7 +260,7 @@ define shard_std01_backup_ras
 	shard std01_backup_ras
 	cfg ShardId = 100;
 	use ras
-	host ep1.std01.ryzomcore.org
+	host ep1.std01.ryzomcore.local
 
 
 // the main backup pair ------------
@@ -273,15 +273,15 @@ define shard_std01_backup
 define shard_exe_set_std01_backup_master
 	name bs_master
 	use exe_set_std_backup_master
-	host pd1.std01.ryzomcore.org
+	host pd1.std01.ryzomcore.local
 
 define shard_exe_set_std01_backup_slave
 	name bs_slave
 	// hack to workaround bug in backup service
 //	use exe_set_std_backup_slave
 	use exe_set_std01_backup_slave
-	host pd2.std01.ryzomcore.org
-	cfgAfter MasterBSHost = "pd1.std01.ryzomcore.org:49990";
+	host pd2.std01.ryzomcore.local
+	cfgAfter MasterBSHost = "pd1.std01.ryzomcore.local:49990";
 
 // hack to workaround bug in backup service
 define exe_set_std01_backup_slave
@@ -312,27 +312,27 @@ define shard_std01_lgs
 	cfg L3SlaveLGSPort = 49993;
 	cfg LGSBSPort = 49994;
 	cfg L3LGSBSPort = 49995;
-	cfg MasterLGSHost = "pd3.std01.ryzomcore.org";
-	cfg SlaveLGSHost = "pd4.std01.ryzomcore.org";
-	cfg LGSBSHost = "csr.core.ryzomcore.org";
+	cfg MasterLGSHost = "pd3.std01.ryzomcore.local";
+	cfg SlaveLGSHost = "pd4.std01.ryzomcore.local";
+	cfg LGSBSHost = "csr.core.ryzomcore.local";
 
 define shard_exe_set_std01_lgs_primary
 	name lgs_primary
 	use raes
 	use exe_set_std_lgs_master
-	host pd3.std01.ryzomcore.org
+	host pd3.std01.ryzomcore.local
 	
 define shard_exe_set_std01_lgs_secondary
 	name lgs_secondary
 	use raes
 	use exe_set_std_lgs_slave
-	host pd4.std01.ryzomcore.org
+	host pd4.std01.ryzomcore.local
 
 define shard_exe_set_std01_lgs_bs
 	name lgs_bs
 	use raes
 	use backup_lgs
-	host csr.core.ryzomcore.org
+	host csr.core.ryzomcore.local
 
 
 // the std01 las domain -------------
@@ -365,7 +365,7 @@ define shard_std01_las_ras
 	shard std01_las_ras
 	cfg ShardId = 100;
 	use ras
-	host ep1.std01.ryzomcore.org
+	host ep1.std01.ryzomcore.local
 
 
 // master las ----------------------
@@ -378,7 +378,7 @@ define shard_std01_las_master
 	use las_mainland02
 	use las_ring01
 	use las_ring02
-	host pd3.std01.ryzomcore.org
+	host pd3.std01.ryzomcore.local
 
 define las_mainland01
 	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_mainland01/pds"};
@@ -415,7 +415,7 @@ define shard_std01_las_slave
 	use las_mainland02_slave
 	use las_ring01_slave
 	use las_ring02_slave
-	host pd4.std01.ryzomcore.org
+	host pd4.std01.ryzomcore.local
 
 define las_mainland01_slave
 	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_mainland01/pds"};
diff --git a/code/ryzom/server/patchman_cfg/terminal_mini01/patchman_service.cfg b/code/ryzom/server/patchman_cfg/terminal_mini01/patchman_service.cfg
index 351a8614a..c6a336c02 100644
--- a/code/ryzom/server/patchman_cfg/terminal_mini01/patchman_service.cfg
+++ b/code/ryzom/server/patchman_cfg/terminal_mini01/patchman_service.cfg
@@ -41,12 +41,12 @@ StartCommands +=
 	// bridge gateway
 //	"moduleManager.createModule StandardGateway gw1",
 //	"gw1.transportAdd L3Client l3client",
-//	"gw1.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.org:44748)",
+//	"gw1.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44748)",
 
 	// ats spm gateway
 	"moduleManager.createModule StandardGateway gw2",
 	"gw2.transportAdd L3Client l3client",
-	"gw2.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.org:44751)",
+	"gw2.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44751)",
 
 
 	//------------------------------------------------------------------------------
diff --git a/code/ryzom/server/patchman_cfg/terminal_mini01/terminal_mini01.bat b/code/ryzom/server/patchman_cfg/terminal_mini01/terminal_mini01.bat
index 7f61bfa59..90e11d5d6 100644
--- a/code/ryzom/server/patchman_cfg/terminal_mini01/terminal_mini01.bat
+++ b/code/ryzom/server/patchman_cfg/terminal_mini01/terminal_mini01.bat
@@ -1,2 +1,2 @@
 @echo off
-start S:\devw_x86\bin\Release\ryzom_patchman_service.exe --nolog -C. -L.
\ No newline at end of file
+start R:\build\bin\Release\ryzom_patchman_service.exe --nolog -C. -L.
\ No newline at end of file
diff --git a/code/ryzom/server/src/CMakeLists.txt b/code/ryzom/server/src/CMakeLists.txt
index 29c11be09..08731a4ca 100644
--- a/code/ryzom/server/src/CMakeLists.txt
+++ b/code/ryzom/server/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 # Supporting modules and libraries.
 # Need servershare for build packed collision tool
 # Need aishare for build wmap tool
diff --git a/code/ryzom/server/src/admin_modules/CMakeLists.txt b/code/ryzom/server/src/admin_modules/CMakeLists.txt
index ea8d8a5ff..9809b2f29 100644
--- a/code/ryzom/server/src/admin_modules/CMakeLists.txt
+++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt
@@ -11,4 +11,8 @@ NL_ADD_LIB_SUFFIX(ryzom_adminmodules)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+IF(WITH_PCH)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_adminmodules ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+ENDIF(WITH_PCH)
+
 INSTALL(TARGETS ryzom_adminmodules LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
diff --git a/code/ryzom/server/src/admin_modules/admin_modules_itf.cpp b/code/ryzom/server/src/admin_modules/admin_modules_itf.cpp
index 258409d16..39dfc6948 100644
--- a/code/ryzom/server/src/admin_modules/admin_modules_itf.cpp
+++ b/code/ryzom/server/src/admin_modules/admin_modules_itf.cpp
@@ -18,6 +18,7 @@
 // WARNING : this is a generated file, don't change it !
 /////////////////////////////////////////////////////////////////
 
+#include "stdpch.h"
 #include "admin_modules_itf.h"
 
 namespace ADMIN
diff --git a/code/ryzom/server/src/admin_modules/aes_client_module.cpp b/code/ryzom/server/src/admin_modules/aes_client_module.cpp
index e2b9ca390..7cb85f5a4 100644
--- a/code/ryzom/server/src/admin_modules/aes_client_module.cpp
+++ b/code/ryzom/server/src/admin_modules/aes_client_module.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/misc/singleton.h"
 #include "nel/net/module.h"
 #include "nel/net/module_builder_parts.h"
@@ -259,7 +260,7 @@ namespace ADMIN
 						gs.HighRezTimeStamp = timer;
 						IVariable *var = dynamic_cast<IVariable*>(ICommand::getCommand(gvi.VarName));
 						if (var != NULL)
-							gs.SampleValue = atof(var->toString().c_str());
+							NLMISC::fromString(var->toString(), gs.SampleValue);
 					}
 				}
 			}
@@ -305,7 +306,11 @@ namespace ADMIN
 							// no sample collected yet, just ask a new one
 							IVariable *var = dynamic_cast<IVariable*>(ICommand::getCommand(gvi.VarName));
 							if (var != NULL)
-								gd.setValue(atof(var->toString().c_str()));
+							{
+								float val;
+								NLMISC::fromString(var->toString(), val);
+								gd.setValue(val);
+							}
 						}
 						else
 						{
diff --git a/code/ryzom/server/src/admin_modules/aes_module.cpp b/code/ryzom/server/src/admin_modules/aes_module.cpp
index c4faf5c47..734dfff64 100644
--- a/code/ryzom/server/src/admin_modules/aes_module.cpp
+++ b/code/ryzom/server/src/admin_modules/aes_module.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/misc/singleton.h"
 #include <time.h>
 #include "nel/misc/path.h"
@@ -573,7 +574,7 @@ namespace ADMIN
 						time_t t = now;
 						fprintf(fp, "AESReportDate=%s", ::ctime(&t));
 
-						fprintf(fp, "NBService=%u\n", _ServiceStates.size());
+						fprintf(fp, "NBService=%u\n", (uint)_ServiceStates.size());
 						// output state of each service
 						TServiceStates::iterator first(_ServiceStates.begin()), last(_ServiceStates.end());
 						for (; first != last; ++first)
diff --git a/code/ryzom/server/src/admin_modules/as_module.cpp b/code/ryzom/server/src/admin_modules/as_module.cpp
index cbe1b2818..9717da358 100644
--- a/code/ryzom/server/src/admin_modules/as_module.cpp
+++ b/code/ryzom/server/src/admin_modules/as_module.cpp
@@ -14,6 +14,7 @@
 // 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/>.
 
+#include "stdpch.h"
 #include "nel/misc/types_nl.h"
 #include <time.h>
 #include "nel/misc/file.h"
diff --git a/code/ryzom/server/src/admin_modules/stdpch.cpp b/code/ryzom/server/src/admin_modules/stdpch.cpp
new file mode 100644
index 000000000..a3d45576c
--- /dev/null
+++ b/code/ryzom/server/src/admin_modules/stdpch.cpp
@@ -0,0 +1,17 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
+
+#include "stdpch.h"
diff --git a/code/ryzom/server/src/admin_modules/stdpch.h b/code/ryzom/server/src/admin_modules/stdpch.h
new file mode 100644
index 000000000..be01e5019
--- /dev/null
+++ b/code/ryzom/server/src/admin_modules/stdpch.h
@@ -0,0 +1,45 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
+
+#ifndef ADMIN_MODULES_STDPCH_H
+#define ADMIN_MODULES_STDPCH_H
+
+#include <time.h>
+#include <memory>
+
+#include "nel/misc/types_nl.h"
+
+#include "nel/misc/file.h"
+#include "nel/misc/hierarchical_timer.h"
+#include "nel/misc/mutable_container.h"
+#include "nel/misc/path.h"
+#include "nel/misc/singleton.h"
+#include "nel/misc/sstring.h"
+#include "nel/misc/string_conversion.h"
+#include "nel/misc/time_nl.h"
+#include "nel/net/message.h"
+#include "nel/net/module.h"
+#include "nel/net/module_builder_parts.h"
+#include "nel/net/module_gateway.h"
+#include "nel/net/module_manager.h"
+#include "nel/net/module_message.h"
+#include "nel/net/service.h"
+#include "nel/net/unified_network.h"
+
+#include "game_share/callback_adaptor.h"
+#include "game_share/utils.h"
+
+#endif
diff --git a/code/ryzom/server/src/ags_test/commands.cpp b/code/ryzom/server/src/ags_test/commands.cpp
index 7b2e6c2a8..4fa955401 100644
--- a/code/ryzom/server/src/ags_test/commands.cpp
+++ b/code/ryzom/server/src/ags_test/commands.cpp
@@ -586,7 +586,10 @@ NLMISC_COMMAND(actorSetOrientation,"Add one or more static actors","<direction>
 	if (i<(sizeof(angleNames)/sizeof(angleNames[0])))
 		theta=3.14159265359f*2.0f*(float)i/(float)(sizeof(angleNames)/sizeof(angleNames[0]));
 	else
-		theta=(float)atof(args[0].c_str())/360.0f*2.0f*3.14159265359f;
+	{
+		NLMISC::fromString(args[0], theta);
+		theta = theta / 360.0f*2.0f*3.14159265359f;
+	}
 
 	if (args.size()==1)
 	{
@@ -620,11 +623,13 @@ NLMISC_COMMAND(actorSetMagnetRange,"Set the magnet properties for wandering beha
 	if(args.size() <1) return false;
 	COMMAND_MACRO_RECORD_TEST
 
-	float range=(float)atof(args[0].c_str());
+	float range;
+	NLMISC::fromString(args[0], range);
 	if (range<=0.0f) return false;
 
 	unsigned start;
-	float decay=(float)atof(args[0].c_str());
+	float decay;
+	NLMISC::fromString(args[0], decay);
 	if (decay<0.0f) return false;
 	if (decay==0.0f) 
 	{
@@ -664,7 +669,8 @@ NLMISC_COMMAND(actorSetAttackDistance,"set actor attack distance","<distance> [<
 	if(args.size() <1) return false;
 	COMMAND_MACRO_RECORD_TEST
 
-	float distance=(float)atof(args[0].c_str());
+	float distance;
+	NLMISC::fromString(args[0], distance);
 //	if (distance<=0.0f) return false;
 
 	if (args.size()<2)
@@ -781,11 +787,13 @@ NLMISC_COMMAND(actorSetRespawnDelay,"set actor respawn delay","<min time> [<max
 	if(args.size() <1) return false;
 	COMMAND_MACRO_RECORD_TEST
 
-	float min=(float)atof(args[0].c_str());
+	float min;
+	NLMISC::fromString(args[0], min);
 	if (min<=0.0f) return false;
 
 	unsigned start;
-	float max=(float)atof(args[0].c_str());
+	float max;
+	NLMISC::fromString(args[0], max);
 	if (max==0.0f) 
 	{
 		max=min;
@@ -1144,10 +1152,14 @@ NLMISC_COMMAND(generateScript, "Generate a sript that spawn a given type of crea
 		return false;
 
 	const string				&scriptName = args[0];
-	double						spawnX = atof(args[1].c_str());
-	double						spawnY = atof(args[2].c_str());
-	double						spacing = atof(args[3].c_str());
-	uint						width = atoi(args[4].c_str());
+	double						spawnX;
+	NLMISC::fromString(args[1], spawnX);
+	double						spawnY;
+	NLMISC::fromString(args[2], spawnY);
+	double						spacing;
+	NLMISC::fromString(args[3], spacing);
+	uint						width;
+	NLMISC::fromString(args[4], width);
 	const string				&extension = args[5];
 	vector<string>				filters;
 
diff --git a/code/ryzom/server/src/ai_data_service/pacs_scan.cpp b/code/ryzom/server/src/ai_data_service/pacs_scan.cpp
index 28e55559c..e52b97573 100644
--- a/code/ryzom/server/src/ai_data_service/pacs_scan.cpp
+++ b/code/ryzom/server/src/ai_data_service/pacs_scan.cpp
@@ -1651,7 +1651,7 @@ public:
 									first.flags = (topNode.isInWater() ? 1 : 0) + (topNode.isInNogo() ? 2 : 0);
 
 									// push first position
-									stacks[first.flags].insert(make_pair<sint, CWorldPosition>(first.flags, stwp));
+									stacks[first.flags].insert(std::pair<sint, CWorldPosition>(first.flags, stwp));
 
 									while (true)
 									{
@@ -1750,11 +1750,11 @@ public:
 													}
 													if (tmp.getTopologyNode().Id == topNode.Id)
 													{
-														stacks[0].insert(make_pair<sint, CWorldPosition>(ndist, tmp));
+														stacks[0].insert(std::pair<sint, CWorldPosition>(ndist, tmp));
 													}
 													else
 													{
-														stacks[tmpflags+1].insert(make_pair<sint, CWorldPosition>(ndist, tmp));
+														stacks[tmpflags + 1].insert(std::pair<sint, CWorldPosition>(ndist, tmp));
 													}
 												}										
 											}
@@ -2465,9 +2465,17 @@ NLMISC_COMMAND(setDefaultStart,"Set the default start point for all continents",
 
 	CVectorD	startPoint;
 
-	startPoint.x = atof(args[0].c_str());
-	startPoint.y = atof(args[1].c_str());
-	startPoint.z = (args.size() < 3 ? 0.0 : atof(args[2].c_str()));
+	NLMISC::fromString(args[0], startPoint.x);
+	NLMISC::fromString(args[1], startPoint.y);
+
+	if (args.size() > 2)
+	{
+		NLMISC::fromString(args[2], startPoint.z);
+	}
+	else
+	{
+		startPoint.z = 0.0;
+	}
 
 	DefaultStartPoint = startPoint;
 
@@ -2921,13 +2929,15 @@ NLMISC_COMMAND(testPacsMove, "test a pacs move", "<continent> <x> <y> <dx> <dy>"
 	if (args.size() != 5)
 		return false;
 
-	CPacsCruncher	pc;
+	CPacsCruncher pc;
+
+	string name = args[0];
 
-	string		name = args[0];
-	double		x = atof(args[1].c_str());
-	double		y = atof(args[2].c_str());
-	double		dx = atof(args[3].c_str());
-	double		dy = atof(args[4].c_str());
+	double x, y, dx, dy;
+	NLMISC::fromString(args[1], x);
+	NLMISC::fromString(args[2], y);
+	NLMISC::fromString(args[3], dx);
+	NLMISC::fromString(args[4], dy);
 
 	pc.init(name);
 
diff --git a/code/ryzom/server/src/ai_service/ai.cpp b/code/ryzom/server/src/ai_service/ai.cpp
index 587e5ac0c..49144fa9d 100644
--- a/code/ryzom/server/src/ai_service/ai.cpp
+++ b/code/ryzom/server/src/ai_service/ai.cpp
@@ -224,7 +224,7 @@ uint32	CAIS::getEmotNumber(const std::string &name)
 {
 	std::map<std::string, uint32>::iterator it(_EmotNames.find(name));
 	if	(it==_EmotNames.end())
-		return	~0;
+		return	std::numeric_limits<uint32>::max();
 	return it->second;
 }
 
@@ -280,7 +280,7 @@ uint32	CAIS::createAIInstance(const std::string &continentName, uint32 instanceN
 			continue;
 
 		nlwarning("CAIS::createAIInstance: instance number %u is already in use, can't create new instance.", instanceNumber);
-		return	~0;
+		return	std::numeric_limits<uint32>::max();
 	}
 
 	CAIInstance	*aii = _AIInstances.addChild(new CAIInstance(this));
diff --git a/code/ryzom/server/src/ai_service/ai.h b/code/ryzom/server/src/ai_service/ai.h
index 4f9a7d802..57ff524ec 100644
--- a/code/ryzom/server/src/ai_service/ai.h
+++ b/code/ryzom/server/src/ai_service/ai.h
@@ -104,7 +104,7 @@ public:
 	// classic init(), update() and release()
 
 	/** create an AI instance, return the instance index in the AIList
-	 *	Return ~0 if the instance number is already in use.
+	 *	Return std::numeric_limits<uint32>::max() if the instance number is already in use.
 	 */
 	uint32	createAIInstance(const std::string &continentName, uint32 instanceNumber);
 	/** destroy an AI Instance (useful for ring creation / destruction of session)
@@ -205,7 +205,7 @@ public:
 	/// Time warp managment. This method is called when time as warped more than 600ms
 	bool	advanceUserTimer(uint32 nbTicks);
 
-	/// Retreive emot number given it's name, return ~0 if not found
+	/// Retreive emot number given it's name, return std::numeric_limits<uint32>::max() if not found
 	uint32	getEmotNumber(const std::string &name);
 
 	CCont<CAIInstance>		&AIList	()		{	return	_AIInstances;	}
@@ -243,7 +243,7 @@ public:
 	class CCounter
 	{
 	public:
-		CCounter(const uint32 max=~0):_Total(0),_Max(max)
+		CCounter(const uint32 max=std::numeric_limits<uint32>::max()):_Total(0),_Max(max)
 		{}
 		virtual ~CCounter()
 		{}
diff --git a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
index cb183850e..201cc517c 100644
--- a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
+++ b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
@@ -714,9 +714,12 @@ void CBotNpc::sendVPA()	// alternate VPA
 
 void CBotNpc::sendVisualProperties()	// VisualPropertyA, B, C
 {
-	CMirrors::setVisualPropertyA( getSpawn()->dataSetRow(), _VisualPropertyA );
-	CMirrors::setVisualPropertyB( getSpawn()->dataSetRow(), _VisualPropertyB );
-	CMirrors::setVisualPropertyC( getSpawn()->dataSetRow(), _VisualPropertyC );
+	if (getSpawn())
+	{
+		CMirrors::setVisualPropertyA( getSpawn()->dataSetRow(), _VisualPropertyA );
+		CMirrors::setVisualPropertyB( getSpawn()->dataSetRow(), _VisualPropertyB );
+		CMirrors::setVisualPropertyC( getSpawn()->dataSetRow(), _VisualPropertyC );
+	}
 }
 
 bool CBotNpc::reSpawn(bool sendMessage)
@@ -875,9 +878,9 @@ Colors are something like that:
 2:	VERT CITRON		VERT CITRON			GREEN 
 3:	VERT			VERT				TURQUOISE 
 4:	BLEU			BLEU				BLUE 
-5:	ROUGE fonce		ROUGE (tout court)	CRIMSON 
+5:	ROUGE dark		ROUGE (normal)		CRIMSON 
 6:	BLANC			JAUNE				WHITE 
-7:	NOIR			BLEU tres fonce		BLACK
+7:	NOIR			BLEU very dark		BLACK
 
 3D column is (probably) used for equipment
 */
diff --git a/code/ryzom/server/src/ai_service/ai_generic_fight.cpp b/code/ryzom/server/src/ai_service/ai_generic_fight.cpp
index a19f747c3..f4c9a5cb0 100644
--- a/code/ryzom/server/src/ai_service/ai_generic_fight.cpp
+++ b/code/ryzom/server/src/ai_service/ai_generic_fight.cpp
@@ -571,7 +571,7 @@ bool CFightOrganizer::reorganizeIteration(CBot* bot)
 				ennemy=entity;
 			}
 		}
-		entity->_ChooseLastTime=~0;
+		entity->_ChooseLastTime = std::numeric_limits<uint32>::max();
 	}
 	
 	if (fleeEnnemy==NULL && !spawnBot->getUnreachableTarget().isNULL())
diff --git a/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp b/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp
index 2bab5200d..6cd657ff2 100644
--- a/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp
+++ b/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp
@@ -220,7 +220,7 @@ void CSpawnGroupFauna::update()
 	
 	getPersistent().updateStateInstance();
 	
-	if (_CurrentCycle==~0)
+	if (_CurrentCycle==std::numeric_limits<uint32>::max())
 		return;
 	
 	// Respawn
@@ -606,9 +606,9 @@ CGrpFauna::CGrpFauna(CMgrFauna* mgr, CAIAliasDescriptionNode* aliasTree, RYAI_MA
 	
 	// state
 	
-	_CurPopulation = ~0u;
+	_CurPopulation = std::numeric_limits<uint32>::max();
 	
-	_CurrentCycle = ~0;
+	_CurrentCycle = std::numeric_limits<sint32>::max();
 	
 	// default values.	
 	setTimer(EAT_TIME, refTimer(EAT_TIME));
@@ -699,9 +699,9 @@ CAliasTreeOwner* CGrpFauna::createChild(IAliasCont* cont, CAIAliasDescriptionNod
 				CAIPlaceXYRFauna *faunaPlace = new CAIPlaceXYRFauna(this, aliasTree);
 				child = faunaPlace;	
 				uint placeIndex = faunaPlace->setupFromOldName(name);
-				nlassert(placeIndex!=~0);				
+				nlassert(placeIndex!=std::numeric_limits<uint>::max());				
 
-				if (placeIndex!=~0)
+				if (placeIndex!=std::numeric_limits<uint>::max())
 					cont->addAliasChild(child, placeIndex);
 				
 				return child;
@@ -769,7 +769,7 @@ bool CGrpFauna::spawn()
 		return false;
 	
 	setStartState(getStartState());	//	stateInstance.
-	return spawnPop(~0);
+	return spawnPop(std::numeric_limits<uint>::max());
 }
 
 bool CGrpFauna::timeAllowSpawn(uint32 popVersion) const
@@ -841,7 +841,7 @@ bool CGrpFauna::spawnPop(uint popVersion)
 	}
 	
 	// check the validity of the input parameter
-	if (popVersion!=~0 && popVersion>=_Populations.size())
+	if (popVersion!=std::numeric_limits<uint>::max() && popVersion>=_Populations.size())
 	{
 		nlwarning("CGrpFauna::spawn(idx) FAILED for group %s because idx (%d) >= _Populations.size() (%d)",this->CGroup::getFullName().c_str(),popVersion,_Populations.size());
 		return	false;
diff --git a/code/ryzom/server/src/ai_service/ai_vector_mirror.h b/code/ryzom/server/src/ai_service/ai_vector_mirror.h
index 0464de4fb..da229b4c3 100644
--- a/code/ryzom/server/src/ai_service/ai_vector_mirror.h
+++ b/code/ryzom/server/src/ai_service/ai_vector_mirror.h
@@ -95,7 +95,7 @@ public:		// Methods.
 	inline	double	distTo(const CAIVectorMirror &dest)  const;
 	inline	double	distSqTo(const CAIVectorMirror &dest)  const;
 	inline	double	quickDistTo(const CAIVectorMirror &dest) const;
-	
+
 protected:
 	inline void	setX(const CAICoord &x)	{ _x=x;	}
 	inline void	setY(const CAICoord &y)	{ _y=y;	}
diff --git a/code/ryzom/server/src/ai_service/child_container.h b/code/ryzom/server/src/ai_service/child_container.h
index ab98d93af..0b5c79c4e 100644
--- a/code/ryzom/server/src/ai_service/child_container.h
+++ b/code/ryzom/server/src/ai_service/child_container.h
@@ -495,7 +495,7 @@ uint32 CAliasCont<TChld>::getChildIndexByAlias(uint32 alias) const
 		if (child!=NULL && child->getAlias()==alias)
 			return (uint32)i;
 	}
-	return ~0;
+	return std::numeric_limits<uint32>::max();
 }
 
 template <class TChld>
diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp
index d257d0492..641503b70 100644
--- a/code/ryzom/server/src/ai_service/commands.cpp
+++ b/code/ryzom/server/src/ai_service/commands.cpp
@@ -229,8 +229,9 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<aiInstanceId>
 		return true;
 	}
 	
-	double x = atof(args[3].c_str());
-	double y = atof(args[4].c_str());
+	double x, y;
+	NLMISC::fromString(args[3], x);
+	NLMISC::fromString(args[4], y);
 
 	double dispersionRadius = 10.;
 	if (args.size()>5)
@@ -577,10 +578,10 @@ NLMISC_COMMAND(createStaticAIInstance, "Create a new static AIInstance for a giv
 	CUsedContinent &uc = CUsedContinent::instance();
 
 	const	uint32 in = uc.getInstanceForContinent(args[0]);
-	if (in == ~0)
+	if (in == INVALID_AI_INSTANCE)
 	{
 		nlwarning("The continent '%s' is unknow or not active. Can't create instance, FATAL", args[0].c_str());
-		nlassert(in != ~0);
+		nlassert(in != INVALID_AI_INSTANCE);
 //		nlassertex(in != ~0, ("The continent '%s' is unknow or not active. Can't create instance, FATAL", args[0].c_str()));
 	}
 
@@ -1969,9 +1970,13 @@ NLMISC_COMMAND(displayVision3x3,"display 3x3 cell vision centred on a given coor
 		}
 	}
 
+	double dx, dy;
+	NLMISC::fromString(args[1], dx);
+	NLMISC::fromString(args[2], dy);
+
 	CAICoord x, y;
-	x=atof(args[1].c_str());
-	y=atof(args[2].c_str());
+	x = dx;
+	y = dy;
 	log.displayNL("3x3 Vision around (%.3f,%.3f)", x.asDouble(), y.asDouble());
 
 	uint32 botCount=0;
diff --git a/code/ryzom/server/src/ai_service/continent_inline.h b/code/ryzom/server/src/ai_service/continent_inline.h
index 49c21248e..4ddf09c18 100644
--- a/code/ryzom/server/src/ai_service/continent_inline.h
+++ b/code/ryzom/server/src/ai_service/continent_inline.h
@@ -695,7 +695,7 @@ static CAIVector randomPos(double dispersionRadius)
 	{
 		return CAIVector(0., 0.);
 	}
-	uint32 const maxLimit=((uint32)~0U)>>1;
+	uint32 const maxLimit=(std::numeric_limits<uint32>::max())>>1;
 	double rval = (double)CAIS::rand32(maxLimit)/(double)maxLimit; // [0-1[
 	double r = dispersionRadius*sqrt(rval);
 	rval = (double)CAIS::rand32(maxLimit)/(double)maxLimit; // [0-1[
diff --git a/code/ryzom/server/src/ai_service/event_manager.h b/code/ryzom/server/src/ai_service/event_manager.h
index ab49b8d68..731539051 100644
--- a/code/ryzom/server/src/ai_service/event_manager.h
+++ b/code/ryzom/server/src/ai_service/event_manager.h
@@ -17,6 +17,8 @@
 #ifndef RYAI_EVENT_MANAGER_H
 #define RYAI_EVENT_MANAGER_H
 
+#include <functional>
+
 #include "event_reaction.h"
 #include "states.h"
 
diff --git a/code/ryzom/server/src/ai_service/family_behavior.h b/code/ryzom/server/src/ai_service/family_behavior.h
index 893282ae0..52d534e1c 100644
--- a/code/ryzom/server/src/ai_service/family_behavior.h
+++ b/code/ryzom/server/src/ai_service/family_behavior.h
@@ -210,7 +210,7 @@ class CFamilyBehavior
 
 	void	spawnBoss(NLMISC::TStringId outpostName);
 
-	uint32	energyScale	(uint32 levelIndex=~0)	const;
+	uint32	energyScale	(uint32 levelIndex=std::numeric_limits<uint32>::max())	const;
 
 	void	setModifier	(const	float	&value, const	uint32	&index)
 	{
diff --git a/code/ryzom/server/src/ai_service/generic_logic_action.cpp b/code/ryzom/server/src/ai_service/generic_logic_action.cpp
index afd0f9b3c..e2c761619 100644
--- a/code/ryzom/server/src/ai_service/generic_logic_action.cpp
+++ b/code/ryzom/server/src/ai_service/generic_logic_action.cpp
@@ -1407,13 +1407,12 @@ public:
 			return false;
 		}
 
-		//	check if its a number or a var.
-		//TODO: et les variables negatives?
+		// check if it's a number or a var.
+		//TODO: and negative values ?
 		if ((str[0]<='9' && str[0]>='0')||(str[0]=='-'))	//	its a number
 		{
 			var.Type = constant;
-			double val = atof(str.c_str());
-			var.Value = float(val);
+			NLMISC::fromString(str, var.Value);
 			return	true;
 		}
 
diff --git a/code/ryzom/server/src/ai_service/nf_helpers.h b/code/ryzom/server/src/ai_service/nf_helpers.h
index 2b8ead4e6..dc9c7c345 100644
--- a/code/ryzom/server/src/ai_service/nf_helpers.h
+++ b/code/ryzom/server/src/ai_service/nf_helpers.h
@@ -161,7 +161,7 @@ public:
 		if	(_value==-1)	//	not for affectation.
 			return;
 		
-		if	(_index==~0)	//	all indexs ?
+		if	(_index==std::numeric_limits<size_t>::max())	//	all indexs ?
 		{
 			for	(uint32 nrjIndex=0;nrjIndex<4;nrjIndex++)
 				fb->setModifier	(_value, nrjIndex);
diff --git a/code/ryzom/server/src/ai_service/path_behaviors.h b/code/ryzom/server/src/ai_service/path_behaviors.h
index 8c509ae9d..6684b2db3 100644
--- a/code/ryzom/server/src/ai_service/path_behaviors.h
+++ b/code/ryzom/server/src/ai_service/path_behaviors.h
@@ -168,11 +168,11 @@ public:
 	// - This method adds the new object to the top of the CFollowPath singleton's context stack
 	// parameters:
 	// - contextName	: an arbitrary string naming the context
-	// - maxSearchDepth	: the value that the path finder search depth should be limitted to (default to ~0u meaning no limit)
+	// - maxSearchDepth	: the value that the path finder search depth should be limitted to (default to std::numeric_limits<uint32>::max() meaning no limit)
 	// - forceMaxDepth	: set this flag true to override previous limit with larger value
 	// example:
-	// - ... Before we begin ... CFollowPath::_MaxSearchDepth = ~0u
-	// - CFollowPathContext context1("tata")			: CFollowPath::_MaxSearchDepth => ~0u
+	// - ... Before we begin ... CFollowPath::_MaxSearchDepth = std::numeric_limits<uint32>::max()
+	// - CFollowPathContext context1("tata")			: CFollowPath::_MaxSearchDepth => std::numeric_limits<uint32>::max()
 	// - CFollowPathContext context2("tete",456)		: CFollowPath::_MaxSearchDepth => 456
 	// - CFollowPathContext context3("titi",123)		: CFollowPath::_MaxSearchDepth => 123
 	// - CFollowPathContext context4("toto",456)		: CFollowPath::_MaxSearchDepth => 123
@@ -182,9 +182,9 @@ public:
 	// - CFollowPathContext context5.~CFollowPathContext()	: CFollowPath::_MaxSearchDepth => 123
 	// - CFollowPathContext context4.~CFollowPathContext()	: CFollowPath::_MaxSearchDepth => 123
 	// - CFollowPathContext context3.~CFollowPathContext()	: CFollowPath::_MaxSearchDepth => 456
-	// - CFollowPathContext context2.~CFollowPathContext()	: CFollowPath::_MaxSearchDepth => ~0u
-	// - CFollowPathContext context1.~CFollowPathContext()	: CFollowPath::_MaxSearchDepth => ~0u
-	CFollowPathContext(const char* contextName, uint32 maxSearchDepth=~0u, bool forceMaxDepth=false);
+	// - CFollowPathContext context2.~CFollowPathContext()	: CFollowPath::_MaxSearchDepth => std::numeric_limits<uint32>::max()
+	// - CFollowPathContext context1.~CFollowPathContext()	: CFollowPath::_MaxSearchDepth => std::numeric_limits<uint32>::max()
+	CFollowPathContext(const char* contextName, uint32 maxSearchDepth=std::numeric_limits<uint32>::max(), bool forceMaxDepth=false);
 
 	// dtor
 	// - This method removes the destroyed object from the CFollowPath singleton's context stack
@@ -270,7 +270,7 @@ private:
 	friend class CFollowPathContext;
 	CFollowPathContext* _TopFollowPathContext;
 public:
-	uint32 getMaxSearchDepth() const { return (_TopFollowPathContext==NULL)? ~0u: _TopFollowPathContext->getMaxSearchDepth(); }
+	uint32 getMaxSearchDepth() const { return (_TopFollowPathContext==NULL)? std::numeric_limits<uint32>::max(): _TopFollowPathContext->getMaxSearchDepth(); }
 	const char* getContextName() const;
 };
 
diff --git a/code/ryzom/server/src/ai_service/state_instance.h b/code/ryzom/server/src/ai_service/state_instance.h
index 94755c143..3ad6e6d55 100644
--- a/code/ryzom/server/src/ai_service/state_instance.h
+++ b/code/ryzom/server/src/ai_service/state_instance.h
@@ -185,7 +185,7 @@ protected:
 	CAITimerExtended _StateTimeout;			
 	/// current state (index into manager's state vector)		
 	CAIState* _state;
-	/// variable set to request a state change (~0 otherwise)
+	/// variable set to request a state change (std::numeric_limits<uint32>::max() otherwise)
 	CAIState* _NextState;
 	
 	/// timer for timing	punctual states
diff --git a/code/ryzom/server/src/ai_share/16x16_layer.cpp b/code/ryzom/server/src/ai_share/16x16_layer.cpp
index c820e4f7b..4e78cf54e 100644
--- a/code/ryzom/server/src/ai_share/16x16_layer.cpp
+++ b/code/ryzom/server/src/ai_share/16x16_layer.cpp
@@ -100,7 +100,7 @@ I16x16Layer		*I16x16Layer::compress(I16x16Layer *layer, sint32 blank)
 
 		map<sint32, uint>::iterator	it = count.find(val);
 		if (it == count.end())
-			count.insert(make_pair<sint32, uint>(val, 1));
+			count.insert(std::pair<sint32, uint>(val, 1));
 		else
 			++((*it).second);
 	}
diff --git a/code/ryzom/server/src/ai_share/aids_messages.h b/code/ryzom/server/src/ai_share/aids_messages.h
index 7ef43817b..734acbec3 100644
--- a/code/ryzom/server/src/ai_share/aids_messages.h
+++ b/code/ryzom/server/src/ai_share/aids_messages.h
@@ -97,16 +97,16 @@ class CMsgAIFeedback : public NLNET::CTransportClass
 public:
 	std::string Message;
 
-	CMsgAIFeedback() 
+	CMsgAIFeedback()
 	{
 	}
 	
-	CMsgAIFeedback(std::string message) 
+	CMsgAIFeedback(const std::string &message)
 	{
 		Message=message;
 	}
 
-	CMsgAIFeedback(char *msgStr) 
+	CMsgAIFeedback(const char *msgStr)
 	{
 		Message=std::string(msgStr);
 	}
@@ -120,6 +120,5 @@ public:
 	virtual void callback (const std::string &name, NLNET::TServiceId id);
 };
 
-
 #endif
 
diff --git a/code/ryzom/server/src/ai_share/primitive_parser.cpp b/code/ryzom/server/src/ai_share/primitive_parser.cpp
index 892120902..dd52b4d7a 100644
--- a/code/ryzom/server/src/ai_share/primitive_parser.cpp
+++ b/code/ryzom/server/src/ai_share/primitive_parser.cpp
@@ -4176,7 +4176,7 @@ NLMISC_COMMAND(loadMap,"load a complete set of primitive files","<map name>")
 		// check that the continent is active
 		CUsedContinent &uc = CUsedContinent::instance();
 		uint32 in = uc.getInstanceForContinent(continentName);
-		if (in == ~0)
+		if (in == INVALID_AI_INSTANCE)
 		{
 			log.displayNL("loadMap : while loading map '%s', can't load primitive '%s' coz continent '%s' is not active",
 				args[0].c_str(),
@@ -4216,7 +4216,7 @@ NLMISC_COMMAND(unloadMap,"unload a complete set of primitive files","<map name>"
 			// check that the continent is active
 			CUsedContinent &uc = CUsedContinent::instance();
 			uint32 in = uc.getInstanceForContinent(continentName);
-			if (in == ~0)
+			if (in == INVALID_AI_INSTANCE)
 			{
 				log.displayNL("unloadMap : while loading map '%s', can't load primitive '%s' coz continent '%s' is not active",
 					args[0].c_str(),
diff --git a/code/ryzom/server/src/ai_share/world_map.cpp b/code/ryzom/server/src/ai_share/world_map.cpp
index eae84acbf..f468c1144 100644
--- a/code/ryzom/server/src/ai_share/world_map.cpp
+++ b/code/ryzom/server/src/ai_share/world_map.cpp
@@ -1469,7 +1469,7 @@ bool CWorldMap::findAStarPath(CWorldPosition const& start, CWorldPosition const&
 	uint father = (uint)nodes.size()-1;
 
 	// Add start topology to visited nodes (father holds start topo node index for the moment)
-	visited.insert(make_pair<CTopology::TTopologyId,uint>(startTopo, father));
+	visited.insert(std::pair<CTopology::TTopologyId, uint>(startTopo, father));
 	// Push start node in the heap with a zero cost
 	heap.push(0.0f, father);
 
@@ -1562,7 +1562,7 @@ bool CWorldMap::findAStarPath(CWorldPosition const& start, CWorldPosition const&
 			// Add node to heap with a computed f(n)=g(n)+h(n)
 			heap.push(distance + heuristic, child);
 			// Add node to visited
-			visited.insert(make_pair<CTopology::TTopologyId,uint>(next, child));
+			visited.insert(std::pair<CTopology::TTopologyId, uint>(next, child));
 		}
 	}
 
@@ -1633,7 +1633,7 @@ bool	CWorldMap::findAStarPath(const CTopology::TTopologyId &start, const CTopolo
 	uint	father = (uint)nodes.size()-1;
 
 	// add current to visited nodes
-	visited.insert(make_pair<CTopology::TTopologyId,uint>(startTopo, father));
+	visited.insert(std::pair<CTopology::TTopologyId, uint>(startTopo, father));
 	heap.push(0.0f, father);
 
 	bool	found=false;
@@ -1699,7 +1699,7 @@ bool	CWorldMap::findAStarPath(const CTopology::TTopologyId &start, const CTopolo
 
 			// add node to visited and to heap
 			heap.push(heuristic, child);
-			visited.insert(make_pair<CTopology::TTopologyId,uint>(next, child));
+			visited.insert(std::pair<CTopology::TTopologyId, uint>(next, child));
 		}
 	}
 
@@ -1767,7 +1767,7 @@ bool CWorldMap::findInsideAStarPath(CWorldPosition const& start, CWorldPosition
 	uint father = (uint)nodes.size()-1;
 
 	// Add start node to visited nodes (father holds start node index for the moment)
-	visited.insert(make_pair<CAStarNode, uint>(startNode, father));
+	visited.insert(std::pair<CAStarNode, uint>(startNode, father));
 	// Push start node in the heap with a zero cost
 	heap.push(0.0f, father);
 
@@ -1854,7 +1854,7 @@ bool CWorldMap::findInsideAStarPath(CWorldPosition const& start, CWorldPosition
 			// Add node to heap with a computed f(n)=g(n)+h(n)
 			heap.push(distance + heuristic, child);
 			// Add node to visited
-			visited.insert(make_pair<CAStarNode, uint>(next, child));
+			visited.insert(std::pair<CAStarNode, uint>(next, child));
 		}
 	}
 
diff --git a/code/ryzom/server/src/backup_service/backup_service.cpp b/code/ryzom/server/src/backup_service/backup_service.cpp
index aed50a32c..95c11d07a 100644
--- a/code/ryzom/server/src/backup_service/backup_service.cpp
+++ b/code/ryzom/server/src/backup_service/backup_service.cpp
@@ -718,7 +718,7 @@ void CBackupService::init()
 		BSIsSlave = true;
 		FileManager.forbidStall();
 		// I'm a slave, try to contact master
-		string	host = MasterBSHost;
+		string	host = MasterBSHost.get();
 		if (host.find (":") == string::npos)
 			host += ":49990";
 
diff --git a/code/ryzom/server/src/backup_service/web_connection.cpp b/code/ryzom/server/src/backup_service/web_connection.cpp
index 86a62902d..6afa8f885 100644
--- a/code/ryzom/server/src/backup_service/web_connection.cpp
+++ b/code/ryzom/server/src/backup_service/web_connection.cpp
@@ -209,10 +209,10 @@ void	cbGetSaveList(CMemStream &msgin, TSockId host)
 
 	explode(str, string("%%"), params, true);
 
-	string	incrementalDir = IncrementalBackupDirectory;
-	string	saveShardRoot = SaveShardRoot;
-	string	templatePath = SaveTemplatePath;
-	string	extList = SaveExtList;
+	string	incrementalDir = IncrementalBackupDirectory.get();
+	string	saveShardRoot = SaveShardRoot.get();
+	string	templatePath = SaveTemplatePath.get();
+	string	extList = SaveExtList.get();
 
 	string	shard;
 	string	userid;
@@ -293,8 +293,8 @@ void	cbRestoreSave(CMemStream &msgin, TSockId host)
 
 	explode(str, string("%%"), params, true);
 
-	string	saveShardRoot = SaveShardRoot;
-	string	templatePath = SaveTemplatePath;
+	string	saveShardRoot = SaveShardRoot.get();
+	string	templatePath = SaveTemplatePath.get();
 
 	string	shard;
 	string	userid;
@@ -368,9 +368,9 @@ void	cbCopyOverSave(CMemStream &msgin, TSockId host)
 
 	explode(str, string("%%"), params, true);
 
-	string	saveShardRoot = SaveShardRoot;
-	string	templatePath = SaveTemplatePath;
-	string	extList = SaveExtList;
+	string	saveShardRoot = SaveShardRoot.get();
+	string	templatePath = SaveTemplatePath.get();
+	string	extList = SaveExtList.get();
 
 	string	shard;
 	string	userid;
diff --git a/code/ryzom/server/src/dynamic_scenario_service/service.cpp b/code/ryzom/server/src/dynamic_scenario_service/service.cpp
index 342a05c23..07c454566 100644
--- a/code/ryzom/server/src/dynamic_scenario_service/service.cpp
+++ b/code/ryzom/server/src/dynamic_scenario_service/service.cpp
@@ -56,8 +56,6 @@ namespace R2
 // The ligo config
 NLLIGO::CLigoConfig* LigoConfigPtr;
 CR2LigoConfig R2LigoConfig;
-
-
 }
 
 
diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp
index 20941e77f..22254c64b 100644
--- a/code/ryzom/server/src/entities_game_service/admin.cpp
+++ b/code/ryzom/server/src/entities_game_service/admin.cpp
@@ -420,7 +420,7 @@ bool getAIInstanceFromGroupName(string& groupName, uint32& instanceNumber)
 	{
 		string continent = groupName.substr(0, groupName.find('@'));
 		uint32 nr = CUsedContinent::instance().getInstanceForContinent(continent);
-		if (nr == ~0)
+		if (nr == INVALID_AI_INSTANCE)
 		{
 			return false;
 		}
@@ -4821,9 +4821,9 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		for( uint32 i = 0; i < inventory->getSlotCount(); ++ i)
 		{
 			const CGameItemPtr itemPtr = inventory->getItem(i);
-			if( itemPtr != NULL )
+			if ( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
+				if ( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
 					numberItem += itemPtr->getStackSize();
 				}
@@ -4841,9 +4841,9 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		for( uint32 i = 0; i < inventory->getSlotCount(); ++ i)
 		{
 			const CGameItemPtr itemPtr = inventory->getItem(i);
-			if( itemPtr != NULL )
+			if ( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
+				if ( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
 					numberItem -= inventory->deleteStackItem(i, quantity);
 					if(numberItem == 0)
@@ -5053,7 +5053,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			}
 			CSheetId creatureSheetId(command_args[2]);
 			CCreature *creature = CreatureManager.getCreature(target);
-			if (creature == NULL ||  creatureSheetId == CSheetId::Unknown || creatureSheetId != creature->getType())
+
+			if (creature == NULL || creatureSheetId == CSheetId::Unknown || creatureSheetId != creature->getType())
 			{
 				if (send_url)
 					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_sheet", getSalt());
@@ -5686,7 +5687,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			{
 
 				CEntityBase *entityBase = PlayerManager.getCharacterByName (CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), value));
-				if (entityBase == 0)
+				if (entityBase == NULL)
 				{
 					// try to find the bot name
 					vector<TAIAlias> aliases;
@@ -5711,7 +5712,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 					}
 
 				}
-				if (entityBase != 0)
+				if (entityBase != NULL)
 				{
 					x = entityBase->getState().X + sint32 (cos (entityBase->getState ().Heading) * 2000);
 					y = entityBase->getState().Y + sint32 (sin (entityBase->getState ().Heading) * 2000);
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.cpp b/code/ryzom/server/src/entities_game_service/database_plr.cpp
index 7cf0d2108..4b5fa84fd 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.cpp
+++ b/code/ryzom/server/src/entities_game_service/database_plr.cpp
@@ -1,3 +1,18 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
 
 /////////////////////////////////////////////////////////////////
 // WARNING : this is a generated file, don't change it !
@@ -347,7 +362,7 @@ void CBankAccessor_PLR::TUSER::init(ICDBStructNode *parent)
 	node  = parent->getNode( ICDBStructNode::CTextId("IS_INVISIBLE"), false );
 	nlassert(node != NULL);
 	_IS_INVISIBLE = node;
-	
+
 	node  = parent->getNode( ICDBStructNode::CTextId("COUNTER"), false );
 	nlassert(node != NULL);
 	_COUNTER = node;
@@ -3124,11 +3139,10 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint
 	node  = parent->getNode( ICDBStructNode::CTextId("DESPAWN"), false );
 	nlassert(node != NULL);
 	_DESPAWN = node;
-	
+
 	node  = parent->getNode( ICDBStructNode::CTextId("NAME"), false );
 	nlassert(node != NULL);
 	_NAME = node;
-	
 
 	// branch init
 	
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.h b/code/ryzom/server/src/entities_game_service/database_plr.h
index 38a394c88..67e0f7798 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.h
+++ b/code/ryzom/server/src/entities_game_service/database_plr.h
@@ -1,3 +1,18 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
 
 
 #ifndef INCLUDED_DATABASE_PLR_H
@@ -941,8 +956,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	
 		void setIS_INVISIBLE(CCDBSynchronised &dbGroup, bool value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _IS_INVISIBLE, value, forceSending);
 		}
 
@@ -958,7 +971,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		{
 			return _IS_INVISIBLE;
 		}
-	
+
 		void setCOUNTER(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false)
 		{
 			
@@ -1300,13 +1313,14 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		{
 			return _DODGE;
 		}
-	TBRICK_TICK_RANGE &getBRICK_TICK_RANGE()
+
+		TBRICK_TICK_RANGE &getBRICK_TICK_RANGE()
 		{
 			return _BRICK_TICK_RANGE;
 		}
-		
+
 	};
-		
+
 	class TTARGET
 	{
 	public:
@@ -3457,8 +3471,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	
 		void setMONEY(CCDBSynchronised &dbGroup, uint64 value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _MONEY, value, forceSending);
 		}
 
@@ -4560,8 +4572,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	
 		void setMONEY(CCDBSynchronised &dbGroup, uint64 value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _MONEY, value, forceSending);
 		}
 
@@ -4572,14 +4582,12 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 
 			return value;
 		}
-		
+
 		ICDBStructNode *getMONEYCDBNode()
 		{
 			return _MONEY;
 		}
-	
 	};
-		
 
 	private:
 		ICDBStructNode	*_BranchNode;
@@ -4602,11 +4610,8 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 			return _BranchNode;
 		}
 
-		
 		void setMONEY(CCDBSynchronised &dbGroup, uint64 value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _MONEY, value, forceSending);
 		}
 
@@ -6000,8 +6005,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	
 		void setMONEY_SHEET(CCDBSynchronised &dbGroup, NLMISC::CSheetId value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _MONEY_SHEET, value, forceSending);
 		}
 
@@ -8858,7 +8861,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		ICDBStructNode	*_HUNGER;
 		ICDBStructNode	*_DESPAWN;
 		ICDBStructNode	*_NAME;
-		
 
 	public:
 		void init(ICDBStructNode *parent, uint index);
@@ -9047,11 +9049,9 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		{
 			return _DESPAWN;
 		}
-	
+
 		void setNAME(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _NAME, value, forceSending);
 		}
 
@@ -9062,12 +9062,11 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 
 			return value;
 		}
-		
+
 		ICDBStructNode *getNAMECDBNode()
 		{
 			return _NAME;
 		}
-	
 	};
 		
 
diff --git a/code/ryzom/server/src/entities_game_service/deposit.cpp b/code/ryzom/server/src/entities_game_service/deposit.cpp
index 7d8000f4d..d4cd560ad 100644
--- a/code/ryzom/server/src/entities_game_service/deposit.cpp
+++ b/code/ryzom/server/src/entities_game_service/deposit.cpp
@@ -16,6 +16,7 @@
 
 
 #include "stdpch.h"
+#include <functional>
 #include "deposit.h"
 #include "player_manager/character.h"
 #include "player_manager/player_manager.h"
diff --git a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
index 90d41820f..98ec86a75 100644
--- a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
+++ b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
@@ -507,7 +507,7 @@ void CDynChatEGS::iosSetHideBubble(TChanID chan, bool hideBubble)
 void CDynChatEGS::iosSetUniversalChannel(TChanID chan, bool universalChannel)
 {
 	CMessage msg("DYN_CHAT:SET_UNIVERSAL_CHANNEL");
-	msg.serial(chan);	
+	msg.serial(chan);
 	msg.serial(universalChannel);
 	sendMessageViaMirror( "IOS", msg);
 }
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
index f36fe91ab..42517c190 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
@@ -237,24 +237,12 @@ void SItemSpecialEffects::serial(class NLMISC::IStream &f)
 //--------------------------------------------------------------
 //						init()  
 //--------------------------------------------------------------
-void CStaticItem::init()
+void CStaticItem::init(bool doDelete)
 {
 	Family			= ITEMFAMILY::UNDEFINED;
 	Type			= ITEM_TYPE::UNDEFINED;
 	
-	Armor			= NULL;
-	MeleeWeapon		= NULL;
-	RangeWeapon		= NULL;
-	Ammo			= NULL;
-	Shield			= NULL;
-	TamingTool		= NULL;
-	Mp				= NULL;
-	GuildOption		= NULL;
-	Cosmetics		= NULL;
-	ItemServiceData	= NULL;
-	ConsumableItem	= NULL;
-	XpCatalyser		= NULL;
-	CommandTicket	= NULL;
+	clearPtrs(doDelete);
 
 	Skill			= SKILLS::unknown;
 	MinSkill		= 0;
@@ -287,16 +275,54 @@ void CStaticItem::init()
 	RequiredCharacQualityFactor = 0.0f;
 	RequiredCharacQualityOffset = 0;
 
-	ItemSpecialEffects = NULL;
 } // init //
 
 
+// ***************************************************************************
+void CStaticItem::clearPtrs(bool doDelete)
+{
+	if (doDelete)
+	{
+		delete Armor;
+		delete MeleeWeapon;
+		delete RangeWeapon;
+		delete Ammo;
+		delete Shield;
+		delete TamingTool;
+		delete Mp;
+		delete GuildOption;
+		delete Cosmetics;
+		delete ItemServiceData;
+		delete ConsumableItem;
+		delete XpCatalyser;
+		delete CommandTicket;
+		delete ItemSpecialEffects;
+	}
+
+	Armor			= NULL;
+	MeleeWeapon		= NULL;
+	RangeWeapon		= NULL;
+	Ammo			= NULL;
+	Shield			= NULL;
+	TamingTool		= NULL;
+	Mp				= NULL;
+	GuildOption		= NULL;
+	Cosmetics		= NULL;
+	ItemServiceData	= NULL;
+	ConsumableItem	= NULL;
+	XpCatalyser		= NULL;
+	CommandTicket	= NULL;
+	ItemSpecialEffects = NULL;
+}
+
 
 //--------------------------------------------------------------
 // copy constructor
 //--------------------------------------------------------------
 CStaticItem::CStaticItem( const CStaticItem& itm )
 {
+	clearPtrs(false);
+
 	*this = itm;
 	if(itm.Armor)
 	{
@@ -1443,6 +1469,9 @@ void CStaticItem::readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form,
 	if (form == NULL)
 		return;
 
+	// Clear pointers to previous data
+	clearPtrs(true);
+
 	// Get the root node, always exist
     UFormElm &root = form->getRootNode ();
 
@@ -1993,37 +2022,6 @@ float CStaticItem::getBaseWeight() const
 }
 #endif
 
-// ***************************************************************************
-void CStaticItem::clearPtrs(bool doDelete)
-{
-	if(doDelete)
-	{
-		if (Ammo != NULL )	delete Ammo;
-		if (Armor != NULL )	delete Armor;
-		if (MeleeWeapon != NULL )	delete MeleeWeapon;
-		if (RangeWeapon != NULL )	delete RangeWeapon;
-		if (Cosmetics != NULL )	delete Cosmetics;
-		if (Mp != NULL )	delete Mp;
-		if (GuildOption != NULL )	delete GuildOption;
-		if (Shield != NULL )	delete Shield;
-		if (TamingTool != NULL)	delete TamingTool;
-		if (ItemServiceData != NULL)	delete ItemServiceData;
-		if (CommandTicket != NULL)	delete CommandTicket;
-	}
-
-	Ammo = NULL;
-	Armor = NULL;
-	MeleeWeapon = NULL;
-	RangeWeapon = NULL;
-	Cosmetics = NULL;
-	Mp = NULL;
-	GuildOption = NULL;
-	Shield = NULL;
-	TamingTool = NULL;
-	ItemServiceData = NULL;
-	CommandTicket = NULL;
-}
-
 
 uint32 CStaticItem::getMaxStackSize() const
 {
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
index ddea7be9c..96aae2e98 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
@@ -812,13 +812,13 @@ public:
 public:
 
 	/// Constructor
-	CStaticItem() { init(); }
+	CStaticItem() { init(false); }
 
 	/// copy constructor
 	CStaticItem( const CStaticItem& itm );
 
 	/// init method
-	void init();
+	void init(bool doDelete = true);
 
 	/// destructor
 	virtual ~CStaticItem();
diff --git a/code/ryzom/server/src/entities_game_service/fame_pd.cpp b/code/ryzom/server/src/entities_game_service/fame_pd.cpp
index db2104c5d..2e201412a 100644
--- a/code/ryzom/server/src/entities_game_service/fame_pd.cpp
+++ b/code/ryzom/server/src/entities_game_service/fame_pd.cpp
@@ -516,7 +516,7 @@ void							CFameContainerPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		NLMISC::CSheetId	__k;
 		data.serial(__k);
-		_Entries.insert(std::make_pair<NLMISC::CSheetId,CFameContainerEntryPD>(__k, CFameContainerEntryPD()));
+		_Entries.insert(std::pair<NLMISC::CSheetId,CFameContainerEntryPD>(__k, CFameContainerEntryPD()));
 		CFameContainerEntryPD*	__o = &(_Entries[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
diff --git a/code/ryzom/server/src/entities_game_service/game_event_manager.cpp b/code/ryzom/server/src/entities_game_service/game_event_manager.cpp
index 5346809a3..b95fb1ad4 100644
--- a/code/ryzom/server/src/entities_game_service/game_event_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_event_manager.cpp
@@ -59,7 +59,7 @@ CGameEventManager::CGameEventManager()
 // ----------------------------------------------------------------------------
 void CGameEventManager::init()
 {
-	string sFilename = GameEventFile;
+	string sFilename = GameEventFile.get();
 	sFilename = CPath::standardizePath(IService::getInstance()->WriteFilesDirectory) + sFilename;
 
 	if (CFile::fileExists(sFilename))
@@ -302,7 +302,7 @@ void CGameEventManager::saveGameEventFile()
 {
 	if( _InitOk )
 	{
-		string sFilename = GameEventFile;
+		string sFilename = GameEventFile.get();
 		sFilename = CPath::standardizePath(IService::getInstance()->WriteFilesDirectory) + sFilename;
 		
 		static CPersistentDataRecordRyzomStore	pdr;
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
index 30ff4acae..e36a4382e 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
@@ -242,11 +242,11 @@ float CItemCraftParameters::getCraftParameterValue( RM_FABER_STAT_TYPE::TRMStatT
 		case RM_FABER_STAT_TYPE::ShockWaveProtection:
 		case RM_FABER_STAT_TYPE::PoisonProtection:
 		case RM_FABER_STAT_TYPE::ElectricityProtection:
-			if (Protection1 == statType)
+			if (Protection1 == (PROTECTION_TYPE::TProtectionType)statType)
 				return Protection1Factor;
-			else if (Protection2 == statType)
+			else if (Protection2 == (PROTECTION_TYPE::TProtectionType)statType)
 				return Protection2Factor;
-			else if (Protection3 == statType)
+			else if (Protection3 == (PROTECTION_TYPE::TProtectionType)statType)
 				return Protection3Factor;
 			else return 0.0f;
 		case RM_FABER_STAT_TYPE::DesertResistance:
diff --git a/code/ryzom/server/src/entities_game_service/guild_container_pd.cpp b/code/ryzom/server/src/entities_game_service/guild_container_pd.cpp
index dea4e2a1d..7e025acdf 100644
--- a/code/ryzom/server/src/entities_game_service/guild_container_pd.cpp
+++ b/code/ryzom/server/src/entities_game_service/guild_container_pd.cpp
@@ -298,7 +298,7 @@ void							CGuildContainerPD::pds__fetch(RY_PDS::CPData &data)
 		TGuildId	__k;
 		data.serial(__k);
 		CGuildPD*	__o = static_cast<CGuildPD*>(PDSLib.create(tableIndex));
-		_Guilds.insert(std::make_pair<TGuildId,CGuildPD*>(__k, __o));
+		_Guilds.insert(std::pair<TGuildId,CGuildPD*>(__k, __o));
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
 		__o->pds__setParentUnnotified(this);
diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp
index 03a105445..c04347c08 100644
--- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp
+++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp
@@ -559,7 +559,8 @@ void CGuildMemberModule::kickMember( uint16 index,uint8 session )const
 	}
 	// if the user is online reset its guild id
 	CGuildMemberModule * module = NULL;
-	if ( member->getReferencingModule( module ) )
+
+	if (member->getReferencingModule(module))
 	{
 		module->clearOnlineGuildProperties();
 	}
@@ -568,7 +569,7 @@ void CGuildMemberModule::kickMember( uint16 index,uint8 session )const
 	params[0].setEIdAIAlias( proxy.getId(), CAIAliasTranslator::getInstance()->getAIAlias(proxy.getId()) );
 	params[1].StringId = CEntityIdTranslator::getInstance()->getEntityNameStringId(member->getIngameEId());
 	sendMessageToGuildMembers("GUILD_KICK_MEMBER",params);
-	
+
 	guild->deleteMember( member );	
 }
 
diff --git a/code/ryzom/server/src/entities_game_service/guild_pd.cpp b/code/ryzom/server/src/entities_game_service/guild_pd.cpp
index 819ae72ad..1da40c221 100644
--- a/code/ryzom/server/src/entities_game_service/guild_pd.cpp
+++ b/code/ryzom/server/src/entities_game_service/guild_pd.cpp
@@ -470,7 +470,7 @@ void							CGuildPD::pds__fetch(RY_PDS::CPData &data)
 		TCharacterId	__k;
 		data.serial(__k);
 		CGuildMemberPD*	__o = static_cast<CGuildMemberPD*>(PDSLib.create(tableIndex));
-		_Members.insert(std::make_pair<TCharacterId,CGuildMemberPD*>(__k, __o));
+		_Members.insert(std::pair<TCharacterId,CGuildMemberPD*>(__k, __o));
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
 		__o->pds__setParentUnnotified(this);
diff --git a/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp b/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
index 7cc0bf32a..98d784e11 100644
--- a/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
@@ -236,6 +236,7 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 			MISLOG("user:%s cbClientGroupAbandonMission : Invalid team", userId.toString().c_str());
 			return;
 		}
+
 		if ( team->getLeader() != userId )
 		{
 			CCharacter::sendDynamicSystemMessage( user->getEntityRowId(), "REQ_LEADER_TO_ABANDON_MISSION" );
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
index 941b31afa..d967e6971 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
@@ -767,7 +767,7 @@ class CMissionActionRecvItem : public IMissionAction
 						freeSlotcount -= invTemp->getUsedSlotCount();
 						maxBulk -= invTemp->getInventoryBulk();
 					}
-					
+
 					if( (neededSlotCount <= freeSlotcount) && ( neededBulk + invBag->getInventoryBulk() <= maxBulk) )
 					{
 						fail = false;
@@ -862,7 +862,7 @@ class CMissionActionRecvItem : public IMissionAction
 						}
 						params[2].Int = _Item.getQuality();
 					}
-					
+
 					params[0].SheetId = _SheetId;
 					params[1].Int = _Quantity;
 					PHRASE_UTILITIES::sendDynamicSystemMessage(user->getEntityRowId(),"MIS_RECV_ITEM", params);
@@ -1050,7 +1050,7 @@ class CMissionActionRecvNamedItem : public IMissionAction
 				sint16 neededSlotCount = (sint16) ceil( (float)_Quantity / itemTmp->getMaxStackSize() );
 				uint32 neededBulk = _Quantity * itemTmp->getStackBulk();
 				itemTmp.deleteItem();
-				
+
 				bool fail = true;
 				for ( uint i = 0; i < entities.size(); i++ )
 				{
@@ -1067,15 +1067,15 @@ class CMissionActionRecvNamedItem : public IMissionAction
 							freeSlotcount -= invTemp->getUsedSlotCount();
 							maxBulk -= invTemp->getInventoryBulk();
 						}
-						
+
 						if( (neededSlotCount <= freeSlotcount) && ( neededBulk + invBag->getInventoryBulk() <= maxBulk) )
 						{
 							fail = false;
 							break;
 						}
 					}
-					
 				}
+
 				if( fail )
 				{
 					CMissionTemplate * templ = CMissionManager::getInstance()->getTemplate( instance->getTemplateId() );
@@ -1274,7 +1274,6 @@ class CMissionActionDestroyItem :
 		// If the "guild" parameter is not set, we destroy the items for the users
 		if (!_Guild)
 		{
-
 			for ( uint i = 0; i < entities.size(); i++ )
 			{
 				CCharacter * user = PlayerManager.getChar( entities[i] );
@@ -1303,7 +1302,6 @@ class CMissionActionDestroyItem :
 					PHRASE_UTILITIES::sendDynamicSystemMessage(user->getEntityRowId(),"MIS_DESTROY_ITEM", params);
 				}
 			}
-
 		}
 		// We destroy the item in the guild
 		else
@@ -1909,7 +1907,6 @@ class CMissionActionRecvMoney : public IMissionAction
 		// If the guild parameter is not set we just divide the money and give it to each entity
 		if (!_Guild)
 		{
-
 			uint amount = _Amount / (uint)entities.size();
 			if ( amount == 0 || _Amount % entities.size() )
 				amount++;
@@ -1924,7 +1921,6 @@ class CMissionActionRecvMoney : public IMissionAction
 					PHRASE_UTILITIES::sendDynamicSystemMessage(user->getEntityRowId(),"MIS_RECV_MONEY",params);
 				}
 			}
-
 		}
 		// Else we give the money to the guild
 		else
@@ -2026,7 +2022,6 @@ class CMissionActionRecvFame : public IMissionAction
 		// If there is no "guild" parameter we give the fame to every user
 		if (!_Guild)
 		{
-
 			for ( uint i = 0; i < entities.size(); i++ )
 			{
 				CEntityId eid = TheDataset.getEntityId(entities[i]);
@@ -2037,12 +2032,10 @@ class CMissionActionRecvFame : public IMissionAction
 				if (character)
 					character->sendEventForMissionAvailabilityCheck();
 			}
-
 		}
 		// Else we just give it to the guild
 		else
 		{
-
 			if (entities.size() == 0)
 				return;
 
@@ -2072,7 +2065,6 @@ class CMissionActionRecvFame : public IMissionAction
 				if (character)
 					character->sendEventForMissionAvailabilityCheck();
 			}
-
 		}
 
 	};
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp
index bab69042a..a821eef45 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp
@@ -48,7 +48,7 @@ CMissionQueueManager::CMissionQueueManager()
 // ----------------------------------------------------------------------------
 void CMissionQueueManager::init()
 {
-	string sFilename = MissionQueueFile;
+	string sFilename = MissionQueueFile.get();
 	sFilename = Bsi.getLocalPath() + sFilename;
 	
 	if (CFile::fileExists(sFilename))
@@ -141,7 +141,7 @@ void CMissionQueueManager::saveToFile()
 
 	if( _InitOk )
 	{
-		string sFilename = MissionQueueFile;
+		string sFilename = MissionQueueFile.get();
 		
 		// save file via Backup Service (BS)
 		try
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
index 7e99059b9..1caefb340 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
@@ -170,7 +170,6 @@ uint32 IMissionStepTemplate::sendStepText(CCharacter * user,const std::vector<ui
 			params = _AdditionalParams;
 			textPtr = &_OverridenText;
 		}
-
 	}
 
 	if( !textPtr )
diff --git a/code/ryzom/server/src/entities_game_service/mission_pd.cpp b/code/ryzom/server/src/entities_game_service/mission_pd.cpp
index ffa8855a9..1d5903687 100644
--- a/code/ryzom/server/src/entities_game_service/mission_pd.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_pd.cpp
@@ -328,7 +328,7 @@ void							CActiveStepPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		uint32	__k;
 		data.serial(__k);
-		_States.insert(std::make_pair<uint32,CActiveStepStatePD>(__k, CActiveStepStatePD()));
+		_States.insert(std::pair<uint32,CActiveStepStatePD>(__k, CActiveStepStatePD()));
 		CActiveStepStatePD*	__o = &(_States[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
@@ -2353,7 +2353,7 @@ void							CMissionPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		uint32	__k;
 		data.serial(__k);
-		_Steps.insert(std::make_pair<uint32,CActiveStepPD>(__k, CActiveStepPD()));
+		_Steps.insert(std::pair<uint32,CActiveStepPD>(__k, CActiveStepPD()));
 		CActiveStepPD*	__o = &(_Steps[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
@@ -2367,7 +2367,7 @@ void							CMissionPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		uint32	__k;
 		data.serial(__k);
-		_Compass.insert(std::make_pair<uint32,CMissionCompassPD>(__k, CMissionCompassPD()));
+		_Compass.insert(std::pair<uint32,CMissionCompassPD>(__k, CMissionCompassPD()));
 		CMissionCompassPD*	__o = &(_Compass[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
@@ -2381,7 +2381,7 @@ void							CMissionPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		uint32	__k;
 		data.serial(__k);
-		_StepsDone.insert(std::make_pair<uint32,CDoneStepPD>(__k, CDoneStepPD()));
+		_StepsDone.insert(std::pair<uint32,CDoneStepPD>(__k, CDoneStepPD()));
 		CDoneStepPD*	__o = &(_StepsDone[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
@@ -2395,7 +2395,7 @@ void							CMissionPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		uint32	__k;
 		data.serial(__k);
-		_Teleports.insert(std::make_pair<uint32,CMissionTeleportPD>(__k, CMissionTeleportPD()));
+		_Teleports.insert(std::pair<uint32,CMissionTeleportPD>(__k, CMissionTeleportPD()));
 		CMissionTeleportPD*	__o = &(_Teleports[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
@@ -2409,7 +2409,7 @@ void							CMissionPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		uint32	__k;
 		data.serial(__k);
-		_InsidePlaces.insert(std::make_pair<uint32,CMissionInsidePlacePD>(__k, CMissionInsidePlacePD()));
+		_InsidePlaces.insert(std::pair<uint32,CMissionInsidePlacePD>(__k, CMissionInsidePlacePD()));
 		CMissionInsidePlacePD*	__o = &(_InsidePlaces[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
@@ -2423,7 +2423,7 @@ void							CMissionPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		uint32	__k;
 		data.serial(__k);
-		_OutsidePlaces.insert(std::make_pair<uint32,CMissionOutsidePlacePD>(__k, CMissionOutsidePlacePD()));
+		_OutsidePlaces.insert(std::pair<uint32,CMissionOutsidePlacePD>(__k, CMissionOutsidePlacePD()));
 		CMissionOutsidePlacePD*	__o = &(_OutsidePlaces[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
@@ -2437,7 +2437,7 @@ void							CMissionPD::pds__fetch(RY_PDS::CPData &data)
 		if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX)	break;
 		uint32	__k;
 		data.serial(__k);
-		_HandledAIGroups.insert(std::make_pair<uint32,CHandledAIGroupPD>(__k, CHandledAIGroupPD()));
+		_HandledAIGroups.insert(std::pair<uint32,CHandledAIGroupPD>(__k, CHandledAIGroupPD()));
 		CHandledAIGroupPD*	__o = &(_HandledAIGroups[__k]);
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
@@ -3276,7 +3276,7 @@ void							CMissionContainerPD::pds__fetch(RY_PDS::CPData &data)
 		uint32	__k;
 		data.serial(__k);
 		CMissionPD*	__o = static_cast<CMissionPD*>(PDSLib.create(tableIndex));
-		_Missions.insert(std::make_pair<uint32,CMissionPD*>(__k, __o));
+		_Missions.insert(std::pair<uint32,CMissionPD*>(__k, __o));
 		PDSLib.setRowIndex(rowIndex, __o);
 		__o->pds__fetch(data);
 		__o->pds__setParentUnnotified(this);
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/faber_action.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/faber_action.cpp
index 50a069b5e..c49a45429 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/faber_action.cpp
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/faber_action.cpp
@@ -388,7 +388,7 @@ protected:
 			// compute success factor
 			sint deltaLvl;
 			float successFactor = CFaberActionCommon::getSuccessFactor( character, phrase, deltaLvl );
-			
+
 			// final item quality, depending of recommended skill of action used and lower quality of raw materials used and success factor of action
 			uint16 finalItemQuality = max( (uint16)1, (uint16) (min(phrase->getLowerRmQuality(),(uint16)phrase->getRecommendedSkill()) * successFactor) );
 			
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_version_adapter.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_version_adapter.cpp
index 1cf7940c6..adc281dda 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_version_adapter.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_version_adapter.cpp
@@ -652,7 +652,9 @@ void CCharacterVersionAdapter::adaptToVersion11(CCharacter &character) const
 		case EGSPD::CPeople::Zorai :
 			mission = CAIAliasTranslator::getInstance()->getMissionUniqueIdFromName( "ZORAI_NEWB_WELCOME_SHENG_WO_1" );
 			CAIAliasTranslator::getInstance()->getNPCAliasesFromName("welcomer_sheng_wo_1", bots);
-			break;	
+			break;
+		default:
+			break;
 		}
 	}
 	// other give him a rite intro mission
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/db_string_updater.h b/code/ryzom/server/src/entities_game_service/player_manager/db_string_updater.h
index 059e7d765..7603c92e9 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/db_string_updater.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/db_string_updater.h
@@ -53,6 +53,7 @@ class CDBStringUpdater : public NLMISC::CSingleton<CDBStringUpdater>
 	// hasher for the identifier
 	struct THashDBStringLeaf
 	{
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t operator()(const TBDStringLeaf &stringLeaf) const
 		{
 			return ((size_t)stringLeaf.ClientDB>>4) ^ ((size_t)stringLeaf.Node>>4);
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
index 9f1643e84..ba0d1c306 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
@@ -48,9 +48,9 @@ namespace NLNET
 
 extern CGenericXmlMsgHeaderManager	GenericMsgManager;
 
-class CServiceIdHash
+struct CServiceIdHash
 {
-public:
+	enum { bucket_size = 4, min_buckets = 8, };
 	size_t	operator () ( const NLNET::TServiceId &sid ) const { return sid.get(); }
 };
 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player_manager_interface.h b/code/ryzom/server/src/entities_game_service/player_manager/player_manager_interface.h
index a18e1645a..3e5de3130 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/player_manager_interface.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/player_manager_interface.h
@@ -41,9 +41,9 @@ public:
 
 	};
 
-	class CUint32Hash
+	struct CUint32Hash
 	{
-	public:
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t	operator () ( const uint32 &i ) const { return i; }
 	};
 
diff --git a/code/ryzom/server/src/entities_game_service/progression/progression_pve.h b/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
index 11d538ea4..2c9e9aba2 100644
--- a/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
+++ b/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
@@ -279,7 +279,6 @@ struct CCreatureTakenDamage
 		{
 			if ( PlayerInflictedDamage[i].TotalDamage > maxDmg )
 			{
-				nlinfo("set damage by player");
 				maxDmg = PlayerInflictedDamage[i].TotalDamage;
 				index = (sint16)i;
 			}
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp
index 85579dcf8..50b039522 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp
@@ -1058,8 +1058,9 @@ NLMISC_COMMAND(getEffects, "get effects of a spire","<x> <y>" )
 		return false;
 	else
 	{
-		float x = (float)atof(args[0].c_str());
-		float y = (float)atof(args[1].c_str());
+		float x, y;
+		NLMISC::fromString(args[0], x);
+		NLMISC::fromString(args[1], y);
 
 		NLMISC::CVector vec( x, y, 0.0f );
 
@@ -1101,8 +1102,9 @@ NLMISC_COMMAND(buildSpirePos, "build a spire","<Eid> <x> <y>")
 			return true;
 		}
 		
-		float x = (float)atof(args[1].c_str());
-		float y = (float)atof(args[2].c_str());
+		float x, y;
+		NLMISC::fromString(args[1], x);
+		NLMISC::fromString(args[2], y);
 			
 		NLMISC::CVector vec( x, y, 0.0f );
 
@@ -1138,8 +1140,9 @@ NLMISC_COMMAND(destroySpirePos, "destroy a spire","<x> <y>")
 		return false;
 	else
 	{
-		float x = (float)atof(args[0].c_str());
-		float y = (float)atof(args[1].c_str());			
+		float x, y;
+		NLMISC::fromString(args[0], x);
+		NLMISC::fromString(args[1], y);
 
 		NLMISC::CVector vec( x, y, 0.0f );
 
@@ -1178,8 +1181,9 @@ NLMISC_COMMAND(getEffectsPos, "get effects of a spire","<Eid> <x> <y>" )
 			return true;
 		}
 
-		float x = (float)atof(args[1].c_str());
-		float y = (float)atof(args[2].c_str());	
+		float x, y;
+		NLMISC::fromString(args[1], x);
+		NLMISC::fromString(args[2], y);
 
 		NLMISC::CVector vec( x, y, 0.0f );
 
@@ -1265,8 +1269,9 @@ NLMISC_COMMAND(getRegionOwner, "display the faction which currently owns the reg
 		return false;
 	else
 	{
-		float x = (float)atof(args[0].c_str());
-		float y = (float)atof(args[1].c_str());	
+		float x, y;
+		NLMISC::fromString(args[0], x);
+		NLMISC::fromString(args[1], y);
 
 		NLMISC::CVector vec( x, y, 0.0f );
 
@@ -1294,8 +1299,9 @@ NLMISC_COMMAND(getSpireStats, "display the status of spire in region correspondi
 		return false;
 	else
 	{
-		float x = (float)atof(args[0].c_str());
-		float y = (float)atof(args[1].c_str());	
+		float x, y;
+		NLMISC::fromString(args[0], x);
+		NLMISC::fromString(args[1], y);
 
 		NLMISC::CVector vec( x, y, 0.0f );
 
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
index 6beb7b1b2..7f42a671c 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
@@ -211,13 +211,16 @@ std::vector<TChanID> CPVPManager2::getCharacterChannels(CCharacter * user)
 	result.clear();
 
 	// Add lang channel, should be first.
-	if (!user->getLangChannel().empty()) {
+	if (!user->getLangChannel().empty())
+	{
 		TMAPExtraFactionChannel::iterator it = _ExtraFactionChannel.find(user->getLangChannel());
 		if (it != _ExtraFactionChannel.end())
 		{
 			result.push_back((*it).second);
 		}
-	} else {
+	}
+	else
+	{
 		TMAPExtraFactionChannel::iterator it = _ExtraFactionChannel.find("en");
 		if (it != _ExtraFactionChannel.end())
 		{
diff --git a/code/ryzom/server/src/entities_game_service/shop_type/character_shopping_list.cpp b/code/ryzom/server/src/entities_game_service/shop_type/character_shopping_list.cpp
index d23945d25..e024334c2 100644
--- a/code/ryzom/server/src/entities_game_service/shop_type/character_shopping_list.cpp
+++ b/code/ryzom/server/src/entities_game_service/shop_type/character_shopping_list.cpp
@@ -460,9 +460,9 @@ void CCharacterShoppingList::initPageToUpdate( uint32 nbSlotPerPage )
 void CCharacterShoppingList::fillTradePage( uint16 session )
 {
 /*
-- Ajout de TRADING:*:PRICE_RETIRE (utile que si SELLER_TYPE == User ou ResaleAndUser). Note: Prix UNITAIRE (si MP, Ammo etc..)
-- Si SELLER_TYPE==User seulement: Si PRICE==-1, alors cela veut dire " Item Sold "  (pour afficher la liste des items vendus les plus récents)
-- Note: TRADING:*:PRICE reste un Prix UNITAIRE (si MP, Ammo etc..) (cela devait déja être le cas)
+- Added TRADING:*:PRICE_RETIRE (only useful if SELLER_TYPE == User or ResaleAndUser). Note: UNIT price (if Raw Mats, Ammo, etc..)
+- If SELLER_TYPE==User only: if PRICE==-1, then it means " Item Sold "  (to display list of more recent sold items)
+- Note: TRADING:*:PRICE is wtill a UNIT price (if Raw Mats, Ammo, etc..) (it should already be the case)
 */
 
 	// get page to update if any
diff --git a/code/ryzom/server/src/entities_game_service/zone_manager.cpp b/code/ryzom/server/src/entities_game_service/zone_manager.cpp
index dd9e817b1..f55222dca 100644
--- a/code/ryzom/server/src/entities_game_service/zone_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/zone_manager.cpp
@@ -201,7 +201,7 @@ bool CTpSpawnZone::build(const NLLIGO::CPrimPoint * point)
 			nlwarning("<CTpSpawnZone build> : no z in CTpSpawnZone '%s'",_Name.c_str() );
 			return false;
 		}
-		Point.z = ( float ) atof( value.c_str() );
+		NLMISC::fromString(value, Point.z);
 		Point.z = float( sint32 (1000.0f* Point.z) );
 	}
 	else
diff --git a/code/ryzom/server/src/frontend_service/client_entity_id_translator.h b/code/ryzom/server/src/frontend_service/client_entity_id_translator.h
index 0f18698c5..f80fbe983 100644
--- a/code/ryzom/server/src/frontend_service/client_entity_id_translator.h
+++ b/code/ryzom/server/src/frontend_service/client_entity_id_translator.h
@@ -89,10 +89,11 @@ public:
 
 private:
 
-	class CHash
+	struct CHash
 	{
-	public:
-		size_t	operator () ( const TEntityIndex& index ) const { return index.getIndex(); }
+		enum { bucket_size = 4, min_buckets = 8, };
+		size_t	operator () (const TEntityIndex& index) const { return index.getIndex(); }
+		bool operator() (const TEntityIndex& left, const TEntityIndex& right) { return left < right; }
 	};
 
 	// table to map CEntityId to TCLEntityId
diff --git a/code/ryzom/server/src/frontend_service/client_id_lookup.h b/code/ryzom/server/src/frontend_service/client_id_lookup.h
index 3d6db560e..9c63a60a6 100644
--- a/code/ryzom/server/src/frontend_service/client_id_lookup.h
+++ b/code/ryzom/server/src/frontend_service/client_id_lookup.h
@@ -114,11 +114,11 @@ private:
 
 	typedef std::vector<TClientId> TEntityIndexToClient;
 
-	class CIdHash
+	struct CIdHash
 	{
-	public:
-
-		size_t	operator () ( NLMISC::CEntityId id ) const { return (uint32)id.getShortId(); }
+		enum { bucket_size = 4, min_buckets = 8, };
+		size_t	operator () (NLMISC::CEntityId id) const { return (uint32)id.getShortId(); }
+		bool operator() (const NLMISC::CEntityId& left, const NLMISC::CEntityId& right) { return left < right; }
 	};
 
 	typedef CHashMap<NLMISC::CEntityId, TClientId, CIdHash>	TIdToClientMap;
diff --git a/code/ryzom/server/src/frontend_service/fe_types.h b/code/ryzom/server/src/frontend_service/fe_types.h
index 747fd6f9e..d63ef1e42 100644
--- a/code/ryzom/server/src/frontend_service/fe_types.h
+++ b/code/ryzom/server/src/frontend_service/fe_types.h
@@ -69,16 +69,15 @@ typedef uint32 TUid;
 /**
  * CInetAddress hash function
  */
-class CInetAddressHashMapTraits
+struct CInetAddressHashMapTraits
 {
-public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	inline size_t operator() ( const NLNET::CInetAddress& x ) const
 	{
 		//return x.port();
 		return x.internalIPAddress();
 	}
+	bool operator() (const NLNET::CInetAddress& left, const NLNET::CInetAddress& right) { return left < right; }
 // 	bool operator() (const NLNET::CInetAddress &x1, const NLNET::CInetAddress &x2) const
 // 	{
 // 		return classId1 < classId2;
diff --git a/code/ryzom/server/src/frontend_service/frontend_service.cpp b/code/ryzom/server/src/frontend_service/frontend_service.cpp
index cbf4a5610..c973ebcfd 100644
--- a/code/ryzom/server/src/frontend_service/frontend_service.cpp
+++ b/code/ryzom/server/src/frontend_service/frontend_service.cpp
@@ -1862,7 +1862,7 @@ NLMISC_COMMAND( dumpImpulseStats, "Dump Impulse stat to XML log", "<logfile> [[-
 		if (reverse)
 			comp = -comp;
 
-		result.push_back(std::make_pair<float, CClientHost*>(comp, client));
+		result.push_back(std::pair<float, CClientHost*>(comp, client));
 	}
 
 	if (ucriterion != 0 && !result.empty())
diff --git a/code/ryzom/server/src/frontend_service/vision_provider.h b/code/ryzom/server/src/frontend_service/vision_provider.h
index 39d84fb2f..aaca90869 100644
--- a/code/ryzom/server/src/frontend_service/vision_provider.h
+++ b/code/ryzom/server/src/frontend_service/vision_provider.h
@@ -84,6 +84,8 @@ class CClientIdLookup;
 	// Hash function: ClientId * 256 + CeId
 	struct CHash
 	{
+		static const size_t bucket_size = 4;
+		static const size_t min_buckets = 8;
 		size_t		operator() ( TPairClientSlot pair ) const { return (pair.ClientId << 8) + pair.Slot; }
 	};
 
diff --git a/code/ryzom/server/src/gpm_service/commands.cpp b/code/ryzom/server/src/gpm_service/commands.cpp
index 127074856..8e5c8d1b8 100644
--- a/code/ryzom/server/src/gpm_service/commands.cpp
+++ b/code/ryzom/server/src/gpm_service/commands.cpp
@@ -179,8 +179,8 @@ NLMISC_COMMAND(getPatatEntryIndex, "Get the patat entry index at a pos", "x, y")
 
 	CVector		pos;
 
-	pos.x = (float)atof(args[0].c_str());
-	pos.y = (float)atof(args[1].c_str());
+	NLMISC::fromString(args[0], pos.x);
+	NLMISC::fromString(args[1], pos.y);
 	pos.z = 0;
 
 	nlinfo("entryIndex(%.1f, %.1f) = %d", pos.x, pos.y, CWorldPositionManager::getEntryIndex(pos));
diff --git a/code/ryzom/server/src/gpm_service/world_position_manager.cpp b/code/ryzom/server/src/gpm_service/world_position_manager.cpp
index 2c10878a6..9674541fc 100644
--- a/code/ryzom/server/src/gpm_service/world_position_manager.cpp
+++ b/code/ryzom/server/src/gpm_service/world_position_manager.cpp
@@ -504,7 +504,7 @@ void	CWorldPositionManager::triggerSubscribe(NLNET::TServiceId serviceId, const
 	STOP_IF(IsRingShard,"Illegal use of CWorldPositionManager on ring shard");
 	if (_PatatSubscribeManager.exist(name))
 	{
-		_PatatSubscribeManager.subscribe(serviceId, make_pair<string,uint16>(name, id));
+		_PatatSubscribeManager.subscribe(serviceId, std::pair<string,uint16>(name, id));
 	}
 }
 
@@ -2113,7 +2113,7 @@ void CWorldPositionManager::movePlayer(CWorldEntity *entity, sint32 x, sint32 y,
 	{
 		if (entity->PlayerInfos->DistanceHistory.size() >= 20)
 			entity->PlayerInfos->DistanceHistory.pop_back();
-		entity->PlayerInfos->DistanceHistory.push_front(make_pair<CVectorD,	uint>(CVectorD(x*0.001, y*0.001, z*0.001), tick));
+		entity->PlayerInfos->DistanceHistory.push_front(std::pair<CVectorD, uint>(CVectorD(x*0.001, y*0.001, z*0.001), tick));
 	}
 #endif
 
@@ -3227,7 +3227,7 @@ void	CWorldPositionManager::visionRequest(sint32 x, sint32 y, sint32 range, vect
 		if (abs(x - entity->X) < range && abs(y - entity->Y) < range &&
 			(rrange = sqrt(sqr((x - entity->X)*0.001) + sqr((y - entity->Y)*0.001))) < frange)
 		{
-			entities.push_back(make_pair<CEntityId, sint32>(entity->Id, (sint32)(rrange*1000)));
+			entities.push_back(std::pair<CEntityId, sint32>(entity->Id, (sint32)(rrange * 1000)));
 		}
 	}
 
@@ -3240,7 +3240,7 @@ void	CWorldPositionManager::visionRequest(sint32 x, sint32 y, sint32 range, vect
 		if (abs(x - entity->X) < range && abs(y - entity->Y) < range &&
 			(rrange = sqrt(sqr((x - entity->X)*0.001) + sqr((y - entity->Y)*0.001))) < frange)
 		{
-			entities.push_back(make_pair<CEntityId, sint32>(entity->Id, (sint32)(rrange*1000)));
+			entities.push_back(std::pair<CEntityId, sint32>(entity->Id, (sint32)(rrange * 1000)));
 		}
 	}
 }
diff --git a/code/ryzom/server/src/gpm_service/world_position_manager.h b/code/ryzom/server/src/gpm_service/world_position_manager.h
index 75ea9ead5..81209357c 100644
--- a/code/ryzom/server/src/gpm_service/world_position_manager.h
+++ b/code/ryzom/server/src/gpm_service/world_position_manager.h
@@ -137,10 +137,11 @@ public:
 	//friend void				CWorldEntity::createPrimitive(NLPACS::UMoveContainer *pMoveContainer, uint8 worldImage);
 	friend void				CWorldEntity::removePrimitive();
 
-	class CEntityIdHash
+	struct CEntityIdHash
 	{
-	public:
-		size_t	operator () ( const NLMISC::CEntityId &id ) const { return (uint32)id.getShortId(); }
+		enum { bucket_size = 4, min_buckets = 8, };
+		size_t	operator () (const NLMISC::CEntityId &id) const { return (uint32)id.getShortId(); }
+		size_t	operator () (const NLMISC::CEntityId &left, const NLMISC::CEntityId &right) const { return left < right; }
 	};
 
 	/// Container of entities (all entities are referenced by this container
diff --git a/code/ryzom/server/src/input_output_service/chat_manager.cpp b/code/ryzom/server/src/input_output_service/chat_manager.cpp
index fbc38ead5..aedfa063f 100644
--- a/code/ryzom/server/src/input_output_service/chat_manager.cpp
+++ b/code/ryzom/server/src/input_output_service/chat_manager.cpp
@@ -94,21 +94,21 @@ void CChatManager::onServiceDown(const std::string &serviceShortName)
 
 			switch (cg.Type)
 			{
-			case CChatGroup::universe:
-			case CChatGroup::say:
-			case CChatGroup::shout:
-				continue;
-			case CChatGroup::team:
-			case CChatGroup::guild:
-			case CChatGroup::civilization:
-			case CChatGroup::territory:
-			case CChatGroup::tell:
-			case CChatGroup::arround:
-			case CChatGroup::system:
-			case CChatGroup::region:
-			case CChatGroup::dyn_chat:
-				groupToRemove.push_back(gid);
-				break;
+				case CChatGroup::universe:
+				case CChatGroup::say:
+				case CChatGroup::shout:
+					continue;
+				case CChatGroup::team:
+				case CChatGroup::guild:
+				case CChatGroup::civilization:
+				case CChatGroup::territory:
+				case CChatGroup::tell:
+				case CChatGroup::arround:
+				case CChatGroup::system:
+				case CChatGroup::region:
+				case CChatGroup::dyn_chat:
+					groupToRemove.push_back(gid);
+					break;
 			}
 		}
 
@@ -121,7 +121,7 @@ void CChatManager::onServiceDown(const std::string &serviceShortName)
 
 		// clear muted players table
 		_MutedUsers.clear();
-		
+
 		// clear the dyn chats
 		_DynChat.removeAllChannels();
 	}
@@ -151,9 +151,11 @@ bool CChatManager::checkClient( const TDataSetRow& id )
 void CChatManager::addClient( const TDataSetRow& id )
 {
 	if (VerboseChatManagement)
-		nldebug("IOSCM: addClient : adding client %s:%x into chat manager and universe group.", 
+	{
+		nldebug("IOSCM: addClient : adding client %s:%x into chat manager and universe group.",
 			TheDataset.getEntityId(id).toString().c_str(),
 			id.getIndex());
+	}
 
 	if(id.getIndex() == 0xffffff)
 	{
@@ -197,10 +199,11 @@ void CChatManager::addClient( const TDataSetRow& id )
 void CChatManager::removeClient( const TDataSetRow& id )
 {
 	if (VerboseChatManagement)
-		nldebug("IOSCM: removeClient : removing the client %s:%x from chat manager !", 
+	{
+		nldebug("IOSCM: removeClient : removing the client %s:%x from chat manager !",
 			TheDataset.getEntityId(id).toString().c_str(),
 			id.getIndex());
-
+	}
 
 	TClientInfoCont::iterator itCl = _Clients.find( id );
 	if( itCl != _Clients.end() )
@@ -214,7 +217,7 @@ void CChatManager::removeClient( const TDataSetRow& id )
 	}
 	else
 	{
-		nlwarning("CChatManager::removeClient : The client %s:%x is unknown !", 
+		nlwarning("CChatManager::removeClient : The client %s:%x is unknown !",
 			TheDataset.getEntityId(id).toString().c_str(),
 			id.getIndex());
 	}
@@ -233,7 +236,7 @@ CChatClient& CChatManager::getClient( const TDataSetRow& id )
 	TClientInfoCont::iterator itCl = _Clients.find( id );
 	if( itCl != _Clients.end() )
 	{
-		return *(itCl->second);	
+		return *(itCl->second);
 	}
 	else
 	{
@@ -259,15 +262,15 @@ void CChatManager::addGroup( TGroupId gId, CChatGroup::TGroupType gType, const s
 	{
 		if (!groupName.empty())
 			nldebug("IOSCM: addGroup : adding %s named chat group %s as '%s'",
-				CChatGroup::groupTypeToString(gType).c_str(), 
+				CChatGroup::groupTypeToString(gType).c_str(),
 				gId.toString().c_str(),
 				groupName.c_str());
 		else
 			nldebug("IOSCM: addGroup : adding %s anonymous chat group %s",
-				CChatGroup::groupTypeToString(gType).c_str(), 
+				CChatGroup::groupTypeToString(gType).c_str(),
 				gId.toString().c_str());
 	}
-		
+
 	map< TGroupId, CChatGroup >::iterator itGrp = _Groups.find( gId );
 	if( itGrp == _Groups.end() )
 	{
@@ -290,7 +293,7 @@ void CChatManager::addGroup( TGroupId gId, CChatGroup::TGroupType gType, const s
 	{
 		nlwarning("CChatManager::addGroup : the group %s already exists", gId.toString().c_str());
 	}
-	
+
 } // addGroup //
 
 
@@ -302,8 +305,10 @@ void CChatManager::addGroup( TGroupId gId, CChatGroup::TGroupType gType, const s
 void CChatManager::removeGroup( TGroupId gId )
 {
 	if (VerboseChatManagement)
+	{
 		nldebug("IOSCM: removeGroup : removing group %s",
 			gId.toString().c_str());
+	}
 
 	map< TGroupId, CChatGroup >::iterator itGrp = _Groups.find( gId );
 	if( itGrp != _Groups.end() )
@@ -338,10 +343,12 @@ void CChatManager::removeGroup( TGroupId gId )
 void CChatManager::addToGroup( TGroupId gId, const TDataSetRow &charId )
 {
 	if (VerboseChatManagement)
+	{
 		nldebug("IOSCM: addtoGroup : adding player %s:%x to group %s",
 		TheDataset.getEntityId(charId).toString().c_str(),
 		charId.getIndex(),
 		gId.toString().c_str());
+	}
 
 	map< TGroupId, CChatGroup >::iterator itGrp = _Groups.find( gId );
 	if( itGrp != _Groups.end() )
@@ -372,7 +379,7 @@ void CChatManager::addToGroup( TGroupId gId, const TDataSetRow &charId )
 			}
 			else
 			{
-				nlwarning("CChatManager::addToGroup : client %s:%x is unknown", 
+				nlwarning("CChatManager::addToGroup : client %s:%x is unknown",
 					TheDataset.getEntityId(charId).toString().c_str(),
 					charId.getIndex());
 				// remove it from the group (don't leave bad client...)
@@ -396,10 +403,12 @@ void CChatManager::addToGroup( TGroupId gId, const TDataSetRow &charId )
 void CChatManager::removeFromGroup( TGroupId gId, const TDataSetRow &charId )
 {
 	if (VerboseChatManagement)
+	{
 		nldebug("IOSCM: removeFromGroup : removing player %s:%x from group %s",
 			TheDataset.getEntityId(charId).toString().c_str(),
-			charId.getIndex(), 
+			charId.getIndex(),
 			gId.toString().c_str());
+	}
 
 	map< TGroupId, CChatGroup >::iterator itGrp = _Groups.find( gId );
 	if( itGrp != _Groups.end() )
@@ -443,7 +452,7 @@ void CChatManager::removeFromGroup( TGroupId gId, const TDataSetRow &charId )
 
 } // removeFromGroup //
 
-	
+
 
 
 //-----------------------------------------------
@@ -486,7 +495,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 		}
 
 //		CEntityId eid = TheDataset.getEntityId(sender);
-		// Get the char info 
+		// Get the char info
 		//WARNING: can be NULL
 		CCharacterInfos *ci = IOS->getCharInfos(eid);
 
@@ -525,7 +534,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 
 		// clean up container
 		_DestUsers.clear();
-		
+
 		switch( itCl->second->getChatMode() )
 		{
 			// dynamic group
@@ -533,7 +542,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 		case CChatGroup::say :
 			{
 				CChatGroup::TMemberCont::iterator itA;
-				for( itA = itCl->second->getAudience().Members.begin(); 
+				for( itA = itCl->second->getAudience().Members.begin();
 						itA != itCl->second->getAudience().Members.end();
 							++itA )
 				{
@@ -566,7 +575,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 				// so even after teleporting in a remote region the previous around people were still receiving
 				// the messages.
 
-				TGroupId grpId = itCl->second->getRegionChatGroup();				
+				TGroupId grpId = itCl->second->getRegionChatGroup();
 				_DestUsers.push_back(grpId);
 
 				_Log.displayNL("'%s' (%s) : \t\"%s\"", senderName.c_str(), groupNames[itCl->second->getChatMode()], ucstr.toString().c_str() );
@@ -599,7 +608,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 //					}
 //				}
 
-				TGroupId grpId = CEntityId(RYZOMID::chatGroup,0);
+				TGroupId grpId = CEntityId(RYZOMID::chatGroup, 0);
 
 				_Log.displayNL("'%s' (%s) : \t\"%s\"", senderName.c_str(), groupNames[itCl->second->getChatMode()], ucstr.toString().c_str() );
 				_DestUsers.push_back(grpId);
@@ -621,15 +630,15 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 				TGroupId grpId = itCl->second->getGuildChatGroup();
 				_DestUsers.push_back(grpId);
 
-				_Log.displayNL("'%s' (%s) : \t\"%s\"", 
-					senderName.c_str(), 
-					groupNames[itCl->second->getChatMode()], 
+				_Log.displayNL("'%s' (%s) : \t\"%s\"",
+					senderName.c_str(),
+					groupNames[itCl->second->getChatMode()],
 					ucstr.toString().c_str() );
 				chatInGroup( grpId, ucstr, sender );
 			}
 			break;
 		case CChatGroup::dyn_chat:
-		{			
+		{
 			TChanID chanID = itCl->second->getDynChatChan();
 			CDynChatSession *session = _DynChat.getSession(chanID, sender);
 			if (session) // player must have a session in that channel
@@ -650,7 +659,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 
 					if (!session->getChan()->getDontBroadcastPlayerInputs())
 					{
-						// add msg to the historic						
+						// add msg to the historic
 						CDynChatChan::CHistoricEntry entry;
 						entry.String = ucstr;
 						if (ci != NULL)
@@ -671,15 +680,15 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 							ucstring tmp("{no_bubble}");
 							if (ucstr.find(tmp) == ucstring::npos)
 							{
-								tmp += ucstr;								
+								tmp += ucstr;
 								content.swap(tmp);
 							}
 							else
 							{
 								content = ucstr;
 							}
-						}						
-				
+						}
+
 
 						// broadcast to other client in the channel
 						CDynChatSession *dcc = session->getChan()->getFirstSession();
@@ -687,7 +696,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 						{
 							sendChat(itCl->second->getChatMode(), dcc->getClient()->getID(), content, sender, chanID);
 							dcc = dcc->getNextChannelSession(); // next session in this channel
-						}						
+						}
 					}
 					else
 					{
@@ -702,11 +711,11 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 						TPlayerInputForward	pif;
 						pif.ChanID = chanID;
 						pif.Sender = sender;
-						pif.Content = ucstr;						
+						pif.Content = ucstr;
 
 						CMessage msgout( "DYN_CHAT:FORWARD");
 						msgout.serial(pif);
-						
+
 						CUnifiedNetwork::getInstance()->send(serviceId, msgout);
 					}
 					if (session->getChan()->getUnifiedChannel())
@@ -716,19 +725,19 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 							IChatUnifierClient::getInstance()->sendUnifiedDynChat(session->getChan()->getID(), senderName, ucstr);
 					}
 				}
-			}			
+			}
 		}
 		break;
 			// static group
 		default :
 			nlwarning("<CChatManager::chat> client %u chat in %s ! don't know how to handle it.",
-				sender.getIndex(), 
+				sender.getIndex(),
 				groupNames[itCl->second->getChatMode()]);
 /*			{
 				TGroupId grpId = itCl->second.getChatGroup();
 
 				_Log.displayNL("'%s' (%s) : \t\"%s\"", senderName.c_str(), groupNames[itCl->second.getChatMode()], ucstr.toString().c_str() );
-				
+
 				chatInGroup( grpId, ucstr, sender );
 			}
 */		}
@@ -736,8 +745,8 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 		// log chat to PDS system
 //		IOSPD::logChat(ucstr, itCl->second->getId(), _DestUsers);
 		log_Chat_Chat(CChatGroup::groupTypeToString(itCl->second->getChatMode()),
-			TheDataset.getEntityId(sender), 
-			ucstr.toUtf8(), 
+			TheDataset.getEntityId(sender),
+			ucstr.toUtf8(),
 			_DestUsers);
 
 	}
@@ -770,7 +779,7 @@ void CChatManager::chatInGroup( TGroupId& grpId, const ucstring& ucstr, const TD
 			CMirrorPropValueRO<uint32> instanceId( TheDataset, *itM, DSPropertyAI_INSTANCE );
 
 			// check the ai instance for region chat
-			if (chatGrp.Type != CChatGroup::region 
+			if (chatGrp.Type != CChatGroup::region
 				|| instanceId == senderInstanceId)
 			{
 				// check homeSessionId for universe
@@ -795,7 +804,7 @@ void CChatManager::chatInGroup( TGroupId& grpId, const ucstring& ucstr, const TD
 					_DestUsers.push_back(TheDataset.getEntityId(*itM));
 				}
 			}
-		}	
+		}
 
 		if (chatGrp.Type == CChatGroup::guild)
 		{
@@ -855,7 +864,7 @@ void CChatManager::farChatInGroup(TGroupId &grpId, uint32 homeSessionId, const u
 					continue;
 			}
 			sendFarChat( itGrp->second.Type, *itM, text, senderName );
-		}	
+		}
 	}
 	else
 	{
@@ -885,7 +894,7 @@ void CChatManager::chat2( const TDataSetRow& sender, const std::string &phraseId
 		case CChatGroup::shout :
 			{
 				CChatGroup::TMemberCont::iterator itA;
-				for( itA = itCl->second->getAudience().Members.begin(); 
+				for( itA = itCl->second->getAudience().Members.begin();
 						itA != itCl->second->getAudience().Members.end();
 							++itA )
 				{
@@ -900,7 +909,7 @@ void CChatManager::chat2( const TDataSetRow& sender, const std::string &phraseId
 				chatInGroup2( grpId, phraseId, sender );
 			}
 			break;
-			
+
 
 		case CChatGroup::universe:
 			{
@@ -937,7 +946,7 @@ void CChatManager::chat2( const TDataSetRow& sender, const std::string &phraseId
 			{
 			nlwarning("<CChatManager::chat> client %s:%x chat in mode %u ! don't know how to handle it.",
 				TheDataset.getEntityId(sender).toString().c_str(),
-				sender.getIndex(), 
+				sender.getIndex(),
 				itCl->second->getChatMode());
 			}
 		}
@@ -973,7 +982,7 @@ void CChatManager::chatParam( const TDataSetRow& sender, const std::string &phra
 		case CChatGroup::shout :
 			{
 				CChatGroup::TMemberCont::iterator itA;
-				for( itA = itCl->second->getAudience().Members.begin(); 
+				for( itA = itCl->second->getAudience().Members.begin();
 						itA != itCl->second->getAudience().Members.end();
 							++itA )
 				{
@@ -988,7 +997,7 @@ void CChatManager::chatParam( const TDataSetRow& sender, const std::string &phra
 				chatParamInGroup( grpId, phraseId, params, sender );
 			}
 			break;
-			
+
 
 		case CChatGroup::universe:
 			{
@@ -1025,7 +1034,7 @@ void CChatManager::chatParam( const TDataSetRow& sender, const std::string &phra
 			{
 			nlwarning("<CChatManager::chat> client %s:%x chat in mode %u ! don't know how to handle it.",
 				TheDataset.getEntityId(sender).toString().c_str(),
-				sender.getIndex(), 
+				sender.getIndex(),
 				itCl->second->getChatMode());
 			}
 		}
@@ -1049,7 +1058,7 @@ void CChatManager::chat2Ex( const TDataSetRow& sender, uint32 phraseId)
 		CEntityId eid = TheDataset.getEntityId(sender);
 		if(_MutedUsers.find( eid ) != _MutedUsers.end())
 		{
-			nldebug("IOSCM: chat2Ex The player %s:%x is muted", 
+			nldebug("IOSCM: chat2Ex The player %s:%x is muted",
 				TheDataset.getEntityId(sender).toString().c_str(),
 				sender.getIndex());
 			return;
@@ -1061,7 +1070,7 @@ void CChatManager::chat2Ex( const TDataSetRow& sender, uint32 phraseId)
 		case CChatGroup::shout :
 			{
 				CChatGroup::TMemberCont::iterator itA;
-				for( itA = itCl->second->getAudience().Members.begin(); 
+				for( itA = itCl->second->getAudience().Members.begin();
 				itA != itCl->second->getAudience().Members.end();
 				++itA )
 				{
@@ -1076,7 +1085,7 @@ void CChatManager::chat2Ex( const TDataSetRow& sender, uint32 phraseId)
 				chatInGroup2Ex( grpId, phraseId, sender );
 			}
 			break;
-			
+
 		case CChatGroup::universe:
 			{
 				CEntityId eid = TheDataset.getEntityId(sender);
@@ -1098,21 +1107,21 @@ void CChatManager::chat2Ex( const TDataSetRow& sender, uint32 phraseId)
 				chatInGroup2Ex( grpId, phraseId, sender );
 			}
 			break;
-			
+
 		case CChatGroup::guild:
 			{
 				TGroupId grpId = itCl->second->getGuildChatGroup();
 				chatInGroup2Ex( grpId, phraseId, sender );
 			}
 			break;
-			
-			
+
+
 			// static group
 		default :
 			{
 				nlwarning("<CChatManager::chat> client %s:%x chat in mode %u ! don't know how to handle it.",
 					TheDataset.getEntityId(sender).toString().c_str(),
-					sender.getIndex(), 
+					sender.getIndex(),
 					itCl->second->getChatMode());
 				//				TGroupId grpId = (*itCl).second.getChatGroup();
 				//				chatInGroup2( grpId, phraseId, sender );
@@ -1141,7 +1150,7 @@ void CChatManager::chatInGroup2Ex( TGroupId& grpId, uint32 phraseId, const TData
 		{
 			CMirrorPropValueRO<uint32> instanceId( TheDataset, *itM, DSPropertyAI_INSTANCE );
 
-			if (chatGrp.Type != CChatGroup::region 
+			if (chatGrp.Type != CChatGroup::region
 				|| instanceId == senderInstanceId)
 			{
 				const CEntityId &eid = TheDataset.getEntityId(*itM);
@@ -1184,14 +1193,14 @@ void CChatManager::chatInGroup2( TGroupId& grpId, const std::string & phraseId,
 			CMirrorPropValueRO<uint32> instanceId( TheDataset, *itM, DSPropertyAI_INSTANCE );
 
 			// check the ai instance for region chat
-			if (chatGrp.Type != CChatGroup::region 
+			if (chatGrp.Type != CChatGroup::region
 				|| instanceId == senderInstanceId)
 			{
 				const CEntityId &eid = TheDataset.getEntityId(*itM);
 				if (eid.getType() == RYZOMID::player && std::find( excluded.begin(), excluded.end(), *itM ) == excluded.end() )
 					sendChat2( (*itGrp ).second.Type, *itM, phraseId, sender );
 			}
-		}	
+		}
 		if (chatGrp.Type == CChatGroup::guild)
 		{
 			CCharacterInfos *charInfos = IOS->getCharInfos(TheDataset.getEntityId(sender));
@@ -1232,7 +1241,7 @@ void CChatManager::chatParamInGroup( TGroupId& grpId, const std::string & phrase
 				if (eid.getType() == RYZOMID::player && std::find( excluded.begin(), excluded.end(), *itM ) == excluded.end() )
 					sendChat2( (*itGrp ).second.Type, *itM, phraseId, sender );
 			}
-		}	
+		}
 		if (chatGrp.Type == CChatGroup::guild)
 		{
 			CCharacterInfos *charInfos = IOS->getCharInfos(TheDataset.getEntityId(sender));
@@ -1278,10 +1287,10 @@ void CChatManager::sendEmoteTextToAudience(  const TDataSetRow& sender,const std
 		TChanID	oldChan = itCl->second->getDynChatChan();
 		itCl->second->setChatMode(CChatGroup::say);
 		itCl->second->updateAudience();
-		
+
 		// get audience around the emoting player
 		CChatGroup::TMemberCont::iterator itA;
-		for( itA = itCl->second->getAudience().Members.begin(); 
+		for( itA = itCl->second->getAudience().Members.begin();
 		itA != itCl->second->getAudience().Members.end();
 		++itA )
 		{
@@ -1329,10 +1338,10 @@ void CChatManager::sendEmoteCustomTextToAll( const TDataSetRow& sender, const uc
 		TChanID	oldChan = itCl->second->getDynChatChan();
 		itCl->second->setChatMode(CChatGroup::say);
 		itCl->second->updateAudience();
-		
+
 		// get audience around the emoting player
 		CChatGroup::TMemberCont::iterator itA;
-		for( itA = itCl->second->getAudience().Members.begin(); 
+		for( itA = itCl->second->getAudience().Members.begin();
 		itA != itCl->second->getAudience().Members.end();
 		++itA )
 		{
@@ -1347,7 +1356,7 @@ void CChatManager::sendEmoteCustomTextToAll( const TDataSetRow& sender, const uc
 			TheDataset.getEntityId(sender).toString().c_str(),
 			sender.getIndex());
 	}
-	
+
 }
 
 
@@ -1386,7 +1395,7 @@ void CChatManager::sendEmoteCustomTextToAll( const TDataSetRow& sender, const uc
 //			bms.serial( index );
 //			bms.serial( infos->Str );
 //		}
-//		
+//
 ////		nldebug("<CChatManager::addDynStr> sending association [%s,%d] to %s",infos->Str.c_str(),index,receiver.toString().c_str());
 //		msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
 //		sendMessageViaMirror(frontendId, msgout);
@@ -1406,7 +1415,7 @@ void CChatManager::sendEmoteCustomTextToAll( const TDataSetRow& sender, const uc
 //
 //-----------------------------------------------
 void CChatManager::sendChat( CChatGroup::TGroupType senderChatMode, const TDataSetRow &receiver, const ucstring& ucstr, const TDataSetRow &sender, TChanID chanID, const ucstring &senderName)
-{	
+{
 	//if( receiver != sender )
 	{
 		CCharacterInfos * charInfos = NULL;
@@ -1440,14 +1449,14 @@ void CChatManager::sendChat( CChatGroup::TGroupType senderChatMode, const TDataS
 					}
 
 					uint32 senderNameIndex;
-					// if the sender exists 
+					// if the sender exists
 					if( charInfos )
 					{
 						senderNameIndex = charInfos->NameIndex;
 					}
 					else
 					{
-						// if no sender, we use a special name 
+						// if no sender, we use a special name
 						ucstring senderName("<BROADCAST MESSAGE>");
 						senderNameIndex = SM->storeString( senderName );
 					}
@@ -1466,14 +1475,14 @@ void CChatManager::sendChat( CChatGroup::TGroupType senderChatMode, const TDataS
 					msgout.serial( channel );
 					CBitMemStream bms;
 					GenericXmlMsgHeaderMngr.pushNameToStream( "STRING:CHAT", bms );
-					
+
 					CChatMsg chatMsg;
 					chatMsg.CompressedIndex = sender.getCompressedIndex();
 					chatMsg.SenderNameId = senderNameIndex;
 					chatMsg.ChatMode = (uint8) senderChatMode;
 					if (senderChatMode == CChatGroup::dyn_chat)
-					{						
-						chatMsg.DynChatChanID = chanID;					
+					{
+						chatMsg.DynChatChanID = chanID;
 					}
 					chatMsg.Content = ucstr;
 					bms.serial( chatMsg );
@@ -1483,7 +1492,7 @@ void CChatManager::sendChat( CChatGroup::TGroupType senderChatMode, const TDataS
 						chatMsg.Sender,
 						receiver.toString().c_str(),
 						chatMsg.ChatMode);
-	*/				
+	*/
 					msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
 					sendMessageViaMirror(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout);
 				}
@@ -1500,7 +1509,7 @@ void CChatManager::sendChat( CChatGroup::TGroupType senderChatMode, const TDataS
 			nlwarning("<CChatManager::chat> The character %s:%x is unknown, no chat msg sent",
 				TheDataset.getEntityId(receiver).toString().c_str(),
 				receiver.getIndex());
-		}		
+		}
 	}
 
 } // sendChat //
@@ -1526,14 +1535,14 @@ void CChatManager::sendFarChat( CChatGroup::TGroupType senderChatMode, const TDa
 				msgout.serial( channel );
 				CBitMemStream bms;
 				GenericXmlMsgHeaderMngr.pushNameToStream( "STRING:CHAT", bms );
-				
+
 				CChatMsg chatMsg;
 				chatMsg.CompressedIndex = 0xFFFFF;
 				chatMsg.SenderNameId = senderNameIndex;
 				chatMsg.ChatMode = (uint8) senderChatMode;
 				if (senderChatMode == CChatGroup::dyn_chat)
-				{						
-					chatMsg.DynChatChanID = chanID;					
+				{
+					chatMsg.DynChatChanID = chanID;
 				}
 				chatMsg.Content = ucstr;
 				bms.serial( chatMsg );
@@ -1554,7 +1563,7 @@ void CChatManager::sendFarChat( CChatGroup::TGroupType senderChatMode, const TDa
 		nlwarning("<CChatManager::chat> The character %s:%x is unknown, no chat msg sent",
 			TheDataset.getEntityId(receiver).toString().c_str(),
 			receiver.getIndex());
-	}		
+	}
 
 }
 
@@ -1584,7 +1593,7 @@ void CChatManager::sendChatParam( CChatGroup::TGroupType senderChatMode, const T
 {
 	TVectorParamCheck params2;
 	params2.resize( params.size() + 1);
-	// send the chat phrase to the client	
+	// send the chat phrase to the client
 	params2[0].Type = STRING_MANAGER::bot;
 	params2[0].setEId(  TheDataset.getEntityId(sender) );
 	uint32 first = 0, last = (uint32)params.size();
@@ -1643,7 +1652,7 @@ void CChatManager::sendChat2Ex( CChatGroup::TGroupType senderChatMode, const TDa
 				msgout.serial( channel );
 				CBitMemStream bms;
 				GenericXmlMsgHeaderMngr.pushNameToStream( "STRING:CHAT2", bms );
-				
+
 				CChatMsg2 chatMsg;
 				chatMsg.CompressedIndex = sender.getCompressedIndex();
 				chatMsg.SenderNameId = charInfos ? charInfos->NameIndex : 0; // empty string if there is no sender
@@ -1651,7 +1660,7 @@ void CChatManager::sendChat2Ex( CChatGroup::TGroupType senderChatMode, const TDa
 				chatMsg.PhraseId = phraseId;
 				chatMsg.CustomTxt = customTxt;
 				bms.serial( chatMsg );
-				
+
 				msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
 				CUnifiedNetwork::getInstance()->send(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout);
 			}
@@ -1677,9 +1686,9 @@ void CChatManager::sendChat2Ex( CChatGroup::TGroupType senderChatMode, const TDa
 //
 //-----------------------------------------------
 void CChatManager::sendChatCustomEmote( const TDataSetRow &sender, const TDataSetRow &receiver, const ucstring& ucstr )
-{	
+{
 	TDataSetRow senderFake = TDataSetRow::createFromRawIndex( INVALID_DATASET_ROW );
-		
+
 	CCharacterInfos * receiverInfos = IOS->getCharInfos( TheDataset.getEntityId(receiver) );
 	CCharacterInfos * senderInfos = IOS->getCharInfos( TheDataset.getEntityId(sender) );
 	if( receiverInfos )
@@ -1698,7 +1707,7 @@ void CChatManager::sendChatCustomEmote( const TDataSetRow &sender, const TDataSe
 				{
 					return;
 				}
-				
+
 				// send the string to FE
 				CMessage msgout( "IMPULS_CH_ID" );
 				uint8 channel = 1;
@@ -1707,7 +1716,7 @@ void CChatManager::sendChatCustomEmote( const TDataSetRow &sender, const TDataSe
 				msgout.serial( channel );
 				CBitMemStream bms;
 				GenericXmlMsgHeaderMngr.pushNameToStream( "STRING:CHAT", bms );
-				
+
 				CChatMsg chatMsg;
 				chatMsg.CompressedIndex = senderFake.getCompressedIndex();
 				chatMsg.SenderNameId = 0;
@@ -1785,7 +1794,7 @@ void CChatManager::tell2( const TDataSetRow& sender, const TDataSetRow& receiver
 					TheDataset.getEntityId(receiver).toString().c_str() );
 				return;
 			}
-			
+
 			// check if the sender is CSR or is not in the ignore list of the receiver
 			if(senderInfos->HavePrivilege || !itCl->second->isInIgnoreList(sender) )
 			{
@@ -1802,10 +1811,10 @@ void CChatManager::tell2( const TDataSetRow& sender, const TDataSetRow& receiver
 				msgout.serial( channel );
 				CBitMemStream bms;
 				GenericXmlMsgHeaderMngr.pushNameToStream( "STRING:TELL2", bms);
-				
+
 				bms.serial( senderInfos->NameIndex );
 				bms.serial( id);
-									
+		
 				msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
 				CUnifiedNetwork::getInstance()->send(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout);
 			}
@@ -1938,8 +1947,8 @@ void CChatManager::tell( const TDataSetRow& sender, const string& receiverIn, co
 */
 
 				_Log.displayNL("'%s' to '%s' (%s) : \t\"%s\"", senderName.c_str(), receiverName.c_str(), "tell", ucstr.toString().c_str() );
-				
-				
+
+
 				// if the client doesn't know this dynamic string(name of sender), we send it to him
 				// send the string to FE
 				CMessage msgout( "IMPULS_CH_ID" );
@@ -1948,12 +1957,12 @@ void CChatManager::tell( const TDataSetRow& sender, const string& receiverIn, co
 				msgout.serial( channel );
 				CBitMemStream bms;
 				GenericXmlMsgHeaderMngr.pushNameToStream( "STRING:TELL", bms);
-				
+
 				TDataSetIndex dsi = senderInfos->DataSetIndex.getCompressedIndex();
 				bms.serial( dsi );
 				bms.serial( senderInfos->NameIndex );
 				bms.serial( const_cast<ucstring&>(ucstr) );
-				
+
 				msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
 				sendMessageViaMirror(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout);
 
@@ -2088,8 +2097,8 @@ void CChatManager::farTell( const NLMISC::CEntityId &senderCharId, const ucstrin
 				string receiverName = receiverInfos->Name.toString();
 
 				_Log.displayNL("'%s' to '%s' (%s) : \t\"%s\"", senderName.toUtf8().c_str(), receiverName.c_str(), "tell", ucstr.toString().c_str() );
-				
-				
+
+
 				// if the client doesn't know this dynamic string(name of sender), we send it to him
 				// send the string to FE
 				CMessage msgout( "IMPULS_CH_ID" );
@@ -2103,7 +2112,7 @@ void CChatManager::farTell( const NLMISC::CEntityId &senderCharId, const ucstrin
 				ftm.SenderName = senderName;
 				ftm.Text = ucstr;
 				ftm.serial(bms);
-				
+
 				msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
 				sendMessageViaMirror(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout);
 
@@ -2134,19 +2143,19 @@ void CChatManager::displayChatClients(NLMISC::CLog &log)
 		if (ci != NULL)
 		{
 			if (ci->EntityId.getType() == RYZOMID::player)
-				log.displayNL("'%s' %s:%x %s mode '%s'", 
-					ci->Name.toString().c_str(), 
-					ci->EntityId.toString().c_str(), 
-					im->first.getIndex(), 
-					im->second->isMuted()?"(muted)":"", 
+				log.displayNL("'%s' %s:%x %s mode '%s'",
+					ci->Name.toString().c_str(),
+					ci->EntityId.toString().c_str(),
+					im->first.getIndex(),
+					im->second->isMuted()?"(muted)":"",
 					CChatGroup::groupTypeToString(im->second->getChatMode()).c_str() );
 		}
 		else
 		{
-			log.displayNL("*no name* %s:%x %s mode '%s'", 
-				ci->EntityId.toString().c_str(), 
-				im->first.getIndex(), 
-				im->second->isMuted()?"(muted)":"", 
+			log.displayNL("*no name* %s:%x %s mode '%s'",
+				ci->EntityId.toString().c_str(),
+				im->first.getIndex(),
+				im->second->isMuted()?"(muted)":"",
 				CChatGroup::groupTypeToString(im->second->getChatMode()).c_str() );
 		}
 	}
@@ -2157,17 +2166,17 @@ void CChatManager::displayChatGroup(NLMISC::CLog &log, TGroupId gid, CChatGroup
 {
 	if (chatGroup.GroupName == CStringMapper::emptyId())
 	{
-		log.displayNL("Group : anonym (%s), %s : %u clients :", 
+		log.displayNL("Group : anonym (%s), %s : %u clients :",
 				gid.toString().c_str(),
-				CChatGroup::groupTypeToString(chatGroup.Type).c_str(), 
+				CChatGroup::groupTypeToString(chatGroup.Type).c_str(),
 				chatGroup.Members.size());
 	}
 	else
 	{
-		log.displayNL("Group : '%s' (%s), %s : %u clients :", 
+		log.displayNL("Group : '%s' (%s), %s : %u clients :",
 				CStringMapper::unmap(chatGroup.GroupName).c_str(),
-				gid.toString().c_str(), 
-				CChatGroup::groupTypeToString(chatGroup.Type).c_str(), 
+				gid.toString().c_str(),
+				CChatGroup::groupTypeToString(chatGroup.Type).c_str(),
 				chatGroup.Members.size());
 	}
 
@@ -2179,12 +2188,12 @@ void CChatManager::displayChatGroup(NLMISC::CLog &log, TGroupId gid, CChatGroup
 		{
 			CCharacterInfos *ci = IOS->getCharInfos(TheDataset.getEntityId(*first));
 			if (ci != NULL)
-				log.displayNL("  '%s' %s:%x", 
-					ci->Name.toString().c_str(), 
+				log.displayNL("  '%s' %s:%x",
+					ci->Name.toString().c_str(),
 					ci->EntityId.toString().c_str(),
 					first->getIndex());
 			else
-				log.displayNL("   *unknow* %s:%x", 
+				log.displayNL("   *unknow* %s:%x",
 					eid.toString().c_str(),
 					first->getIndex());
 		}
@@ -2262,13 +2271,13 @@ void CChatManager::displayChatAudience(NLMISC::CLog &log, const CEntityId &eid,
 			{
 				CCharacterInfos *ci = IOS->getCharInfos(TheDataset.getEntityId(*first));
 				if (ci != NULL)
-					log.displayNL("  '%s' %s:%x", 
-						ci->Name.toString().c_str(), 
+					log.displayNL("  '%s' %s:%x",
+						ci->Name.toString().c_str(),
 						TheDataset.getEntityId(*first).toString().c_str(),
 						first->getIndex());
-						
+
 				else
-					log.displayNL("   *unknow* %s:%x", 
+					log.displayNL("   *unknow* %s:%x",
 						TheDataset.getEntityId(*first).toString().c_str(),
 						first->getIndex());
 			}
@@ -2301,9 +2310,9 @@ ucstring CChatManager::filterClientInputColorCode(ucstring &text)
 {
 	ucstring result;
 	result.reserve(text.size());
-	
+
 	ucstring::size_type pos = 0;
-	
+
 	for (; pos < text.size(); ++pos)
 	{
 		if (text[pos] == '@' && pos < text.size()-1 && text[pos+1] == '{')
@@ -2316,7 +2325,7 @@ ucstring CChatManager::filterClientInputColorCode(ucstring &text)
 			result += text[pos];
 		}
 	}
-	
+
 	return result;
 }
 
@@ -2340,7 +2349,7 @@ ucstring CChatManager::filterClientInput(ucstring &text)
 	bool lastIsWhite = false;
 	for (; pos < text.size(); ++pos)
 	{
-		bool currentIsWhite = (text[pos] == ' ' || text[pos] == '\t'); 
+		bool currentIsWhite = (text[pos] == ' ' || text[pos] == '\t');
 		if (!(lastIsWhite && currentIsWhite))
 		{
 			// any double white skipped
@@ -2353,7 +2362,7 @@ ucstring CChatManager::filterClientInput(ucstring &text)
 					hasBrackets = (text[pos-1] == '>') &&
 						(text[pos-5] == '<');
 				}
-				// Filter out '&' at the first non-whitespace position to remove 
+				// Filter out '&' at the first non-whitespace position to remove
 				// system color code (like '&SYS&' )
 				bool disallowAmpersand = (result.size() == 0) || hasBrackets;
 				if (disallowAmpersand)
diff --git a/code/ryzom/server/src/input_output_service/chat_manager.h b/code/ryzom/server/src/input_output_service/chat_manager.h
index 9e2d20e8c..544dbfa2c 100644
--- a/code/ryzom/server/src/input_output_service/chat_manager.h
+++ b/code/ryzom/server/src/input_output_service/chat_manager.h
@@ -42,14 +42,14 @@
 
 
 
- 
+
 /**
  * CChatManager
  * \author Stephane Coutelas
  * \author Nevrax France
  * \date 2002
  */
-class CChatManager 
+class CChatManager
 {
 public :
 
@@ -72,7 +72,7 @@ public :
 	 */
 	void init( /*const std::string& staticDBFileName, const std::string& dynDBFileName*/ );
 
-	/** A service has gone down 
+	/** A service has gone down
 	 */
 	void onServiceDown(const std::string &serviceShortName);
 
@@ -80,7 +80,7 @@ public :
 	 * Reset ChatLog management
 	 */
 	void	resetChatLog();
-	
+
 	/**
 	 * Check if the client is already registered in the chat manager.
 	 */
@@ -102,7 +102,7 @@ public :
 	 * \param id is the client character id
 	 */
 	CChatClient& getClient( const TDataSetRow& id ); //throw (EChatClient);
-	
+
 	/**
 	 * Return a reference on the static database
 	 */
@@ -195,7 +195,7 @@ public :
 	void chat2( const TDataSetRow& sender, const std::string &phraseId );
 
 
-	
+
 	/**
 	 * Transmit a chat message
 	 * \param sender is the id of the talking char
@@ -334,7 +334,7 @@ public :
 
 
 private :
-	
+
 	typedef std::map< TDataSetRow, CChatClient*>	TClientInfoCont;
 	/// client infos
 	TClientInfoCont	_Clients;
@@ -377,7 +377,7 @@ protected:
 	friend void cbNpcTellEx( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId );
 	friend void cbDynChatServiceChat( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId );
 	friend void cbDynChatServiceTell( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId );
-	
+
 public:
 	/**
 	 * Send a chat message
@@ -389,7 +389,7 @@ public:
 	 * \param senderName Can be used to replace the sender name with a specific string
 	 */
 	void sendChat( CChatGroup::TGroupType senderChatMode, const TDataSetRow &receiver, const ucstring& ucstr, const TDataSetRow &sender = TDataSetRow(), TChanID chanID = NLMISC::CEntityId::Unknown, const ucstring &senderName = ucstring());
-	
+
 
 	/**
 	 * Send a far chat message
diff --git a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
index 67ce62f10..2aa3c896b 100644
--- a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
+++ b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
@@ -650,7 +650,7 @@ bool CStringManager::parseBlock(const ucstring &block, CPhrase &phrase)
 					&& (first - clause.String.begin()) == (sint) clause.Replacements[repCount].InsertPlace)
 				{
 					// check parameter type
-					char *subst;
+					const char *subst;
 					uint paramIndex = clause.Replacements[repCount].ParamIndex;
 
 					TParamId &paramId = phrase.Params[paramIndex]->ParamId;
@@ -1356,7 +1356,7 @@ void	CStringManager::mergeEntityWords(CEntityWords& dest, const CEntityWords& so
 	std::map<std::string, uint32>::const_iterator	iti;
 	for (iti=source._ColumnInfo.begin(); iti!=source._ColumnInfo.end(); ++iti)
 		if (dest._ColumnInfo.find((*iti).first) == dest._ColumnInfo.end())
-			extraColumns.push_back(std::make_pair<std::string, uint32>((*iti).first, osz+(uint32)extraColumns.size()));
+			extraColumns.push_back(std::pair<std::string, uint32>((*iti).first, osz + (uint32)extraColumns.size()));
 
 	for (iti=source._RowInfo.begin(); iti!=source._RowInfo.end(); ++iti)
 		if (dest._RowInfo.find((*iti).first) == dest._RowInfo.end())
diff --git a/code/ryzom/server/src/monitor_service/client.cpp b/code/ryzom/server/src/monitor_service/client.cpp
index 6d761ba3e..ce2fdc5dc 100644
--- a/code/ryzom/server/src/monitor_service/client.cpp
+++ b/code/ryzom/server/src/monitor_service/client.cpp
@@ -273,7 +273,7 @@ void CMonitorClient::update ()
 		TYPE_NAME_STRING_ID id = Str[i];
 		std::map<TYPE_NAME_STRING_ID, std::string>::iterator ite = StringMap.find (id);
 		nlassert (ite != StringMap.end());
-		strToSend.push_back( make_pair<TYPE_NAME_STRING_ID, string*>(id, &((*ite).second)) );
+		strToSend.push_back(std::pair<TYPE_NAME_STRING_ID, string*>(id, &((*ite).second)));
 		strTotalSize += 4+4+(uint)(*ite).second.size();
 	}
 
diff --git a/code/ryzom/server/src/monitor_service/service_main.cpp b/code/ryzom/server/src/monitor_service/service_main.cpp
index a0e577269..bf092bbae 100644
--- a/code/ryzom/server/src/monitor_service/service_main.cpp
+++ b/code/ryzom/server/src/monitor_service/service_main.cpp
@@ -392,7 +392,15 @@ void clientAuthentication(CMessage &msgin, TSockId from, CCallbackNetBase &netba
 						{
 							if (strlen(row[0]) > 2)
 							{
-								std::string salt = std::string(row[0], row[0] + 2);								
+								std::string salt;
+								if (row[0][0] == '$')
+								{
+									salt = std::string(row[0], row[0] + 19);
+								}
+								else
+								{
+									salt = std::string(row[0], row[0] + 2);
+								}
 								std::string cryptedVersion = CCrypt::crypt(password, salt);
 								if (cryptedVersion == row[0])
 								{
@@ -410,7 +418,9 @@ void clientAuthentication(CMessage &msgin, TSockId from, CCallbackNetBase &netba
 				// fail the authentication
 				// Do not send result immediatly to avoid a potential hacker
 				// to try a dictionnary or that dort of things
-				BadLoginClients.insert(std::make_pair(NLMISC::CTime::getLocalTime() + LOGIN_RETRY_DELAY_IN_MILLISECONDS, Clients[i]));
+				BadLoginClients.insert(std::pair<NLMISC::TTime, NLMISC::CRefPtr<CMonitorClient> >(
+					NLMISC::CTime::getLocalTime() + LOGIN_RETRY_DELAY_IN_MILLISECONDS, 
+					(NLMISC::CRefPtr<CMonitorClient>)Clients[i]));
 				Clients[i]->BadLogin =true;
 				return;
 			}
diff --git a/code/ryzom/server/src/pd_lib/db_description_parser.cpp b/code/ryzom/server/src/pd_lib/db_description_parser.cpp
index 175000cf2..55eb4a3d6 100644
--- a/code/ryzom/server/src/pd_lib/db_description_parser.cpp
+++ b/code/ryzom/server/src/pd_lib/db_description_parser.cpp
@@ -260,7 +260,7 @@ bool	CDBDescriptionParser::loadType(xmlNodePtr node)
 				return false;
 			}
 
-			typeNode.EnumValues.push_back(make_pair<string, uint32>(name, value));
+			typeNode.EnumValues.push_back(std::pair<string, uint32>(name, value));
 
 			if (typeNode.Dimension <= value)
 				typeNode.Dimension = value;
diff --git a/code/ryzom/server/src/pd_lib/pd_lib.cpp b/code/ryzom/server/src/pd_lib/pd_lib.cpp
index f57a4be62..1a2cda9ba 100644
--- a/code/ryzom/server/src/pd_lib/pd_lib.cpp
+++ b/code/ryzom/server/src/pd_lib/pd_lib.cpp
@@ -571,7 +571,7 @@ void	CPDSLib::update()
 			CMessage*	msgupd = new CMessage("PD_UPDATE");
 			msgupd->serial(_DatabaseId);
 			msgupd->serial(_UpdateId);
-			_QueuedMessages.push_back(make_pair<uint32,CMessage*>(_UpdateId, msgupd));
+			_QueuedMessages.push_back(std::pair<uint32, CMessage*>(_UpdateId, msgupd));
 			++_UpdateId;
 
 			// serial queue
diff --git a/code/ryzom/server/src/pd_lib/pd_messages.cpp b/code/ryzom/server/src/pd_lib/pd_messages.cpp
index 253855d46..b5e731d95 100644
--- a/code/ryzom/server/src/pd_lib/pd_messages.cpp
+++ b/code/ryzom/server/src/pd_lib/pd_messages.cpp
@@ -504,7 +504,7 @@ bool	CUpdateLog::selectMessages(const CDBDescriptionParser& description, const N
 
 		if (message.getType() == CDbMessage::PushContext)
 		{
-			contextsStart.push_back(std::make_pair<uint, bool>(msg, false));
+			contextsStart.push_back(std::pair<uint, bool>(msg, false));
 		}
 		else if (message.getType() == CDbMessage::PopContext)
 		{
@@ -561,7 +561,7 @@ bool	CUpdateLog::selectMessages(const CDBDescriptionParser& description, const s
 
 		if (message.getType() == CDbMessage::PushContext)
 		{
-			contextsStart.push_back(std::make_pair<uint, bool>(msg, false));
+			contextsStart.push_back(std::pair<uint, bool>(msg, false));
 		}
 		else if (message.getType() == CDbMessage::PopContext)
 		{
@@ -644,7 +644,7 @@ bool	CUpdateLog::selectMessages(const CDBDescriptionParser& description, const N
 
 		if (message.getType() == CDbMessage::PushContext)
 		{
-			contextsStart.push_back(std::make_pair<uint, bool>(msg, false));
+			contextsStart.push_back(std::pair<uint, bool>(msg, false));
 		}
 		else if (message.getType() == CDbMessage::PopContext)
 		{
diff --git a/code/ryzom/server/src/pd_lib/pd_string_mapper.cpp b/code/ryzom/server/src/pd_lib/pd_string_mapper.cpp
index 184d4bb7f..7a326dc67 100644
--- a/code/ryzom/server/src/pd_lib/pd_string_mapper.cpp
+++ b/code/ryzom/server/src/pd_lib/pd_string_mapper.cpp
@@ -64,7 +64,7 @@ void	CPDStringMapper::setMapping(const std::string& str, uint32 id)
 		return;
 	}
 
-	its = _StringMap.insert(std::make_pair<std::string, uint32>(lowMapStr, id)).first;
+	its = _StringMap.insert(std::pair<std::string, uint32>(lowMapStr, id)).first;
 	_IdMap[id] = its;
 }
 
diff --git a/code/ryzom/server/src/pd_lib/pd_utils.h b/code/ryzom/server/src/pd_lib/pd_utils.h
index 73a0268d8..85a183753 100644
--- a/code/ryzom/server/src/pd_lib/pd_utils.h
+++ b/code/ryzom/server/src/pd_lib/pd_utils.h
@@ -490,13 +490,16 @@ typedef std::vector<CObjectIndex>		TIndexList;
 
 struct CColumnIndexHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CColumnIndexHashMapTraits() { }
 	size_t operator() (const CColumnIndex &id) const
-		{
-			return id.hash();
-		}
+	{
+		return id.hash();
+	}
+	bool operator()(const CColumnIndex &left, const CColumnIndex &right)
+	{
+		return left < right;
+	}
 };
 
 class CSetMap
diff --git a/code/ryzom/server/src/pd_support_service/stat_user_file_list_builders.cpp b/code/ryzom/server/src/pd_support_service/stat_user_file_list_builders.cpp
index 8f4f1e07f..45c172384 100644
--- a/code/ryzom/server/src/pd_support_service/stat_user_file_list_builders.cpp
+++ b/code/ryzom/server/src/pd_support_service/stat_user_file_list_builders.cpp
@@ -20,6 +20,7 @@
 //-------------------------------------------------------------------------------------------------
 
 #include <time.h>
+#include <limits>
 #include "game_share/utils.h"
 #include "stat_file_list_builder_factory.h"
 #include "stat_globals.h"
@@ -522,7 +523,7 @@ FILE_LIST_BUILDER(NewestFile,"remove all but the latest file for each account (a
 		uint32 accountId= accountIds[i];
 		uint32& bestTime= bestTimes[accountId];
 		uint32 timeStamp= fdc[i].FileTimeStamp;
-		if (bestTime!=timeStamp || bestTime==~0u)
+		if (bestTime!=timeStamp || bestTime==std::numeric_limits<uint32>::max())
 		{
 			fdc.removeFile(i);
 			continue;
diff --git a/code/ryzom/server/src/persistant_data_service/pds_database.cpp b/code/ryzom/server/src/persistant_data_service/pds_database.cpp
index 66b272d5c..84148220b 100644
--- a/code/ryzom/server/src/persistant_data_service/pds_database.cpp
+++ b/code/ryzom/server/src/persistant_data_service/pds_database.cpp
@@ -905,14 +905,16 @@ bool	CDatabase::set(RY_PDS::TTableIndex table, RY_PDS::TRowIndex row, RY_PDS::TC
 
 	case PDS_float:
 		{
-			float	data = (float)atof(value.c_str());
+			float data;
+			NLMISC::fromString(value, data);
 			return set(table, row, column, sizeof(data), &data);
 		}
 		break;
 
 	case PDS_double:
 		{
-			double	data = (double)atof(value.c_str());
+			double data;
+			NLMISC::fromString(value, data);
 			return set(table, row, column, sizeof(data), &data);
 		}
 		break;
diff --git a/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.cpp b/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.cpp
index 1656f34c1..1de6677cb 100644
--- a/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.cpp
+++ b/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.cpp
@@ -21,6 +21,7 @@
 #include <math.h>
 
 #include <list>
+#include <limits>
 
 #include "nel/misc/debug.h"
 #include "nel/misc/config_file.h"
@@ -912,7 +913,7 @@ void cbLSChooseShard (CMessage &msgin, const std::string &serviceName, TServiceI
 	}
 
 
-	string ret = lsChooseShard(userName, cookie, userPriv, userExtended, WS::TUserRole::ur_player, 0xffffffff, ~0);
+	string ret = lsChooseShard(userName, cookie, userPriv, userExtended, WS::TUserRole::ur_player, 0xffffffff, std::numeric_limits<uint32>::max());
 
 	if (!ret.empty())
 	{
diff --git a/code/ryzom/server/src/server_share/continent_container.h b/code/ryzom/server/src/server_share/continent_container.h
index 7edfb0c96..6e65b3dc4 100644
--- a/code/ryzom/server/src/server_share/continent_container.h
+++ b/code/ryzom/server/src/server_share/continent_container.h
@@ -162,7 +162,7 @@ public:
 
 	/// Init whole continent container
 	void	init(uint gridWidth, uint gridHeight, double primitiveMaxSize, uint nbWorldImages, const std::string &packedSheetsDirectory, double cellSize=0.0, bool loadPacsPrims = true);
-	
+
 	/// Build sheets
 	void	buildSheets(const std::string &packedSheetsDirectory);
 
diff --git a/code/ryzom/server/src/server_share/logger_service_client.cpp b/code/ryzom/server/src/server_share/logger_service_client.cpp
index e8174e0cd..d94834d12 100644
--- a/code/ryzom/server/src/server_share/logger_service_client.cpp
+++ b/code/ryzom/server/src/server_share/logger_service_client.cpp
@@ -238,8 +238,8 @@ namespace LGS
 				// create the log context closing
 				_LogInfos.push_back(TLogInfo());
 				_LogInfos.back().setLogName(contextName);
-				// tag as 'closing' with ~0
-				_LogInfos.back().setTimeStamp(~0);
+				// tag as 'closing' with std::numeric_limits<uint32>::max()
+				_LogInfos.back().setTimeStamp(std::numeric_limits<uint32>::max());
 			}
 			--_NbOpenContext;
 			if (VerboseLogger)
diff --git a/code/ryzom/server/src/server_share/msg_ai_service.h b/code/ryzom/server/src/server_share/msg_ai_service.h
index bd4115f4a..13c6a3423 100644
--- a/code/ryzom/server/src/server_share/msg_ai_service.h
+++ b/code/ryzom/server/src/server_share/msg_ai_service.h
@@ -88,7 +88,7 @@ public:
 	virtual void description ()
 	{
 		className ("CUserEventMsg");
-		property ("InstanceNumber", PropUInt32, uint32(~0), InstanceNumber);
+		property ("InstanceNumber", PropUInt32, std::numeric_limits<uint32>::max(), InstanceNumber);
 		property ("GrpAlias", PropUInt32, uint32(0xffffffff), GrpAlias);
 		property ("EventId", PropUInt8, uint8(0xff), EventId);
 		propertyCont ("Params", PropString, Params);
@@ -133,7 +133,7 @@ public:
 	virtual void description ()
 	{
 		className ("CSetEscortTeamId");
-		property ("InstanceNumber", PropUInt32, uint32(~0), InstanceNumber);
+		property ("InstanceNumber", PropUInt32, std::numeric_limits<uint32>::max(), InstanceNumber);
 		propertyCont ("Groups", PropUInt32, Groups);
 		property ("TeamId", PropUInt16, CTEAM::InvalidTeamId, TeamId);
 	}
diff --git a/code/ryzom/server/src/server_share/mysql_wrapper.cpp b/code/ryzom/server/src/server_share/mysql_wrapper.cpp
index 5b993b56e..3bb343314 100644
--- a/code/ryzom/server/src/server_share/mysql_wrapper.cpp
+++ b/code/ryzom/server/src/server_share/mysql_wrapper.cpp
@@ -116,7 +116,7 @@ namespace MSW
 		if (MSWAutoReconnect)
 		{
 			addOption(MYSQL_OPT_RECONNECT, "1");
-		}		
+		}
 
 		return _connect();
 	}
diff --git a/code/ryzom/server/src/server_share/pet_interface_msg.h b/code/ryzom/server/src/server_share/pet_interface_msg.h
index d2f9e64a2..f404a76ef 100644
--- a/code/ryzom/server/src/server_share/pet_interface_msg.h
+++ b/code/ryzom/server/src/server_share/pet_interface_msg.h
@@ -25,6 +25,7 @@
 #include "game_share/synchronised_message.h"
 #include "game_share/mirror.h"
 
+#include <limits>
 
 // Pet interface message class for AIS / EGS communication
 
@@ -47,7 +48,7 @@ public:
 	virtual void description ()
 	{
 		className ("CPetSpawnMsg");
-		property ("AIInstanceId", PropUInt32, (uint32)~0, AIInstanceId);
+		property ("AIInstanceId", PropUInt32, std::numeric_limits<uint32>::max(), AIInstanceId);
 		property ("SpawnMode", PropUInt16, (uint16)NEAR_PLAYER, SpawnMode);
 		property ("CharacterMirrorRow",	PropDataSetRow,	TDataSetRow(), CharacterMirrorRow);
 		property ("PetSheetId", PropSheetId, NLMISC::CSheetId::Unknown, PetSheetId);
diff --git a/code/ryzom/server/src/server_share/r2_vision.cpp b/code/ryzom/server/src/server_share/r2_vision.cpp
index 7433e9026..dd4b2a25d 100644
--- a/code/ryzom/server/src/server_share/r2_vision.cpp
+++ b/code/ryzom/server/src/server_share/r2_vision.cpp
@@ -147,8 +147,8 @@ namespace R2_VISION
 
 	void CUniverse::createInstance(uint32 aiInstance, uint32 groupId)
 	{
-		// just ignore attempts to create the ~0u instance
-		if (aiInstance==~0u)
+		// just ignore attempts to create the std::numeric_limits<uint32>::max() instance
+		if (aiInstance==std::numeric_limits<uint32>::max())
 		{
 			return;
 		}
@@ -172,8 +172,8 @@ namespace R2_VISION
 
 	void CUniverse::removeInstance(uint32 aiInstance)
 	{
-		// just ignore attempts to remove the ~0u instance
-		if (aiInstance==~0u)
+		// just ignore attempts to remove the std::numeric_limits<uint32>::max() instance
+		if (aiInstance==std::numeric_limits<uint32>::max())
 		{
 			return;
 		}
@@ -227,7 +227,7 @@ namespace R2_VISION
 		SUniverseEntity& theEntity= _Entities[row];
 
 		// if the entity was already allocated then remove it
-		if (theEntity.AIInstance == ~0u) { return; }
+		if (theEntity.AIInstance == std::numeric_limits<uint32>::max()) { return; }
 
 		if ( theEntity.ViewerRecord)
 		{
@@ -325,8 +325,8 @@ namespace R2_VISION
 		BOMB_IF(row>=_Entities.size(),NLMISC::toString("Ignoring attempt to set entity position with invalid row value: %d",row),return);
 
 		// ensure that the new AIInstance exists
-		BOMB_IF(aiInstance!=~0u && (aiInstance>=_Instances.size() || _Instances[aiInstance]==NULL),
-			NLMISC::toString("ERROR: Failed to add entity %d to un-initialised instance: %d",row,aiInstance),aiInstance=~0u);
+		BOMB_IF(aiInstance!=std::numeric_limits<uint32>::max() && (aiInstance>=_Instances.size() || _Instances[aiInstance]==NULL),
+			NLMISC::toString("ERROR: Failed to add entity %d to un-initialised instance: %d",row,aiInstance),aiInstance=std::numeric_limits<uint32>::max());
 
 		// delegate to workhorse routine (converting y coordinate to +ve axis)
 		_teleportEntity(dataSetRow,aiInstance,x,-y,invisibilityLevel);
@@ -429,7 +429,7 @@ namespace R2_VISION
 		SUniverseEntity& theEntity= _Entities[row];
 
 		// if the entity was already allocated then remove it
-		if (theEntity.AIInstance!=~0u)
+		if (theEntity.AIInstance!=std::numeric_limits<uint32>::max())
 		{
 			_removeEntity(dataSetRow);
 		}
@@ -455,7 +455,7 @@ namespace R2_VISION
 		{
 			// detach the entity from the instance it's currently in
 			_Instances[theEntity.AIInstance]->removeEntity(theEntity);
-			theEntity.AIInstance= ~0u;
+			theEntity.AIInstance= std::numeric_limits<uint32>::max();
 			theEntity.ViewerRecord= NULL;
 		}
 	}
@@ -466,8 +466,8 @@ namespace R2_VISION
 		SUniverseEntity& theEntity= _Entities[dataSetRow.getIndex()];
 
 		#ifdef NL_DEBUG
-		nlassert(theEntity.AIInstance==~0u || theEntity.AIInstance<_Instances.size());
-		nlassert(theEntity.AIInstance==~0u || _Instances[theEntity.AIInstance]!=NULL);
+		nlassert(theEntity.AIInstance==std::numeric_limits<uint32>::max() || theEntity.AIInstance<_Instances.size());
+		nlassert(theEntity.AIInstance==std::numeric_limits<uint32>::max() || _Instances[theEntity.AIInstance]!=NULL);
 		#endif
 
 		// if the entity is a viewer then move the view coordinates
@@ -477,7 +477,7 @@ namespace R2_VISION
 		}
 
 		// if the entity is not currently in an AIInstance then stop here
-		if (theEntity.AIInstance==~0u)
+		if (theEntity.AIInstance==std::numeric_limits<uint32>::max())
 			return;
 		
 		// set the instance entity record position
@@ -498,10 +498,10 @@ namespace R2_VISION
 		// set the new AIInstance value for the entity
 		theEntity.AIInstance= aiInstance; 
 
-		// if the aiInstance is set to ~0u (a reserved value) then we stop here
-		if (aiInstance==~0u)
+		// if the aiInstance is set to std::numeric_limits<uint32>::max() (a reserved value) then we stop here
+		if (aiInstance==std::numeric_limits<uint32>::max())
 		{
-			// clear out the vision for an entity in aiInstance ~0u
+			// clear out the vision for an entity in aiInstance std::numeric_limits<uint32>::max()
 			if (getEntity(dataSetRow)->ViewerRecord!=NULL)
 			{
 				TVision emptyVision(2);
@@ -785,7 +785,7 @@ namespace R2_VISION
 			// locate the old vision group (the one we're allocated to before isolation)
 			uint32 visionId= viewerRecord->VisionId;
 			NLMISC::CSmartPtr<CVisionGroup>& oldVisionGroup= _VisionGroups[visionId];
-			BOMB_IF(visionId>=_VisionGroups.size() ||oldVisionGroup==NULL,"Trying to remove entity from vision group with unknown vision id",viewerRecord->VisionId=~0u;return);
+			BOMB_IF(visionId>=_VisionGroups.size() ||oldVisionGroup==NULL,"Trying to remove entity from vision group with unknown vision id",viewerRecord->VisionId=std::numeric_limits<uint32>::max();return);
 
 			// if we're the only viewer then already isolated so just return
 			if (oldVisionGroup->numViewers()==1)
@@ -830,7 +830,7 @@ namespace R2_VISION
 		if (viewerRecord!=NULL)
 		{
 			uint32 visionId= viewerRecord->VisionId;
-			BOMB_IF(visionId>=_VisionGroups.size() ||_VisionGroups[visionId]==NULL,"Trying to remove entity with unknown vision id",viewerRecord->VisionId=~0u;return);
+			BOMB_IF(visionId>=_VisionGroups.size() ||_VisionGroups[visionId]==NULL,"Trying to remove entity with unknown vision id",viewerRecord->VisionId=std::numeric_limits<uint32>::max();return);
 			_VisionGroups[visionId]->removeViewer(viewerRecord);
 		}
 
@@ -847,8 +847,8 @@ namespace R2_VISION
 		_Entities.pop_back();
 
 		// invalidate the InstanceIndex value for the entity we just removed
-		entity.InstanceIndex=~0u;
-		entity.AIInstance=~0u;
+		entity.InstanceIndex=std::numeric_limits<uint32>::max();
+		entity.AIInstance=std::numeric_limits<uint32>::max();
 	}
 
 	void CInstance::release()
@@ -899,11 +899,11 @@ namespace R2_VISION
 
 	CVisionGroup::CVisionGroup()
 	{
-		_XMin=~0u;
+		_XMin=std::numeric_limits<uint32>::max();
 		_XMax=0;
-		_YMin=~0u;
+		_YMin=std::numeric_limits<uint32>::max();
 		_YMax=0;
-		_VisionId=~0u;
+		_VisionId=std::numeric_limits<uint32>::max();
 		// setup the dummy entry in the vision buffer
 		_Vision.reserve(AllocatedVisionVectorSize);
 		vectAppend(_Vision).DataSetRow= ZeroDataSetRow;
@@ -923,8 +923,8 @@ namespace R2_VISION
 		// ensure that the viewer wasn't aleady attached to another vision group
 		#ifdef NL_DEBUG
 		nlassert(viewer!=NULL);
-		nlassert(viewer->VisionId==~0u);
-		nlassert(viewer->VisionIndex==~0u);
+		nlassert(viewer->VisionId==std::numeric_limits<uint32>::max());
+		nlassert(viewer->VisionIndex==std::numeric_limits<uint32>::max());
 		#endif
 		TEST(("add viewer %d to grp %d",viewer->getViewerId().getIndex(),_VisionId));
 
@@ -961,8 +961,8 @@ namespace R2_VISION
 
 		// pop the back entry off the vector and flag oursleves as unused
 		_Viewers.pop_back();
-		viewer->VisionId= ~0u;
-		viewer->VisionIndex= ~0u;
+		viewer->VisionId= std::numeric_limits<uint32>::max();
+		viewer->VisionIndex= std::numeric_limits<uint32>::max();
 
 		// NOTE: after this the boundary may be out of date - this will be recalculated at the next
 		// vision update so we don't take time to do it here
@@ -1171,8 +1171,8 @@ namespace R2_VISION
 			return;
 
 		// calculate the bouding box for our viewers
-		uint32 xmin= ~0u;
-		uint32 ymin= ~0u;
+		uint32 xmin= std::numeric_limits<uint32>::max();
+		uint32 ymin= std::numeric_limits<uint32>::max();
 		uint32 xmax= 0;
 		uint32 ymax= 0;
 		for (uint32 i=(uint32)_Viewers.size();i--;)
@@ -1247,7 +1247,7 @@ namespace R2_VISION
 		// reset the vision vector and add in the dummy entry with DataSetRow=0
 		_Vision.resize(AllocatedVisionVectorSize);
 		_Vision[0].DataSetRow= ZeroDataSetRow;
-		_Vision[0].VisionSlot= ~0u; 
+		_Vision[0].VisionSlot= std::numeric_limits<uint32>::max(); 
 
 		// setup a vision slot iterator for filling in the vision buffer (=1 to skip passed the dummy entry)
 		uint32 nextVisionSlot=1;
@@ -1380,8 +1380,8 @@ namespace R2_VISION
 	
 	CViewer::CViewer()
 	{
-		VisionId=~0u;
-		VisionIndex=~0u;
+		VisionId=std::numeric_limits<uint32>::max();
+		VisionIndex=std::numeric_limits<uint32>::max();
 		_VisionResetCount= 0;
 	}
 
@@ -1399,7 +1399,7 @@ namespace R2_VISION
 
 		// setup the dummy entry with DataSetRow=0
 		_Vision[0].DataSetRow= ZeroDataSetRow;
-		_Vision[0].VisionSlot= ~0u; 
+		_Vision[0].VisionSlot= std::numeric_limits<uint32>::max(); 
 
 		// setup the vision slots in reverse order from 254..0 (because they're popped from the back)
 		_FreeVisionSlots.clear();
diff --git a/code/ryzom/server/src/server_share/r2_vision.h b/code/ryzom/server/src/server_share/r2_vision.h
index 9bf3f7689..9872e606a 100644
--- a/code/ryzom/server/src/server_share/r2_vision.h
+++ b/code/ryzom/server/src/server_share/r2_vision.h
@@ -140,7 +140,7 @@ namespace R2_VISION
 		// ctor
 		SViewedEntity()
 		{
-			VisionSlot=~0u;
+			VisionSlot=std::numeric_limits<uint32>::max();
 		}
 	};
 
@@ -196,15 +196,15 @@ namespace R2_VISION
 	struct SUniverseEntity
 	{
 		TDataSetRow DataSetRow;						// the complete data set row for the entity
-		uint32 AIInstance;							// the id of the instance that we're currently in (~0u by default)
+		uint32 AIInstance;							// the id of the instance that we're currently in (std::numeric_limits<uint32>::max() by default)
 		mutable uint32 InstanceIndex;				// the index within the instance's _Entities vector
 		NLMISC::CSmartPtr<CViewer> ViewerRecord;	// pointer to the CViewer record for viewers (or NULL)
 
 		// ctor
 		SUniverseEntity()
 		{
-			AIInstance=~0u;
-			InstanceIndex=~0u;
+			AIInstance=std::numeric_limits<uint32>::max();
+			InstanceIndex=std::numeric_limits<uint32>::max();
 		}
 	};
 
diff --git a/code/ryzom/server/src/server_share/used_continent.cpp b/code/ryzom/server/src/server_share/used_continent.cpp
index 01ab2beda..9d2b48f0d 100644
--- a/code/ryzom/server/src/server_share/used_continent.cpp
+++ b/code/ryzom/server/src/server_share/used_continent.cpp
@@ -17,8 +17,9 @@
 
 
 #include "stdpch.h"
-#include <nel/net/service.h>
 #include "used_continent.h"
+#include "nel/net/service.h"
+
 
 using namespace std;
 using namespace NLMISC;
@@ -105,7 +106,7 @@ uint32	CUsedContinent::getInstanceForContinent(const std::string &continentName)
 	if (it != _Continents.end())
 		return it->ContinentInstance;
 	else
-		return ~0;
+		return INVALID_AI_INSTANCE;
 }
 
 uint32	CUsedContinent::getInstanceForContinent(CONTINENT::TContinent continentEnum) const
@@ -115,7 +116,7 @@ uint32	CUsedContinent::getInstanceForContinent(CONTINENT::TContinent continentEn
 	if (it != _Continents.end())
 		return it->ContinentInstance;
 	else
-		return ~0;
+		return INVALID_AI_INSTANCE;
 }
 
 const std::string &CUsedContinent::getContinentForInstance(uint32 instanceNumber) const
diff --git a/code/ryzom/server/src/server_share/used_continent.h b/code/ryzom/server/src/server_share/used_continent.h
index 150b6342c..412c133e3 100644
--- a/code/ryzom/server/src/server_share/used_continent.h
+++ b/code/ryzom/server/src/server_share/used_continent.h
@@ -21,6 +21,7 @@
 #include "nel/misc/types_nl.h"
 #include "nel/net/service.h"
 #include "game_share/continent.h"
+#include "game_share/misc_const.h"
 
 #include <algorithm>
 
@@ -60,12 +61,12 @@ public:
 	bool	isContinentUsed(const std::string &continentName) const;
 
 	/** Return the static instance number associated with a continent name.
-	*	If the continent name is unknow, return ~0
+	*	If the continent name is unknow, return std::numeric_limits<uint32>::max()
 	*/
 	uint32	getInstanceForContinent(const std::string &continentName) const;
 
 	/** Return the static instance number associated with a continent enum value
-	 *	If the continent name is unknow, return ~0
+	 *	If the continent name is unknow, return std::numeric_limits<uint32>::max()
 	 */
 	uint32	getInstanceForContinent(CONTINENT::TContinent continentEnum) const;
 
diff --git a/code/ryzom/server/src/shard_unifier_service/character_sync.cpp b/code/ryzom/server/src/shard_unifier_service/character_sync.cpp
index 3b1a8b995..29b404567 100644
--- a/code/ryzom/server/src/shard_unifier_service/character_sync.cpp
+++ b/code/ryzom/server/src/shard_unifier_service/character_sync.cpp
@@ -365,7 +365,7 @@ namespace CHARSYNC
 				for (; first != last; ++first)
 				{
 					// default to no limit
-					uint32 limit=~0u;
+					uint32 limit=std::numeric_limits<uint32>::max();
 
 					// if there's a limit in the limis map then use it instead...
 					if (limitsMap.find(first->first)!=limitsMap.end())
diff --git a/code/ryzom/server/src/shard_unifier_service/name_manager.cpp b/code/ryzom/server/src/shard_unifier_service/name_manager.cpp
index 5b50f6359..17b500f92 100644
--- a/code/ryzom/server/src/shard_unifier_service/name_manager.cpp
+++ b/code/ryzom/server/src/shard_unifier_service/name_manager.cpp
@@ -1138,7 +1138,7 @@ bool CNameManager::loadGuildsNamesFromTxt()
 		// merge the first words until we have only 3 words
 		while (words.size() > 3)
 		{
-			words[0] += words[1];
+			words[0] += " " + words[1];
 			words.erase(words.begin()+1);
 		}
 		BOMB_IF (words.size()!=3,"Invalid line "<<i+1<<" found in guild names file : '"<<line<<"'", continue);
diff --git a/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.cpp b/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.cpp
index 9e81798dc..238b2b49e 100644
--- a/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.cpp
+++ b/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.cpp
@@ -1,3 +1,18 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
 
 /////////////////////////////////////////////////////////////////
 // WARNING : this is a generated file, don't change it !
@@ -303,7 +318,7 @@ namespace RSMGR
 		}
 		else if (cmd == NOPE::cc_instance_count)
 		{
-			return _ObjectCache.size();
+			return (uint32)_ObjectCache.size();
 		}
 
 		// default return value
@@ -321,7 +336,7 @@ namespace RSMGR
 		TReleasedObject::iterator first(_ReleasedObject.begin()), last(_ReleasedObject.end());
 		for (; first != last; ++first)
 		{
-			nbReleased += first->second.size();
+			nbReleased += (uint32)first->second.size();
 		}
 
 		nlinfo("	There are %u object instances in cache not referenced (waiting deletion or re-use))", nbReleased);
@@ -781,7 +796,7 @@ namespace RSMGR
 		}
 		else if (cmd == NOPE::cc_instance_count)
 		{
-			return _ObjectCache.size();
+			return (uint32)_ObjectCache.size();
 		}
 
 		// default return value
@@ -799,7 +814,7 @@ namespace RSMGR
 		TReleasedObject::iterator first(_ReleasedObject.begin()), last(_ReleasedObject.end());
 		for (; first != last; ++first)
 		{
-			nbReleased += first->second.size();
+			nbReleased += (uint32)first->second.size();
 		}
 
 		nlinfo("	There are %u object instances in cache not referenced (waiting deletion or re-use))", nbReleased);
diff --git a/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h b/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h
index 50ef8e823..c33e4fe15 100644
--- a/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h
+++ b/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h
@@ -1,3 +1,18 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// 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/>.
 
 /////////////////////////////////////////////////////////////////
 // WARNING : this is a generated file, don't change it !
@@ -610,7 +625,7 @@ namespace RSMGR
 	};
 
 
-		/////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////
 	// WARNING : this is a generated file, don't change it !
 	/////////////////////////////////////////////////////////////////
 	class CNelPermission
@@ -661,7 +676,6 @@ namespace RSMGR
 					setPersistentState(NOPE::os_dirty);
 
 				_DomainId = value;
-
 			}
 
 		}
diff --git a/code/ryzom/server/src/tick_service/range_mirror_manager.cpp b/code/ryzom/server/src/tick_service/range_mirror_manager.cpp
index f988ac054..2c92c738f 100644
--- a/code/ryzom/server/src/tick_service/range_mirror_manager.cpp
+++ b/code/ryzom/server/src/tick_service/range_mirror_manager.cpp
@@ -472,7 +472,7 @@ void				CRangeList::acquireFirstRow()
  */
 bool				CRangeList::acquireRange( NLNET::TServiceId ownerServiceId, NLNET::TServiceId mirrorServiceId, sint32 nbRows, TDataSetIndex *first, TDataSetIndex *last )
 {
-	TDataSetIndex prevlast(~0);
+	TDataSetIndex prevlast(std::numeric_limits<uint32>::max());
 	TRangeList::iterator irl = _RangeList.begin();
 
 	// Find a compatible range
diff --git a/code/ryzom/server/src/tick_service/range_mirror_manager.h b/code/ryzom/server/src/tick_service/range_mirror_manager.h
index 6615a1c6a..ed12f706b 100644
--- a/code/ryzom/server/src/tick_service/range_mirror_manager.h
+++ b/code/ryzom/server/src/tick_service/range_mirror_manager.h
@@ -28,6 +28,7 @@
 #include <string>
 #include <list>
 #include <map>
+#include <limits>
 
 namespace NLNET
 {
@@ -46,7 +47,7 @@ class CRangeList
 public:
 
 	/// Default constructor
-	CRangeList() : _TotalMaxRows(~0) { acquireFirstRow(); }
+	CRangeList() : _TotalMaxRows(std::numeric_limits<sint32>::max()) { acquireFirstRow(); }
 
 	/// Constructor
 	CRangeList( sint32 totalMaxRows ) : _TotalMaxRows( totalMaxRows ) { acquireFirstRow(); }
diff --git a/code/ryzom/server/src/tick_service/tick_service.cpp b/code/ryzom/server/src/tick_service/tick_service.cpp
index 95f609571..4a64fdd7c 100644
--- a/code/ryzom/server/src/tick_service/tick_service.cpp
+++ b/code/ryzom/server/src/tick_service/tick_service.cpp
@@ -825,7 +825,7 @@ bool CTickService::loadGameCycle()
 /*
  *
  */
-CTickServiceGameCycleTimeMeasure::CTickServiceGameCycleTimeMeasure() : HistoryMain( CTickService::getInstance()->getServiceId(), NLNET::TServiceId(~0), false ) {}
+CTickServiceGameCycleTimeMeasure::CTickServiceGameCycleTimeMeasure() : HistoryMain( CTickService::getInstance()->getServiceId(), NLNET::TServiceId(std::numeric_limits<uint16>::max()), false ) {}
 
 
 /*
@@ -904,7 +904,7 @@ void CTickServiceGameCycleTimeMeasure::displayStat( NLMISC::CLog *log, TTimeMeas
 	uint divideBy = (HistoryMain.NbMeasures==0) ? 0 : ((stat==MHTSum) ? HistoryMain.NbMeasures : 1);
 	HistoryMain.Stats[stat].displayStat( log, TickServiceTimeMeasureTypeToCString, divideBy );
 	{
-		CMirrorTimeMeasure gatheredStats [NbTimeMeasureHistoryStats] = { 0, ~0, 0 };
+		CMirrorTimeMeasure gatheredStats [NbTimeMeasureHistoryStats] = { 0, std::numeric_limits<uint16>::max(), 0 };
 		for ( std::vector<CMirrorTimeMeasureHistory>::const_iterator ihm=HistoryByMirror.begin(); ihm!=HistoryByMirror.end(); ++ihm )
 		{
 			log->displayRawNL( "\tMS-%hu, %u measures:", (*ihm).ServiceId.get(), (*ihm).NbMeasures );
@@ -921,7 +921,7 @@ void CTickServiceGameCycleTimeMeasure::displayStat( NLMISC::CLog *log, TTimeMeas
 		}
 	}
 	{
-		CServiceTimeMeasure gatheredStats [NbTimeMeasureHistoryStats] = { 0, ~0, 0 };
+		CServiceTimeMeasure gatheredStats [NbTimeMeasureHistoryStats] = { 0, std::numeric_limits<uint16>::max(), 0 };
 		for ( std::vector<CServiceTimeMeasureHistory>::const_iterator ihs=HistoryByService.begin(); ihs!=HistoryByService.end(); ++ihs )
 		{
 			log->displayRawNL( "\t%s (on MS-%hu), %u measures:", CUnifiedNetwork::getInstance()->getServiceUnifiedName( (*ihs).ServiceId ).c_str(), (*ihs).ParentServiceId.get(), (*ihs).NbMeasures );
diff --git a/code/ryzom/server/src/tick_service/tick_service.h b/code/ryzom/server/src/tick_service/tick_service.h
index 5b07793a3..9abe079bc 100644
--- a/code/ryzom/server/src/tick_service/tick_service.h
+++ b/code/ryzom/server/src/tick_service/tick_service.h
@@ -113,7 +113,7 @@ public:
 			NbMeasures = 0;
 			Stats.resize( NbTimeMeasureHistoryStats );
 			Stats[MHTSum] = 0;
-			Stats[MHTMin] = ~0;
+			Stats[MHTMin] = std::numeric_limits<T>::max();
 			Stats[MHTMax] = 0;
 		}
 	}
diff --git a/code/ryzom/tools/client/CMakeLists.txt b/code/ryzom/tools/client/CMakeLists.txt
index aabc3142c..0c42233cb 100644
--- a/code/ryzom/tools/client/CMakeLists.txt
+++ b/code/ryzom/tools/client/CMakeLists.txt
@@ -1,10 +1,9 @@
-
 IF(WITH_RYZOM_CLIENT)
-  ADD_SUBDIRECTORY( client_patcher )
-  
-  IF( WITH_QT )
-    ADD_SUBDIRECTORY( client_config_qt )
-  ENDIF( WITH_QT )
-ENDIF(WITH_RYZOM_CLIENT)
+  ADD_SUBDIRECTORY(client_patcher)
+
+  IF(WITH_QT)
+    ADD_SUBDIRECTORY(client_config_qt)
+  ENDIF()
+ENDIF()
 
-ADD_SUBDIRECTORY( r2_islands_textures )
+ADD_SUBDIRECTORY(r2_islands_textures)
diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
index e5b845e43..70857105e 100644
--- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt
+++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
@@ -12,6 +12,7 @@ ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
 INCLUDE_DIRECTORIES(
 			${LIBXML2_INCLUDE_DIR}
 			${CURL_INCLUDE_DIRS}
+			${ZLIB_INCLUDE_DIR}
 			${CMAKE_SOURCE_DIR}/ryzom/client/src
 )
 
@@ -20,6 +21,7 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 				nelnet
 				ryzom_gameshare
 				ryzom_sevenzip
+				${ZLIB_LIBRARIES}
 				${CURL_LIBRARIES})
 
 IF(APPLE)
diff --git a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
index 8228c3e2e..69f701054 100644
--- a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
+++ b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
@@ -1540,7 +1540,6 @@ void CScreenshotIslands::buildIslandsTextures()
 							CIFile proxFS(proxFileName.c_str());
 							proxBitmap.load(proxFS);
 
-							
 							// resize proximity bitmap
 							CBitmap tempBitmap;
 							int newWidth = islandBitmap.getWidth();
@@ -1568,7 +1567,7 @@ void CScreenshotIslands::buildIslandsTextures()
 							// swap them
 							proxBitmap.resize(newWidth, newHeight, proxBitmap.PixelFormat);
 							proxBitmap.swap(tempBitmap);
-							
+
 							//proxBitmap.resample(newWidth, newHeight);
 
 
@@ -1784,6 +1783,7 @@ void CScreenshotIslands::buildBackTextureHLS(const std::string & islandName, con
 
 
 	// keep more filled eighth of circle
+	nlassert(!sortedHLS.empty()); // If it crashes here, you may be missing .zonel's.
 	itHLS = sortedHLS.begin();
 	uint h, s, v;
 	RGB2HSV(*itHLS, h, s, v);
diff --git a/code/ryzom/tools/leveldesign/CMakeLists.txt b/code/ryzom/tools/leveldesign/CMakeLists.txt
index 9a56a2fac..399a71deb 100644
--- a/code/ryzom/tools/leveldesign/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 ADD_SUBDIRECTORY(uni_conv)
 ADD_SUBDIRECTORY(csv_transform)
 ADD_SUBDIRECTORY(icon_search)
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_double.cpp b/code/ryzom/tools/leveldesign/georges_convert/type_unit_double.cpp
index 6244c0f4a..674f77cd6 100644
--- a/code/ryzom/tools/leveldesign/georges_convert/type_unit_double.cpp
+++ b/code/ryzom/tools/leveldesign/georges_convert/type_unit_double.cpp
@@ -203,7 +203,7 @@ void CTypeUnitDouble::SetLowLimit( const CStringEx _sxll )
 void CTypeUnitDouble::SetHighLimit( const CStringEx _sxhl )
 {
 	sxhighlimit = _sxhl;
-	dhighlimit = atof( sxhighlimit.c_str() ); 
+	NLMISC::fromString(sxhighlimit, dhighlimit);
 }
 
 }
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp
index 6af950eae..cd937688a 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp
@@ -53,7 +53,8 @@ namespace NLQT {
 	{	
 		// load config
 		QFile file(NLQT_CONFIG_FILE);
-		if (!file.exists()) {
+		if (!file.exists())
+		{
 			file.open( QIODevice::WriteOnly | QIODevice::Text );
 			file.write("GraphicsDrivers = { \"OpenGL\", \"Direct3D\" };");
 			file.write("\nSearchPaths = {\"\"};");
@@ -64,9 +65,12 @@ namespace NLQT {
 			file.close();
 		}
 
-		try {
+		try
+		{
 			ConfigFile.load(NLQT_CONFIG_FILE);
-		} catch(...) {
+		}
+		catch(...)
+		{
 		}
 
 		addLeveldesignPath();
@@ -213,16 +217,17 @@ namespace NLQT {
 		uint listsize = tmpList->size();
 		for (uint i = 0; i < listsize; ++i) 
 		{
-			if(_progressCB) {
-			_progressCB->DisplayString = tmpList->at(i);
-			CPath::addSearchPath(tmpList->at(i), true, false, _progressCB);
+			if(_progressCB)
+			{
+				_progressCB->DisplayString = tmpList->at(i);
+				CPath::addSearchPath(tmpList->at(i), true, false, _progressCB);
 			}
 			else
 			{
-			CProgressDialog pcb;
-			pcb.DisplayString = tmpList->at(i);
-			pcb.show();
-			CPath::addSearchPath(tmpList->at(i), true, false, &pcb);
+				CProgressDialog pcb;
+				pcb.DisplayString = tmpList->at(i);
+				pcb.show();
+				CPath::addSearchPath(tmpList->at(i), true, false, &pcb);
 			}
 		}
 		if (!list)
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp
index bb91f8b62..25b8a1490 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp
@@ -60,7 +60,8 @@ namespace NLQT
 
 		CFormItem* curItem = m->getItem(mp->mapToSource(index));
 		NLGEORGES::UFormElm *curElm = curItem->getFormElm();
-		if (!curElm) {
+		if (!curElm)
+		{
 			// TODO: create new Element
 			return 0;
 		}
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp
index b5ab13ba3..f06bb537e 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp
@@ -377,7 +377,8 @@ namespace NLQT
 		nlinfo("CGeorgesTreeViewDialog::filterRows");
 		CGeorgesFormProxyModel * mp = dynamic_cast<CGeorgesFormProxyModel *>(_ui.treeView->model());
 		CGeorgesFormModel *m = dynamic_cast<CGeorgesFormModel *>(mp->sourceModel());
-		if (m) {
+		if (m)
+		{
 			m->setShowParents(_ui.checkBoxParent->isChecked());
 			m->setShowDefaults(_ui.checkBoxDefaults->isChecked());
 		}
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp
index 89cba843c..98c7b59e2 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp
@@ -352,7 +352,8 @@ namespace NLQT
 
 	/******************************************************************************/
 
-	void CGeorgesFormModel::loadFormData(UFormElm *root, CFormItem *parent) {
+	void CGeorgesFormModel::loadFormData(UFormElm *root, CFormItem *parent)
+	{
 
 		if (!root) 
 			return;
@@ -390,7 +391,8 @@ namespace NLQT
 								elmtType = "Array";						
 							if (elmt->isStruct())
 								elmtType = "Struct";
-							if (elmt->isAtom()) {
+							if (elmt->isAtom())
+							{
 								elmtType = "Atom";
 								uint numDefinitions = 0;
 								const UType *type = elmt->getType();
@@ -433,7 +435,8 @@ namespace NLQT
 										tmpValue = v.c_str();
 										if (type->getType() == UType::SignedInt) 
 										{
-											if (QString("%1").arg(value.c_str()).toDouble() == tmpValue.toDouble()) {
+											if (QString("%1").arg(value.c_str()).toDouble() == tmpValue.toDouble())
+											{
 												value = l;
 												break;
 											}
@@ -482,7 +485,8 @@ namespace NLQT
 							}
 							columnData << QString(elmName.c_str()) << QString(value.c_str()) << "" << elmtType;
 							parent->appendChild(new CFormItem(elmt, columnData, parent, *whereV, *whereN));
-							//if (parents.last()->childCount() > 0) {
+							//if (parents.last()->childCount() > 0)
+							//{
 							//	parents << parents.last()->child(parents.last()->childCount()-1);
 							//}
 							loadFormData(elmt, parent->child(parent->childCount()-1));
@@ -549,7 +553,8 @@ namespace NLQT
 					{
 						if (elmt->isArray())
 							elmtType = "Array";
-						if (elmt->isStruct()) {
+						if (elmt->isStruct())
+						{
 							elmtType = "Struct";
 						}
 						if (elmt->isAtom()) 
@@ -593,28 +598,35 @@ namespace NLQT
 		CFormItem *fi_dep = new CFormItem(_rootElm, QList<QVariant>() << "dependencies", _rootItem);
 		_rootItem->appendChild(fi_dep);
 
-		if (!dfns.isEmpty()) {
-		CFormItem *fi_dfn = new CFormItem(_rootElm, QList<QVariant>() << "dfn", fi_dep);
-		fi_dep->appendChild(fi_dfn);
-		foreach(QString str, dfns) {
-		fi_dfn->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_dfn));
-		}
-		}
-		if (!typs.isEmpty()) {
-		CFormItem *fi_typ = new CFormItem(_rootElm, QList<QVariant>() << "typ", fi_dep);
-		fi_dep->appendChild(fi_typ);
-		foreach(QString str, typs) {
-		fi_typ->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_typ));
-		}
-		}
-		if (!_dependencies.isEmpty()) {
-		CFormItem *fi_other = new CFormItem(_rootElm, QList<QVariant>() << "other", fi_dep);
-		fi_dep->appendChild(fi_other);
-		foreach(QStringList list, _dependencies) {
-		foreach(QString str, list) {
-		fi_other->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_other));
+		if (!dfns.isEmpty())
+		{
+			CFormItem *fi_dfn = new CFormItem(_rootElm, QList<QVariant>() << "dfn", fi_dep);
+			fi_dep->appendChild(fi_dfn);
+			foreach(QString str, dfns)
+			{
+				fi_dfn->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_dfn));
+			}
 		}
+		if (!typs.isEmpty())
+		{
+			CFormItem *fi_typ = new CFormItem(_rootElm, QList<QVariant>() << "typ", fi_dep);
+			fi_dep->appendChild(fi_typ);
+			foreach(QString str, typs)
+			{
+				fi_typ->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_typ));
+			}
 		}
+		if (!_dependencies.isEmpty())
+		{
+			CFormItem *fi_other = new CFormItem(_rootElm, QList<QVariant>() << "other", fi_dep);
+			fi_dep->appendChild(fi_other);
+			foreach(QStringList list, _dependencies)
+			{
+				foreach(QString str, list)
+				{
+					fi_other->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_other));
+				}
+			}
 		}*/
 	}
 
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
index ef40f4dbc..8dbc2c18b 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
@@ -338,7 +338,8 @@ namespace NLQT
 		_aboutQtAction->setStatusTip(tr("Show the Qt library's About box"));
 		connect(_aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
 
-		for (int i = 0; i < MaxRecentFiles; ++i) {
+		for (int i = 0; i < MaxRecentFiles; ++i)
+		{
 			recentFileActs[i] = new QAction(this);
 			recentFileActs[i]->setVisible(false);
 			connect(recentFileActs[i], SIGNAL(triggered()),
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp
index 499b06d94..f0a1fe351 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp
@@ -333,7 +333,8 @@ namespace NLQT
 		return -1;
 	}
 
-	void CGeorgesNewDialog::validateParentCombo() {
+	void CGeorgesNewDialog::validateParentCombo()
+	{
 		// TODO: clear if no valid text
 		//if (!_filelist.contains(_ui.parentLineEdit->text()))
 		//	_ui.parentLineEdit->clear();
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
index a47395cf6..e3c3d24e2 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
@@ -77,7 +77,8 @@ namespace NLQT
 		}
 	}
 
-	void CObjectViewerDialog::topLevelChanged ( bool topLevel ) {
+	void CObjectViewerDialog::topLevelChanged ( bool topLevel )
+	{
 		//nldebug("topLevel:%d",topLevel);
 		//_georges->init();
 	}
@@ -100,7 +101,8 @@ namespace NLQT
 	{
 		//nldebug("%d %d",_nlw->width(), _nlw->height());
 		QDockWidget::resizeEvent(resizeEvent);
-		if (Modules::objViewInt()) {
+		if (Modules::objViewInt())
+		{
 			if (Modules::objViewInt()->getDriver())
 				Modules::objViewInt()->setSizeViewport(resizeEvent->size().width(), resizeEvent->size().height());
 		}
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp
index 07b338009..7c94e4fb0 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp
@@ -39,8 +39,8 @@ namespace NLQT
 		;
 	}
 
-	CQtDisplayer::~CQtDisplayer() {
-		;
+	CQtDisplayer::~CQtDisplayer()
+	{
 	}
 
 	void CQtDisplayer::setParam (QPlainTextEdit *dlgDebug, bool eraseLastLog)
@@ -59,7 +59,8 @@ namespace NLQT
 
 		QTextCharFormat format;
 
-		if (args.Date != 0 && !_Raw) {
+		if (args.Date != 0 && !_Raw)
+		{
 			str += dateToHumanString(args.Date);
 			needSpace = true;
 		}
@@ -76,27 +77,31 @@ namespace NLQT
 		}
 
 		// Write thread identifier
-		/*if ( args.ThreadId != 0 && !_Raw) {
-		if (needSpace) { str += " "; needSpace = false; }
-		str += NLMISC::toString(args.ThreadId);
-		needSpace = true;
+		/*if ( args.ThreadId != 0 && !_Raw)
+		{
+			if (needSpace) { str += " "; needSpace = false; }
+			str += NLMISC::toString(args.ThreadId);
+			needSpace = true;
 		}*/
-		/*if (!args.ProcessName.empty() && !_Raw) {
-		if (needSpace) { str += " "; needSpace = false; }
-		str += args.ProcessName;
-		needSpace = true;
+		/*if (!args.ProcessName.empty() && !_Raw)
+		{
+			if (needSpace) { str += " "; needSpace = false; }
+			str += args.ProcessName;
+			needSpace = true;
 		}*/
 
-		//if (args.FileName != NULL && !_Raw) {
+		//if (args.FileName != NULL && !_Raw)
+		//{
 		//	if (needSpace) { str += " "; needSpace = false; }
 		//	str += NLMISC::CFile::getFilename(args.FileName);
 		//	needSpace = true;
 		//}
 
-		/*if (args.Line != -1 && !_Raw) {
-		if (needSpace) { str += " "; needSpace = false; }
-		str += NLMISC::toString(args.Line);
-		needSpace = true;
+		/*if (args.Line != -1 && !_Raw)
+		{
+			if (needSpace) { str += " "; needSpace = false; }
+			str += NLMISC::toString(args.Line);
+			needSpace = true;
 		}*/
 
 		if (args.FuncName != NULL && !_Raw) 
diff --git a/code/ryzom/tools/leveldesign/mp_generator/utils.h b/code/ryzom/tools/leveldesign/mp_generator/utils.h
index 63148f61f..01bb25fe7 100644
--- a/code/ryzom/tools/leveldesign/mp_generator/utils.h
+++ b/code/ryzom/tools/leveldesign/mp_generator/utils.h
@@ -55,17 +55,17 @@ public:
 		 * Display the item as a row of a HTML table.
 		 * If (key!=previousKey) and (name==previousName), the row will not be displayed entirely to save space
 		 *
-		 * \param keyColumn If not ~0, column used for sorting => this column displays only the field matching the key
+		 * \param keyColumn If not std::numeric_limits<uint32>::max(), column used for sorting => this column displays only the field matching the key
 		 * \param key The key used for sorting (see keyColumn)
 		 * \param previousKey Previous key
-		 * \param nameColumn If not ~0, column used for the unique name (column must have exaclty one element)
+		 * \param nameColumn If not std::numeric_limits<uint32>::max(), column used for the unique name (column must have exaclty one element)
 		 * \param previousName Previous name
 		 */
-		std::string		toHTMLRow( uint32 keyColumn=~0, const string& key=string(), const string& previousKey=string(),
-								   uint32 nameColumn=~0, const string& previousName=string() ) const
+		std::string		toHTMLRow( uint32 keyColumn=std::numeric_limits<uint32>::max(), const string& key=string(), const string& previousKey=string(),
+								   uint32 nameColumn=std::numeric_limits<uint32>::max(), const string& previousName=string() ) const
 		{
 			std::string s = "<tr>";
-			bool lightMode = (nameColumn == ~0) ? false : ((key != previousKey) && (Fields[nameColumn][0] == previousName));
+			bool lightMode = (nameColumn == std::numeric_limits<uint32>::max()) ? false : ((key != previousKey) && (Fields[nameColumn][0] == previousName));
 			for ( uint32 c=0; c!=NC; ++c )
 			{
 				s += "<td>";
@@ -86,11 +86,11 @@ public:
 
 
 		///
-		std::string		toCSVLine( char columnSeparator=',', string internalSeparator=" - ", uint32 keyColumn=~0, const string& key=string(), const string& previousKey=string(),
-								   uint32 nameColumn=~0, const string& previousName=string()  ) const
+		std::string		toCSVLine( char columnSeparator=',', string internalSeparator=" - ", uint32 keyColumn=std::numeric_limits<uint32>::max(), const string& key=string(), const string& previousKey=string(),
+								   uint32 nameColumn=std::numeric_limits<uint32>::max(), const string& previousName=string()  ) const
 		{
 			std::string s;
-			bool lightMode = (nameColumn == ~0) ? false : ((key != previousKey) && (Fields[nameColumn][0] == previousName));
+			bool lightMode = (nameColumn == std::numeric_limits<uint32>::max()) ? false : ((key != previousKey) && (Fields[nameColumn][0] == previousName));
 			for ( uint32 c=0; c!=NC; ++c )
 			{
 				if ( c == keyColumn )
diff --git a/code/ryzom/tools/leveldesign/prim_export/main.cpp b/code/ryzom/tools/leveldesign/prim_export/main.cpp
index 86aeafa62..f9c33d953 100644
--- a/code/ryzom/tools/leveldesign/prim_export/main.cpp
+++ b/code/ryzom/tools/leveldesign/prim_export/main.cpp
@@ -629,7 +629,7 @@ void addPointPrimitive (CLandscape &landscape, const char *primFilename, uint32
 							string scaleText;
 							float scale = 1;
 							if (point->getPropertyByName ("scale", scaleText))
-								scale = (float) atof (scaleText.c_str ());
+								NLMISC::fromString(scaleText, scale);
 
 							// Get zone coordinates
 							sint x = (sint)floor (position.x / options.CellSize);
@@ -654,7 +654,7 @@ void addPointPrimitive (CLandscape &landscape, const char *primFilename, uint32
 
 								// Get height
 								if (!snap && point->getPropertyByName ("height", text))
-									position.z = (float)atof(text.c_str());
+									NLMISC::fromString(text, position.z);
 
 								// *** Add the instance
 								
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
index e99b0eceb..279578293 100644
--- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
@@ -2595,8 +2595,8 @@ void CExport::transformAdditionnalIG (const std::string &name, const NLMISC::CMa
 				inStream.close();
 				if (_ExportCB != NULL)
 				{
-						_ExportCB->dispWarning("Error while reading " + igName);
-						_ExportCB->dispWarning(e.what());
+					_ExportCB->dispWarning("Error while reading " + igName);
+					_ExportCB->dispWarning(e.what());
 				}
 			}
 		}
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp
index dd2a17d82..09763d27c 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp
@@ -309,6 +309,7 @@ void CDisplay::init (CMainFrame *pMF)
 			_TextContext->setFontGenerator(NLMISC::CPath::getWindowsDirectory() + "Fonts\\arial.ttf");
 			_TextContext->setKeep800x600Ratio(true);
 			_TextContext->setShaded(true);
+			_TextContext->setShadeOutline(false);
 			_TextContext->setShadeColor(NLMISC::CRGBA::Black);
 		}
 		catch(...)
diff --git a/code/ryzom/tools/make_anim_melee_impact/main.cpp b/code/ryzom/tools/make_anim_melee_impact/main.cpp
index 10fdeb0ed..3f67edd5e 100644
--- a/code/ryzom/tools/make_anim_melee_impact/main.cpp
+++ b/code/ryzom/tools/make_anim_melee_impact/main.cpp
@@ -79,7 +79,7 @@ void CAnimCombatState::build(const string &line)
 {
 	StateCode= line.substr(4, 2);
 	string time= line.substr(10, 5);
-	MeanAnimTime= (float)atof(time.c_str());
+	NLMISC::fromString(time, MeanAnimTime);
 }
 
 
diff --git a/code/ryzom/tools/patch_gen/patch_gen_common.cpp b/code/ryzom/tools/patch_gen/patch_gen_common.cpp
index 3d28a2439..7f63177ac 100644
--- a/code/ryzom/tools/patch_gen/patch_gen_common.cpp
+++ b/code/ryzom/tools/patch_gen/patch_gen_common.cpp
@@ -149,7 +149,7 @@ CPackageDescription::CPackageDescription()
 
 void CPackageDescription::clear()
 {
-	_NextVersionNumber= ~0u;
+	_NextVersionNumber= std::numeric_limits<uint32>::max();
 	_VersionNumberReserved = false;
 	_Categories.clear();
 	_IndexFileName.clear();
diff --git a/code/ryzom/tools/pd_parser/parser.cpp b/code/ryzom/tools/pd_parser/parser.cpp
index 733bad4df..4b5e9f5c1 100644
--- a/code/ryzom/tools/pd_parser/parser.cpp
+++ b/code/ryzom/tools/pd_parser/parser.cpp
@@ -1189,7 +1189,7 @@ bool	CEnumSimpleValueNode::prolog()
 	uint	i;
 	for (i=0; i<Names.size(); ++i)
 	{
-		CurrentEnumNode->Values.push_back(make_pair<string, uint32>(Names[i], CurrentValue));
+		CurrentEnumNode->Values.push_back(std::pair<string, uint32>(Names[i], CurrentValue));
 	}
 	if (parent != NULL)
 		++(parent->CurrentValue);
@@ -1214,7 +1214,7 @@ bool	CEnumRangeNode::prolog()
 		CurrentValue = 0;
 	}
 
-	CurrentEnumNode->Values.push_back(make_pair<string, uint32>(Name, CurrentValue));
+	CurrentEnumNode->Values.push_back(std::pair<string, uint32>(Name, CurrentValue));
 
 	return true;
 }
@@ -1238,7 +1238,7 @@ bool	CEnumRangeNode::epilog()
 
 	if (!EndRange.empty())
 	{
-		CurrentEnumNode->Values.push_back(make_pair<string, uint32>(EndRange, CurrentValue));
+		CurrentEnumNode->Values.push_back(std::pair<string, uint32>(EndRange, CurrentValue));
 	}
 
 	return true;
@@ -4709,7 +4709,7 @@ void	CLogMsgNode::generateContent()
 		CClassNode	*cnd;
 		if ( (tnd = getTypeNode(type, false)) )
 		{
-			pair<map<string, CParseNode*>::iterator, bool>	res = params.insert(make_pair<string, CParseNode*>(name, tnd));
+			pair<map<string, CParseNode*>::iterator, bool>	res = params.insert(std::pair<string, CParseNode*>(name, tnd));
 			if (!res.second)
 				error("log parameter '"+name+"' already defined");
 
@@ -4723,7 +4723,7 @@ void	CLogMsgNode::generateContent()
 		}
 		else if ( (cnd = getClassNode(type, false)) )
 		{
-			pair<map<string, CParseNode*>::iterator, bool>	res = params.insert(make_pair<string, CParseNode*>(name, cnd));
+			pair<map<string, CParseNode*>::iterator, bool>	res = params.insert(std::pair<string, CParseNode*>(name, cnd));
 			if (!res.second)
 				error("log parameter '"+name+"' already defined");
 
@@ -4739,7 +4739,7 @@ void	CLogMsgNode::generateContent()
 		{
 			CExtLogTypeNode*	extnd = new CExtLogTypeNode();
 			extnd->ExtLogType = "string";
-			pair<map<string, CParseNode*>::iterator, bool>	res = params.insert(make_pair<string, CParseNode*>(name, extnd));
+			pair<map<string, CParseNode*>::iterator, bool>	res = params.insert(std::pair<string, CParseNode*>(name, extnd));
 			if (!res.second)
 				error("log parameter '"+name+"' already defined");
 
diff --git a/code/ryzom/tools/server/CMakeLists.txt b/code/ryzom/tools/server/CMakeLists.txt
index 982c47718..1f215ae94 100644
--- a/code/ryzom/tools/server/CMakeLists.txt
+++ b/code/ryzom/tools/server/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 IF(WITH_LIGO)
   ADD_SUBDIRECTORY(ai_build_wmap)
 ENDIF(WITH_LIGO)
diff --git a/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp b/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp
index a15f8c6d3..f194f996e 100644
--- a/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp
+++ b/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp
@@ -237,8 +237,8 @@ CProximityZone::CProximityZone(uint32 scanWidth,uint32 scanHeight,sint32 xOffset
 
 	_MaxOffset	= scanWidth * scanHeight -1;
 
-	_XMin = ~0u;
-	_YMin = ~0u;
+	_XMin = std::numeric_limits<uint32>::max();
+	_YMin = std::numeric_limits<uint32>::max();
 	_XMax = 0;
 	_YMax = 0;
 }
@@ -386,7 +386,7 @@ void CProximityMapBuffer::load(const std::string& name)
 				}
 			}
 			// setup the next pixel in the output buffers...
-			_Buffer[y*_ScanWidth+x]= (isAccessible? 0: (TBufferEntry)~0u);
+			_Buffer[y*_ScanWidth+x]= (isAccessible? 0: (TBufferEntry)std::numeric_limits<uint16>::max());
 		}
 	}
 }
@@ -471,7 +471,7 @@ void CProximityMapBuffer::_prepareBufferForZoneProximityMap(const CProximityZone
 	uint32 zoneWidth= zone.getZoneWidth();
 	uint32 zoneHeight= zone.getZoneHeight();
 	zoneBuffer.clear();
-	zoneBuffer.resize(zoneWidth*zoneHeight,(TBufferEntry)~0u);
+	zoneBuffer.resize(zoneWidth*zoneHeight,(TBufferEntry)std::numeric_limits<uint16>::max());
 
 	// setup the buffer's accessible points and prime vects[0] with the set of accessible points in the zone buffer
 	for (uint32 i=0;i<zone.getOffsets().size();++i)
diff --git a/code/ryzom/tools/server/brick_param_extractor/brick_param_extractor.cpp b/code/ryzom/tools/server/brick_param_extractor/brick_param_extractor.cpp
index 1a4257a99..170aa0c90 100644
--- a/code/ryzom/tools/server/brick_param_extractor/brick_param_extractor.cpp
+++ b/code/ryzom/tools/server/brick_param_extractor/brick_param_extractor.cpp
@@ -508,7 +508,7 @@ void COutputFile::generateOutput() const
 	}
 
 	outbuff+="#endif\n\n";
-	
+
 	// read in the previous version of the output file
 	char *inbuff=NULL;
 	FILE *inf=fopen(_FileName.c_str(),"rb");
diff --git a/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp b/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
index 9bd4f7f3c..f03489196 100644
--- a/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
+++ b/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
@@ -211,7 +211,7 @@ int main(int argc, char* argv[])
 			catch(const EStream &)
 			{
 				mustRebuild = true; // damaged file or bad version ? -> force rebuild
-				delete packedIsland; // remove whatever was serialized
+				// delete packedIsland; // remove whatever was serialized // NOPE. smart pointer
 				packedIsland = new CPackedWorldHolder;				
 			}
 		}
diff --git a/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp b/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp
index 810540cf8..779e4102d 100644
--- a/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp
+++ b/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp
@@ -443,7 +443,7 @@ void CPackedWorldBuilder::fly(std::vector<CIslandInfo>  &islands, float camSpeed
 	texturedMaterial.setDoubleSided(true);
 	texturedMaterial.setZFunc(CMaterial::lessequal);
 	//
-	uint currWorldIndex = ~0;
+	uint currWorldIndex = std::numeric_limits<uint>::max();
 	bool newPosWanted = true;
 	//
 	std::vector<TPackedZoneBaseSPtr> zones;	
diff --git a/code/ryzom/tools/translation_tools/main.cpp b/code/ryzom/tools/translation_tools/main.cpp
index 9eba8c8da..9997342fe 100644
--- a/code/ryzom/tools/translation_tools/main.cpp
+++ b/code/ryzom/tools/translation_tools/main.cpp
@@ -96,13 +96,14 @@ const std::string	historyDir("history/");
 string				diffVersion;
 
 #ifndef NL_OS_WINDOWS
-char* itoa(int val, char *buffer, int base){ 
-	static char buf[32] = {0}; 
-	int i = 30; 
-	for(; val && i ; --i, val /= base) 
-		buf[i] = "0123456789abcdef"[val % base]; 
-	return &buf[i+1]; 
-} 
+char* itoa(int val, char *buffer, int base)
+{
+	static char buf[32] = {0};
+	int i = 30;
+	for(; val && i ; --i, val /= base)
+		buf[i] = "0123456789abcdef"[val % base];
+	return &buf[i+1];
+}
 #endif // NL_OS_WINDOWS
 
 #ifdef NL_DEBUG
diff --git a/code/snowballs2/client/src/snowballs_client.cpp b/code/snowballs2/client/src/snowballs_client.cpp
index 68cdc47fa..059960922 100644
--- a/code/snowballs2/client/src/snowballs_client.cpp
+++ b/code/snowballs2/client/src/snowballs_client.cpp
@@ -327,6 +327,7 @@ void initCore()
 				ConfigFile->getVar("ScreenFull").asInt()==0));
 		TextContext = Driver->createTextContext(CPath::lookup(ConfigFile->getVar("FontName").asString()));
 		TextContext->setShaded(true);
+		TextContext->setShadeOutline(false);
 		TextContext->setKeep800x600Ratio(false);
 		// You can't call displayLoadingState() before init the loading state system
 		displayLoadingState("Initialize Loading");
@@ -1263,6 +1264,7 @@ sint main(int argc, char **argv)
 	{
 		// use log.log if NEL_LOG_IN_FILE and SBCLIENT_USE_LOG_LOG defined as 1
 		createDebug(NULL, SBCLIENT_USE_LOG_LOG, false);
+		INelContext::getInstance().setWindowedApplication(true);
 
 	#if SBCLIENT_USE_LOG
 		// create snowballs_client.log
diff --git a/code/studio/CMakeLists.txt b/code/studio/CMakeLists.txt
index bf9ee062c..c10f2ea59 100644
--- a/code/studio/CMakeLists.txt
+++ b/code/studio/CMakeLists.txt
@@ -10,15 +10,18 @@ IF(WIN32)
   SET(OVQT_PLUGIN_SPECS_DIR "plugins")
   SET(OVQT_PLUGIN_DIR "plugins")
   SET(OVQT_DATA_DIR ".")
+  SET(OVQT_IMP_DATA_DIR "${OVQT_DATA_DIR}")
 ELSEIF(APPLE)
   # TODO: under Mac OS X, don't install but copy files in application package
   SET(OVQT_PLUGIN_SPECS_DIR "plugins")
   SET(OVQT_PLUGIN_DIR "plugins")
   SET(OVQT_DATA_DIR ".")
+  SET(OVQT_IMP_DATA_DIR "${OVQT_DATA_DIR}")
 ELSE(WIN32)
   SET(OVQT_PLUGIN_SPECS_DIR ${NL_SHARE_PREFIX}/studio/plugins)
   SET(OVQT_PLUGIN_DIR ${NL_LIB_PREFIX}/studio)
   SET(OVQT_DATA_DIR ${NL_SHARE_PREFIX}/studio/data)
+  SET(OVQT_IMP_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${OVQT_DATA_DIR}")
 
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ovqt_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/ovqt_config.h)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/code/studio/src/CMakeLists.txt b/code/studio/src/CMakeLists.txt
index d6b8e6710..683c70098 100644
--- a/code/studio/src/CMakeLists.txt
+++ b/code/studio/src/CMakeLists.txt
@@ -13,7 +13,7 @@ FILE(GLOB STUDIO_SRC extension_system/*.h
 
 SET(STUDIO_HDR   extension_system/iplugin_manager.h 
 						extension_system/plugin_manager.h
-						settings_dialog.h
+						startup_settings_dlg.h
 						splash_screen.h
 						pm_watcher.h )
 
@@ -24,7 +24,7 @@ SET(STUDIO_TS    translations/object_viewer_qt_en.ts
 						translations/object_viewer_qt_de.ts
 						translations/object_viewer_qt_ru.ts)
 						
-SET(STUDIO_PLUGIN_UIS settings_dialog.ui )
+SET(STUDIO_PLUGIN_UIS startup_settings_dlg.ui )
 
 SET(QT_USE_QTGUI TRUE)
 SET(QT_USE_QTOPENGL TRUE)
diff --git a/code/studio/src/main.cpp b/code/studio/src/main.cpp
index 2a3bf7740..2a32ab309 100644
--- a/code/studio/src/main.cpp
+++ b/code/studio/src/main.cpp
@@ -41,7 +41,7 @@
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QInputDialog>
 
-#include "settings_dialog.h"
+#include "startup_settings_dlg.h"
 #include "splash_screen.h"
 #include "pm_watcher.h"
 
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
 	{
 		settings->setValue( "FirstRun", false );
 		
-		SettingsDialog sd;
+		StartupSettingsDlg sd;
 		sd.setSettings( settings );
 		sd.load();
 		sd.exec();
diff --git a/code/studio/src/plugins/core/CMakeLists.txt b/code/studio/src/plugins/core/CMakeLists.txt
index 3869d3826..d021c7c02 100644
--- a/code/studio/src/plugins/core/CMakeLists.txt
+++ b/code/studio/src/plugins/core/CMakeLists.txt
@@ -38,6 +38,10 @@ SET(OVQT_CORE_PLUGIN_UIS	settings_dialog.ui
 
 SET(OVQT_CORE_PLUGIN_RCS core.qrc)
 
+IF(NOT WIN32)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/core_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/core_config.h)
+ENDIF(NOT WIN32)
+
 SET(QT_USE_QTGUI TRUE)
 SET(QT_USE_QTOPENGL TRUE)
 
diff --git a/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp b/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
index 376c97170..7ac7c468e 100644
--- a/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
+++ b/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
@@ -14,7 +14,6 @@
 // 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/>.
 
-
 #include "nel3d_widget.h"
 #include "nel/3d/u_driver.h"
 #include "nel/3d/text_context.h"
@@ -29,7 +28,7 @@
 #include <QResizeEvent>
 
 Nel3DWidget::Nel3DWidget( QWidget *parent ) :
-QWidget( parent )
+NEL3DWIDGET( parent )
 {
 	driver = NULL;
 	textContext = NULL;
diff --git a/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.h b/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.h
index 059e1b738..254001b25 100644
--- a/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.h
+++ b/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.h
@@ -18,10 +18,22 @@
 #ifndef NEL3D_WIDGET_H
 #define NEL3D_WIDGET_H
 
-#include <QWidget>
 #include "nel/misc/types_nl.h"
 #include <string>
 
+#ifdef NEL3DWIDGET
+#undef NEL3DWIDGET
+#endif
+
+#ifdef NL_OS_WINDOWS
+#include <QWidget>
+#define NEL3DWIDGET QWidget
+#else
+#include <QGLWidget>
+#define NEL3DWIDGET QGLWidget
+#endif
+
+
 #include "../core_global.h"
 
 namespace NL3D
@@ -31,7 +43,7 @@ namespace NL3D
 }
 
 /// Nel 3D interface to Qt
-class CORE_EXPORT Nel3DWidget : public QWidget
+class CORE_EXPORT Nel3DWidget : public NEL3DWIDGET
 {
 	Q_OBJECT
 public:
diff --git a/code/studio/src/plugins/core/context_manager.cpp b/code/studio/src/plugins/core/context_manager.cpp
index 02513b050..e3b712e81 100644
--- a/code/studio/src/plugins/core/context_manager.cpp
+++ b/code/studio/src/plugins/core/context_manager.cpp
@@ -143,6 +143,8 @@ void ContextManager::currentTabChanged(int index)
 	if (index >= 0)
 	{
 		IContext *context = d->m_contexts.at(index);
+        context->onActivated();
+
 		Q_EMIT currentContextChanged(context);
 	}
 }
@@ -158,4 +160,4 @@ int ContextManager::indexOf(const QString &id) const
 	return -1;
 }
 
-} /* namespace Core */
\ No newline at end of file
+} /* namespace Core */
diff --git a/code/studio/src/plugins/core/core_config.h.cmake b/code/studio/src/plugins/core/core_config.h.cmake
new file mode 100644
index 000000000..1aab54c12
--- /dev/null
+++ b/code/studio/src/plugins/core/core_config.h.cmake
@@ -0,0 +1,7 @@
+#ifndef CORE_CONFIG_H
+#define CORE_CONFIG_H
+
+#define STUDIO_DATA_DIR  "${OVQT_IMP_DATA_DIR}"
+
+#endif
+
diff --git a/code/studio/src/plugins/core/icontext.h b/code/studio/src/plugins/core/icontext.h
index 2b98137ed..5ba37d826 100644
--- a/code/studio/src/plugins/core/icontext.h
+++ b/code/studio/src/plugins/core/icontext.h
@@ -69,6 +69,8 @@ public:
 	virtual void newDocument(){}
 
 	virtual void close(){}
+
+    virtual void onActivated(){}
 };
 
 } // namespace Core
diff --git a/code/studio/src/plugins/core/main_window.cpp b/code/studio/src/plugins/core/main_window.cpp
index b8cdb10f4..df1b87937 100644
--- a/code/studio/src/plugins/core/main_window.cpp
+++ b/code/studio/src/plugins/core/main_window.cpp
@@ -113,8 +113,14 @@ void MainWindow::extensionsInitialized()
 	readSettings();
 	connect(m_contextManager, SIGNAL(currentContextChanged(Core::IContext *)),
 			this, SLOT(updateContext(Core::IContext *)));
-	if (m_contextManager->currentContext() != NULL)
-		updateContext(m_contextManager->currentContext());
+
+    Core::IContext *context = m_contextManager->currentContext();
+    if (context != NULL)
+    {
+        updateContext(context);
+        context->onActivated();
+    }
+
 	show();
 }
 
diff --git a/code/studio/src/plugins/core/search_paths_settings_page.cpp b/code/studio/src/plugins/core/search_paths_settings_page.cpp
index b3b4e907f..e9b99836c 100644
--- a/code/studio/src/plugins/core/search_paths_settings_page.cpp
+++ b/code/studio/src/plugins/core/search_paths_settings_page.cpp
@@ -28,6 +28,10 @@
 #include <QWidget>
 #include <QFileDialog>
 
+#if !defined NL_OS_WINDOWS
+#include "core_config.h"
+#endif
+
 namespace Core
 {
 
@@ -118,6 +122,10 @@ void SearchPathsSettingsPage::applySearchPaths()
 	for (int i = 1; i < remapExt.size(); i += 2)
 		NLMISC::CPath::remapExtension(remapExt.at(i - 1).toUtf8().constData(), remapExt.at(i).toUtf8().constData(), true);
 
+#if !defined NL_OS_WINDOWS
+    NLMISC::CPath::addSearchPath(std::string(STUDIO_DATA_DIR), false, false);
+#endif
+
 	Q_FOREACH(QString path, paths)
 	{
 		NLMISC::CPath::addSearchPath(path.toUtf8().constData(), m_recurse, false);
@@ -216,4 +224,4 @@ void SearchPathsSettingsPage::checkEnabledButton()
 	m_ui.downToolButton->setEnabled(bEnabled);
 }
 
-} /* namespace Core */
\ No newline at end of file
+} /* namespace Core */
diff --git a/code/studio/src/plugins/core/settings_dialog.cpp b/code/studio/src/plugins/core/settings_dialog.cpp
index 74e81e3c8..2a5b7d2ed 100644
--- a/code/studio/src/plugins/core/settings_dialog.cpp
+++ b/code/studio/src/plugins/core/settings_dialog.cpp
@@ -145,11 +145,17 @@ void SettingsDialog::pageSelected()
 void SettingsDialog::accept()
 {
 	m_applied = true;
+
+	setCursor( Qt::WaitCursor );
+
 	Q_FOREACH(IOptionsPage *page, m_pages)
 	{
 		page->apply();
 		page->finish();
 	}
+
+	setCursor( Qt::ArrowCursor );
+
 	done(QDialog::Accepted);
 }
 
@@ -162,8 +168,13 @@ void SettingsDialog::reject()
 
 void SettingsDialog::apply()
 {
+	setCursor( Qt::WaitCursor );
+
 	Q_FOREACH(IOptionsPage *page, m_pages)
 	page->apply();
+
+	setCursor( Qt::ArrowCursor );
+
 	m_applied = true;
 }
 
diff --git a/code/studio/src/plugins/core/settings_dialog.h b/code/studio/src/plugins/core/settings_dialog.h
index d0059c4b3..9aa3e9e69 100644
--- a/code/studio/src/plugins/core/settings_dialog.h
+++ b/code/studio/src/plugins/core/settings_dialog.h
@@ -19,7 +19,7 @@
 #ifndef SETTINGS_DIALOG_H
 #define SETTINGS_DIALOG_H
 
-#include "../core/ui_settings_dialog.h"
+#include "ui_settings_dialog.h"
 
 // Qt includes
 #include <QList>
diff --git a/code/studio/src/plugins/gui_editor/CMakeLists.txt b/code/studio/src/plugins/gui_editor/CMakeLists.txt
index 2b46e2cdc..f2f5bfcb1 100644
--- a/code/studio/src/plugins/gui_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/gui_editor/CMakeLists.txt
@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}
   ${QT_INCLUDES}
   ${LUA_INCLUDE_DIR})
 
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/gui_editor_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/gui_editor_config.h)
+
 FILE(GLOB SRC *.cpp *.h)
 
 SET(OVQT_EXT_SYS_SRC	${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.h
@@ -36,6 +38,7 @@ SET(OVQT_PLUGIN_GUI_EDITOR_HDR
 	texture_property_manager.h
 	expression_editor.h
 	expr_link_dlg.h
+	new_gui_dlg.h
 	)
 	
 SET(OVQT_PLUGIN_GUI_EDITOR_UIS
@@ -55,6 +58,7 @@ SET(OVQT_PLUGIN_GUI_EDITOR_UIS
 	texture_chooser.ui
 	expression_editor.ui
 	expr_link_dlg.ui
+	new_gui_dlg.ui
 	)
 
 SET(QT_USE_QTGUI TRUE)
@@ -110,3 +114,11 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_gui_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+
+FILE(GLOB widgets "${CMAKE_CURRENT_SOURCE_DIR}/widgets/*.xml")
+FILE(GLOB expressions "${CMAKE_CURRENT_SOURCE_DIR}/expressions/*.xml")
+
+INSTALL(FILES ${widgets} DESTINATION "${OVQT_DATA_DIR}/widgets" COMPONENT tools3d)
+INSTALL(FILES ${expressions} DESTINATION "${OVQT_DATA_DIR}/expressions" COMPONENT tools3d)
+
+INSTALL(DIRECTORY fonts/ DESTINATION ${OVQT_DATA_DIR} COMPONENT data)
diff --git a/code/studio/src/plugins/gui_editor/editor_message_processor.cpp b/code/studio/src/plugins/gui_editor/editor_message_processor.cpp
index 691dbdead..ef99c87fc 100644
--- a/code/studio/src/plugins/gui_editor/editor_message_processor.cpp
+++ b/code/studio/src/plugins/gui_editor/editor_message_processor.cpp
@@ -25,35 +25,40 @@ namespace GUIEditor
 {
 	void CEditorMessageProcessor::onDelete()
 	{
-		std::string selection = CWidgetManager::getInstance()->getCurrentEditorSelection();
+		std::vector< std::string > selection;
+
+		CWidgetManager::getInstance()->getEditorSelection( selection );
 		if( selection.empty() )
 			return;
 
 		QMessageBox::StandardButton r =
 			QMessageBox::question( NULL, 
 									tr( "Deleting widget" ),
-									tr( "Are you sure you want to delete %1?" ).arg( selection.c_str() ),
+									tr( "Are you sure you want to delete these?" ),
 									QMessageBox::Yes | QMessageBox::No );
 		if( r != QMessageBox::Yes )
 			return;
 
-		CInterfaceElement *e =
-			CWidgetManager::getInstance()->getElementFromId( selection );
-		if( e == NULL )
-			return;
+		for( int i = 0; i < selection.size(); i++ )
+		{
+			CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( selection[ i ] );
+			if( e == NULL )
+				continue;
 
-		CInterfaceElement *p = e->getParent();
-		if( p == NULL )
-			return;
-		
-		CInterfaceGroup *g = dynamic_cast< CInterfaceGroup* >( p );
-		if( g == NULL )
-			return;
+			CInterfaceElement *p = e->getParent();
+			if( p == NULL )
+				continue;
+
+			CInterfaceGroup *g = dynamic_cast< CInterfaceGroup* >( p );
+			if( g == NULL )
+				continue;
+
+			g->delElement( e );
 
-		if( g->delElement( e ) )
-		{
-			CWidgetManager::getInstance()->setCurrentEditorSelection( "" );
 		}
+
+	
+		CWidgetManager::getInstance()->clearEditorSelection();
 	}
 
 	void CEditorMessageProcessor::onAdd( const QString &parentGroup, const QString &widgetType, const QString &name )
@@ -130,5 +135,32 @@ namespace GUIEditor
 		e->setActive( false );
 		e->setActive( true );
 	}
+
+	void CEditorMessageProcessor::onSetGroupSelection( bool b )
+	{
+		CWidgetManager::getInstance()->setGroupSelection( b );
+	}
+
+	void CEditorMessageProcessor::onGroup()
+	{
+		CWidgetManager::getInstance()->groupSelection();
+	}
+
+	void CEditorMessageProcessor::onUngroup()
+	{
+		bool ok = CWidgetManager::getInstance()->unGroupSelection();
+
+		if( !ok )
+		{
+			QMessageBox::critical( NULL,
+									tr( "Ungrouping widgets" ),
+									tr( "Couldn't ungroup widgets." ) );
+		}
+	}
+
+	void CEditorMessageProcessor::onSetMultiSelection( bool b )
+	{
+		CWidgetManager::getInstance()->setMultiSelection( b );
+	}
 }
 
diff --git a/code/studio/src/plugins/gui_editor/editor_message_processor.h b/code/studio/src/plugins/gui_editor/editor_message_processor.h
index 5c19a03c2..ee55fcda7 100644
--- a/code/studio/src/plugins/gui_editor/editor_message_processor.h
+++ b/code/studio/src/plugins/gui_editor/editor_message_processor.h
@@ -38,6 +38,10 @@ namespace GUIEditor
 	public Q_SLOTS:
 		void onDelete();
 		void onAdd( const QString &parentGroup, const QString &widgetType, const QString &name );
+		void onSetGroupSelection( bool b );
+		void onGroup();
+		void onUngroup();
+		void onSetMultiSelection( bool b );
 
 	private:
 		CWidgetInfoTree *tree;
diff --git a/code/studio/src/plugins/gui_editor/editor_selection_watcher.cpp b/code/studio/src/plugins/gui_editor/editor_selection_watcher.cpp
index ee3a079ad..7647c8abb 100644
--- a/code/studio/src/plugins/gui_editor/editor_selection_watcher.cpp
+++ b/code/studio/src/plugins/gui_editor/editor_selection_watcher.cpp
@@ -18,9 +18,9 @@
 
 namespace GUIEditor
 {
-	void CEditorSelectionWatcher::selectionChanged( std::string &newSelection )
+	void CEditorSelectionWatcher::selectionChanged()
 	{
-		Q_EMIT sgnSelectionChanged( newSelection );
+		Q_EMIT sgnSelectionChanged();
 	}
 }
 
diff --git a/code/studio/src/plugins/gui_editor/editor_selection_watcher.h b/code/studio/src/plugins/gui_editor/editor_selection_watcher.h
index 61218c0cd..2eab68310 100644
--- a/code/studio/src/plugins/gui_editor/editor_selection_watcher.h
+++ b/code/studio/src/plugins/gui_editor/editor_selection_watcher.h
@@ -27,10 +27,10 @@ namespace GUIEditor
 	public:
 		CEditorSelectionWatcher() : QObject( NULL ){}
 
-		void selectionChanged( std::string &newSelection );
+		void selectionChanged();
 
 	Q_SIGNALS:
-		void sgnSelectionChanged( std::string &id );
+		void sgnSelectionChanged();
 	};
 }
 
diff --git a/code/studio/src/plugins/gui_editor/expression_editor.cpp b/code/studio/src/plugins/gui_editor/expression_editor.cpp
index 392bdca41..858c63c9c 100644
--- a/code/studio/src/plugins/gui_editor/expression_editor.cpp
+++ b/code/studio/src/plugins/gui_editor/expression_editor.cpp
@@ -176,6 +176,9 @@ void ExpressionEditor::onDeleteSelection()
 			}
 		}
 
+		if( item == m_pvt->m_root )
+			m_pvt->m_root = NULL;
+
 		m_scene->removeItem( item );
 		delete item;
 	}
diff --git a/code/studio/src/plugins/gui_editor/expression_node.cpp b/code/studio/src/plugins/gui_editor/expression_node.cpp
index 8a0ef774b..80ef571e2 100644
--- a/code/studio/src/plugins/gui_editor/expression_node.cpp
+++ b/code/studio/src/plugins/gui_editor/expression_node.cpp
@@ -297,9 +297,16 @@ QString ExpressionNode::build() const
 
 	QStringList l = m_name.split( ' ' );
 	result = l[ 0 ];
-	result += "( ";
 
 	int c = m_links.count();
+	if( c == 1 )
+	{
+		result += "()";
+		return result;
+	}
+
+	result += "( ";
+
 	for( int i = 1; i < c; i++ )
 	{
 		ExpressionLink *link = m_links[ i ];
diff --git a/code/studio/src/plugins/gui_editor/expression_store.cpp b/code/studio/src/plugins/gui_editor/expression_store.cpp
index 9f2218b4e..0016374d3 100644
--- a/code/studio/src/plugins/gui_editor/expression_store.cpp
+++ b/code/studio/src/plugins/gui_editor/expression_store.cpp
@@ -21,6 +21,7 @@
 #include "expression_loader.h"
 #include <QMap>
 #include <QDir>
+#include "gui_editor_config.h"
 
 class ExpressionStorePvt
 {
@@ -50,7 +51,7 @@ ExpressionStore::~ExpressionStore()
 
 bool ExpressionStore::load()
 {
-	QDir d( "expressions" );
+    QDir d( EXPRESSIONS_DIR );
 	if( !d.exists() )
 		return false;
 
diff --git a/code/studio/src/plugins/gui_editor/expressions/abs.xml b/code/studio/src/plugins/gui_editor/expressions/abs.xml
new file mode 100644
index 000000000..5a5fe2c70
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/abs.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Mathematical</category>
+<name>abs</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/band.xml b/code/studio/src/plugins/gui_editor/expressions/band.xml
new file mode 100644
index 000000000..1ce1534ec
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/band.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Bits</category>
+<name>band</name>
+<variable>true</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/bnot.xml b/code/studio/src/plugins/gui_editor/expressions/bnot.xml
new file mode 100644
index 000000000..bde93f6e7
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/bnot.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Bits</category>
+<name>bnot</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/bor.xml b/code/studio/src/plugins/gui_editor/expressions/bor.xml
new file mode 100644
index 000000000..906678bc2
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/bor.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Bits</category>
+<name>bor</name>
+<variable>true</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/bxor.xml b/code/studio/src/plugins/gui_editor/expressions/bxor.xml
new file mode 100644
index 000000000..2bfedb167
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/bxor.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Bits</category>
+<name>bxor</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/dbcount.xml b/code/studio/src/plugins/gui_editor/expressions/dbcount.xml
new file mode 100644
index 000000000..df8e0aac6
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/dbcount.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Database</category>
+<name>dbcount</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/depends.xml b/code/studio/src/plugins/gui_editor/expressions/depends.xml
new file mode 100644
index 000000000..225d48dd6
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/depends.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Logical</category>
+<name>depends</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/extSign11To64.xml b/code/studio/src/plugins/gui_editor/expressions/extSign11To64.xml
new file mode 100644
index 000000000..e227fc8cb
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/extSign11To64.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Bits</category>
+<name>extSign11To64</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/extSign8To64.xml b/code/studio/src/plugins/gui_editor/expressions/extSign8To64.xml
new file mode 100644
index 000000000..f029c15fc
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/extSign8To64.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Bits</category>
+<name>extSign8To64</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/getAlpha.xml b/code/studio/src/plugins/gui_editor/expressions/getAlpha.xml
new file mode 100644
index 000000000..acdc5e322
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/getAlpha.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Color</category>
+<name>getAlpha</name>
+<variable>false</variable>
+<slots>
+<slot>Color</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/getBlue.xml b/code/studio/src/plugins/gui_editor/expressions/getBlue.xml
new file mode 100644
index 000000000..be35a6c17
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/getBlue.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Color</category>
+<name>getBlue</name>
+<variable>false</variable>
+<slots>
+<slot>Color</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/getGreen.xml b/code/studio/src/plugins/gui_editor/expressions/getGreen.xml
new file mode 100644
index 000000000..da8e16bc4
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/getGreen.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Color</category>
+<name>getGreen</name>
+<variable>false</variable>
+<slots>
+<slot>Color</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/getRed.xml b/code/studio/src/plugins/gui_editor/expressions/getRed.xml
new file mode 100644
index 000000000..3a918857b
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/getRed.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Color</category>
+<name>getRed</name>
+<variable>false</variable>
+<slots>
+<slot>Color</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/getbit.xml b/code/studio/src/plugins/gui_editor/expressions/getbit.xml
new file mode 100644
index 000000000..6cc08e10b
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/getbit.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Bits</category>
+<name>getbit</name>
+<variable>false</variable>
+<slots>
+<slot>Integer</slot>
+<slot>Bit</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/getprop.xml b/code/studio/src/plugins/gui_editor/expressions/getprop.xml
new file mode 100644
index 000000000..1098635aa
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/getprop.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Database</category>
+<name>getprop</name>
+<variable>false</variable>
+<slots>
+<slot>property</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/identity.xml b/code/studio/src/plugins/gui_editor/expressions/identity.xml
new file mode 100644
index 000000000..cd36facd6
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/identity.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Mathematical</category>
+<name>identity</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/ilinear.xml b/code/studio/src/plugins/gui_editor/expressions/ilinear.xml
new file mode 100644
index 000000000..9284b4e82
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/ilinear.xml
@@ -0,0 +1,10 @@
+<expression>
+<category>Mathematical</category>
+<name>ilinear</name>
+<variable>false</variable>
+<slots>
+<slot>Interpolant</slot>
+<slot>Start</slot>
+<slot>End</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/int.xml b/code/studio/src/plugins/gui_editor/expressions/int.xml
new file mode 100644
index 000000000..117225b6b
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/int.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Mathematical</category>
+<name>int</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/intToColor.xml b/code/studio/src/plugins/gui_editor/expressions/intToColor.xml
new file mode 100644
index 000000000..2993365d7
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/intToColor.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Color</category>
+<name>intToColor</name>
+<variable>false</variable>
+<slots>
+<slot>Integer</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/isFinalVersion.xml b/code/studio/src/plugins/gui_editor/expressions/isFinalVersion.xml
new file mode 100644
index 000000000..3c9ddc64c
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/isFinalVersion.xml
@@ -0,0 +1,5 @@
+<expression>
+<category>Nel</category>
+<name>isFinalVersion</name>
+<variable>false</variable>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/localize.xml b/code/studio/src/plugins/gui_editor/expressions/localize.xml
new file mode 100644
index 000000000..f8d3f0f4e
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/localize.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Localization</category>
+<name>localize</name>
+<variable>false</variable>
+<slots>
+<slot>String</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/makeRGB.xml b/code/studio/src/plugins/gui_editor/expressions/makeRGB.xml
new file mode 100644
index 000000000..a2cb2d352
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/makeRGB.xml
@@ -0,0 +1,11 @@
+<expression>
+<category>Color</category>
+<name>makeRGB</name>
+<variable>false</variable>
+<slots>
+<slot>R</slot>
+<slot>G</slot>
+<slot>B</slot>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/max.xml b/code/studio/src/plugins/gui_editor/expressions/max.xml
new file mode 100644
index 000000000..6592aecd7
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/max.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Mathematical</category>
+<name>max</name>
+<variable>true</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/min.xml b/code/studio/src/plugins/gui_editor/expressions/min.xml
new file mode 100644
index 000000000..753955ed9
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/min.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Mathematical</category>
+<name>min</name>
+<variable>true</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/mod.xml b/code/studio/src/plugins/gui_editor/expressions/mod.xml
new file mode 100644
index 000000000..d306f3371
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/mod.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Mathematical</category>
+<name>mod</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/oldvalue.xml b/code/studio/src/plugins/gui_editor/expressions/oldvalue.xml
new file mode 100644
index 000000000..299706c79
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/oldvalue.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Database</category>
+<name>oldvalue</name>
+<variable>false</variable>
+<slots>
+<slot>property</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/rand.xml b/code/studio/src/plugins/gui_editor/expressions/rand.xml
new file mode 100644
index 000000000..b284dc241
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/rand.xml
@@ -0,0 +1,5 @@
+<expression>
+<category>Mathematical</category>
+<name>rand</name>
+<variable>false</variable>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/sal.xml b/code/studio/src/plugins/gui_editor/expressions/sal.xml
new file mode 100644
index 000000000..3190f4420
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/sal.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Bits</category>
+<name>sal</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/sar.xml b/code/studio/src/plugins/gui_editor/expressions/sar.xml
new file mode 100644
index 000000000..75fcd57d7
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/sar.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Bits</category>
+<name>sar</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/secondsToTimeString.xml b/code/studio/src/plugins/gui_editor/expressions/secondsToTimeString.xml
new file mode 100644
index 000000000..fda7dd1c8
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/secondsToTimeString.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Time</category>
+<name>secondsToTimeString</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/secondsToTimeStringShort.xml b/code/studio/src/plugins/gui_editor/expressions/secondsToTimeStringShort.xml
new file mode 100644
index 000000000..042cf06de
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/secondsToTimeStringShort.xml
@@ -0,0 +1,8 @@
+<expression>
+<category>Time</category>
+<name>secondsToTimeStringShort</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/shl.xml b/code/studio/src/plugins/gui_editor/expressions/shl.xml
new file mode 100644
index 000000000..653a142a6
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/shl.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Bits</category>
+<name>shl</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/shr.xml b/code/studio/src/plugins/gui_editor/expressions/shr.xml
new file mode 100644
index 000000000..435816f6e
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/shr.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>Bits</category>
+<name>shr</name>
+<variable>false</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/str.xml b/code/studio/src/plugins/gui_editor/expressions/str.xml
new file mode 100644
index 000000000..c98ae89eb
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/str.xml
@@ -0,0 +1,9 @@
+<expression>
+<category>String</category>
+<name>str</name>
+<variable>true</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/expressions/switch.xml b/code/studio/src/plugins/gui_editor/expressions/switch.xml
new file mode 100644
index 000000000..19f94f9d3
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/expressions/switch.xml
@@ -0,0 +1,10 @@
+<expression>
+<category>Logical</category>
+<name>switch</name>
+<variable>true</variable>
+<slots>
+<slot>A</slot>
+<slot>B</slot>
+<slot>C</slot>
+</slots>
+</expression>
diff --git a/code/studio/src/plugins/gui_editor/fonts/ryzom.ttf b/code/studio/src/plugins/gui_editor/fonts/ryzom.ttf
new file mode 100644
index 000000000..c1b19d870
Binary files /dev/null and b/code/studio/src/plugins/gui_editor/fonts/ryzom.ttf differ
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_config.h.cmake b/code/studio/src/plugins/gui_editor/gui_editor_config.h.cmake
new file mode 100644
index 000000000..0e36dcb79
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/gui_editor_config.h.cmake
@@ -0,0 +1,8 @@
+#ifndef GUI_EDITOR_CONFIG_H
+#define GUI_EDITOR_CONFIG_H
+
+#define WIDGETS_DIR     "${OVQT_IMP_DATA_DIR}/widgets"
+#define EXPRESSIONS_DIR "${OVQT_IMP_DATA_DIR}/expressions"
+
+#endif
+
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_window.cpp b/code/studio/src/plugins/gui_editor/gui_editor_window.cpp
index 9f6568936..002002abd 100644
--- a/code/studio/src/plugins/gui_editor/gui_editor_window.cpp
+++ b/code/studio/src/plugins/gui_editor/gui_editor_window.cpp
@@ -44,6 +44,7 @@
 #include "editor_selection_watcher.h"
 #include "editor_message_processor.h"
 #include "add_widget_widget.h"
+#include "new_gui_dlg.h"
 
 namespace GUIEditor
 {
@@ -181,6 +182,8 @@ namespace GUIEditor
 		currentProject = projectFiles.projectName.c_str();
 		currentProjectFile = fileName;
 		projectWindow->setupFiles( projectFiles );
+		GUICtrl->setWorkDir( _lastDir );
+
 		if( GUICtrl->parse( projectFiles ) )
 		{
 			hierarchyView->buildHierarchy( projectFiles.masterGroup );
@@ -197,13 +200,64 @@ namespace GUIEditor
 
 	void GUIEditorWindow::newDocument()
 	{
-	}
+		NewGUIDlg d;
+		int result = d.exec();
+		
+		if( result == QDialog::Rejected )
+			return;
 
-	void GUIEditorWindow::save()
-	{
-		if( currentProject.isEmpty() )
+		close();
+
+		std::string proj = d.getProjectName().toUtf8().constData();
+		std::string wnd = d.getWindowName().toUtf8().constData();
+		std::string mg = std::string( "ui:" ) + proj;
+		std::string dir = d.getProjectDirectory().toUtf8().constData();
+		_lastDir = dir.c_str();
+		std::string uiFile = "ui_" + proj + ".xml";
+
+		QList< QString > mapList;
+		d.getMapList( mapList );
+
+		bool b = GUICtrl->createNewGUI( proj, wnd );
+		if( !b )
+		{
+			QMessageBox::information( this,
+										tr( "Creating new GUI project" ),
+										tr( "Failed to create new GUI project :(" ) );
+			reset();
 			return;
+		}
+
+		hierarchyView->buildHierarchy( mg );
+
+		projectFiles.projectName = proj;
+		projectFiles.masterGroup = mg;
+		projectFiles.activeGroup = std::string( "ui:" ) + proj + ":" + wnd;
+		projectFiles.version = SProjectFiles::NEW;
+		projectFiles.guiFiles.push_back( uiFile );
+
+		for( int i = 0; i < mapList.size(); i++ )
+		{
+			projectFiles.mapFiles.push_back( mapList[ i ].toUtf8().constData() );
+		}
+
+		b = GUICtrl->loadMapFiles( projectFiles.mapFiles );
+		if( !b )
+		{
+			QMessageBox::information( this,
+										tr( "Creating new GUI project" ),
+										tr( "Failed to create new GUI project: Couldn't load map files. " ) );
+			reset();
+			return;
+		}
+		
+		projectWindow->setupFiles( projectFiles );
+
+		currentProject = proj.c_str();
+		currentProjectFile = std::string( dir + "/" + proj + ".xml" ).c_str();
+
 
+		// Save the project file
 		CProjectFileSerializer serializer;
 		serializer.setFile( currentProjectFile.toUtf8().constData() );
 		if( !serializer.serialize( projectFiles ) )
@@ -214,33 +268,26 @@ namespace GUIEditor
 			return;
 		}
 
-		// Can't save old projects any further, since the widgets are in multiple files in them
-		// using templates, styles and whatnot. There's no way to restore the original XML structure
-		// after it's loaded
-		if( projectParser.getProjectVersion() == OLD )
+		// Save the GUI file
+		WidgetSerializer widgetSerializer;
+		widgetSerializer.setFile( dir + "/" + uiFile );
+		widgetSerializer.setActiveGroup( projectFiles.activeGroup );
+		if( !widgetSerializer.serialize( projectFiles.masterGroup ) )
+		{
+			QMessageBox::critical( this,
+							tr( "Failed to save project" ),
+							tr( "There was an error while trying to save the project." ) );
 			return;
+		}
 	}
 
-	void GUIEditorWindow::saveAs()
+	void GUIEditorWindow::save()
 	{
 		if( currentProject.isEmpty() )
 			return;
 
-		QString dir = 
-			QFileDialog::getExistingDirectory( this, tr( "Save project as..." ) );
-
-		if( dir.isEmpty() )
-			return;
-
-		projectFiles.guiFiles.clear();
-		projectFiles.guiFiles.push_back( "ui_" + projectFiles.projectName + ".xml"  );
-		projectFiles.version = NEW;
-
-		QString newFile =
-			dir + "/" + projectFiles.projectName.c_str() + ".xml";
-
 		CProjectFileSerializer serializer;
-		serializer.setFile( newFile.toUtf8().constData() );
+		serializer.setFile( currentProjectFile.toUtf8().constData() );
 		if( !serializer.serialize( projectFiles ) )
 		{
 			QMessageBox::critical( this,
@@ -249,11 +296,18 @@ namespace GUIEditor
 			return;
 		}
 
-		std::string guiFile =
-			std::string( dir.toUtf8().constData() ) + "/" + "ui_" + projectFiles.projectName + ".xml";
+		// Can't save old projects any further, since the widgets are in multiple files in them
+		// using templates, styles and whatnot. There's no way to restore the original XML structure
+		// after it's loaded
+		if( projectFiles.version == SProjectFiles::OLD )
+			return;
+
+		std::string f = _lastDir.toUtf8().constData();
+		f += "/";
+		f += projectFiles.guiFiles[ 0 ];
 
 		WidgetSerializer widgetSerializer;
-		widgetSerializer.setFile( guiFile );
+		widgetSerializer.setFile( f );
 		widgetSerializer.setActiveGroup( projectFiles.activeGroup );
 		if( !widgetSerializer.serialize( projectFiles.masterGroup ) )
 		{
@@ -262,11 +316,48 @@ namespace GUIEditor
 							tr( "There was an error while trying to save the project." ) );
 			return;
 		}
+	}
 
-		QMessageBox::information( this,
-						tr( "Save successful" ),
-						tr( "Project saved successfully!" ) );
+	void GUIEditorWindow::saveAs()
+	{
+		if( currentProject.isEmpty() )
+			return;
+
+		QString dir = 
+			QFileDialog::getExistingDirectory( this, tr( "Save project as..." ) );
+
+		if( dir.isEmpty() )
+			return;
+		_lastDir = dir;
 
+		if( projectFiles.version == SProjectFiles::OLD )
+		{
+			projectFiles.guiFiles.clear();
+			projectFiles.guiFiles.push_back( "ui_" + projectFiles.projectName + ".xml"  );
+			projectFiles.version = SProjectFiles::NEW;
+
+		}
+
+		currentProjectFile = _lastDir;
+		currentProjectFile += "/";
+		currentProjectFile += projectFiles.projectName.c_str();
+		currentProjectFile += ".xml";
+
+		save();
+	}
+
+	void GUIEditorWindow::reset()
+	{
+		projectFiles.clearAll();
+		projectWindow->clear();
+		hierarchyView->clearHierarchy();
+		GUICtrl->reset();
+		browserCtrl.clear();
+		linkList->clear();
+		procList->clear();
+		currentProject = "";
+		currentProjectFile = "";
+		projectParser.clear();
 	}
 
 	bool GUIEditorWindow::close()
@@ -283,19 +374,10 @@ namespace GUIEditor
 
 
 		CEditorSelectionWatcher *w = GUICtrl->getWatcher();
-		disconnect( w, SIGNAL( sgnSelectionChanged( std::string& ) ), hierarchyView, SLOT( onSelectionChanged( std::string& ) ) );
-		disconnect( w, SIGNAL( sgnSelectionChanged( std::string& ) ), &browserCtrl, SLOT( onSelectionChanged( std::string& ) ) );
+		disconnect( w, SIGNAL( sgnSelectionChanged() ), hierarchyView, SLOT( onSelectionChanged() ) );
+		disconnect( w, SIGNAL( sgnSelectionChanged() ), &browserCtrl, SLOT( onSelectionChanged() ) );
 
-		projectFiles.clearAll();
-		projectWindow->clear();
-		hierarchyView->clearHierarchy();
-		GUICtrl->reset();
-		browserCtrl.clear();
-		linkList->clear();
-		procList->clear();
-		currentProject = "";
-		currentProjectFile = "";
-		projectParser.clear();
+		reset();
 
 		return true;
 	}
@@ -322,8 +404,8 @@ namespace GUIEditor
 		linkList->onGUILoaded();
 
 		CEditorSelectionWatcher *w = GUICtrl->getWatcher();
-		connect( w, SIGNAL( sgnSelectionChanged( std::string& ) ), hierarchyView, SLOT( onSelectionChanged( std::string& ) ) );
-		connect( w, SIGNAL( sgnSelectionChanged( std::string& ) ), &browserCtrl, SLOT( onSelectionChanged( std::string& ) ) );
+		connect( w, SIGNAL( sgnSelectionChanged() ), hierarchyView, SLOT( onSelectionChanged() ) );
+		connect( w, SIGNAL( sgnSelectionChanged() ), &browserCtrl, SLOT( onSelectionChanged() ) );
 	}
 
 	void GUIEditorWindow::onAddWidgetClicked()
@@ -356,14 +438,14 @@ namespace GUIEditor
 	void GUIEditorWindow::createMenus()
 	{
 		Core::MenuManager *mm = Core::ICore::instance()->menuManager();
-		//QAction *newAction = mm->action( Core::Constants::NEW );
+		QAction *newAction = mm->action( Core::Constants::NEW );
 		QAction *saveAction = mm->action( Core::Constants::SAVE );
 		QAction *saveAsAction = mm->action( Core::Constants::SAVE_AS );
 		QAction *closeAction = mm->action( Core::Constants::CLOSE );
 		QAction *delAction = mm->action( Core::Constants::DEL );
 
-		//if( newAction != NULL )
-		//	newAction->setEnabled( true );
+		if( newAction != NULL )
+			newAction->setEnabled( true );
 		if( saveAction != NULL )
 			saveAction->setEnabled( true );
 		if( saveAsAction != NULL )
@@ -399,6 +481,30 @@ namespace GUIEditor
 			connect( a, SIGNAL( triggered( bool ) ), this, SLOT( onAddWidgetClicked() ) );
 			m->addAction( a );
 
+			a = new QAction( "Group", this );
+			connect( a, SIGNAL( triggered() ), messageProcessor, SLOT( onGroup() ) );
+			m->addAction( a );
+
+			a = new QAction( "Ungroup", this );
+			connect( a, SIGNAL( triggered() ), messageProcessor, SLOT( onUngroup() ) );
+			m->addAction( a );
+
+			
+			// ----------------------------------------------------------------------------------			
+			m->addSeparator();
+
+			a = new QAction( "Select groups", this );
+			a->setCheckable( true );
+			a->setChecked( false );
+			connect( a, SIGNAL( triggered( bool ) ), messageProcessor, SLOT( onSetGroupSelection( bool ) ) );
+			m->addAction( a );
+
+			a = new QAction( "Multiselect", this );
+			a->setCheckable( true );
+			a->setChecked( false );
+			connect( a, SIGNAL( triggered( bool ) ), messageProcessor, SLOT( onSetMultiSelection( bool ) ) );
+			m->addAction( a );
+
 			menu = m;
 		}
 	}
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_window.h b/code/studio/src/plugins/gui_editor/gui_editor_window.h
index cc2dfbc65..4a0a919a4 100644
--- a/code/studio/src/plugins/gui_editor/gui_editor_window.h
+++ b/code/studio/src/plugins/gui_editor/gui_editor_window.h
@@ -70,6 +70,7 @@ protected:
 		void showEvent( QShowEvent *evnt );
 
 private:
+		void reset();
 		void createMenus();
 		void removeMenus();
 
diff --git a/code/studio/src/plugins/gui_editor/nelgui_ctrl.cpp b/code/studio/src/plugins/gui_editor/nelgui_ctrl.cpp
index 03f784944..4852b227f 100644
--- a/code/studio/src/plugins/gui_editor/nelgui_ctrl.cpp
+++ b/code/studio/src/plugins/gui_editor/nelgui_ctrl.cpp
@@ -89,10 +89,30 @@ namespace GUIEditor
 		reset();
 		IParser *parser = CWidgetManager::getInstance()->getParser();
 
-		std::vector< std::string >::iterator itr;
-		for( itr = files.mapFiles.begin(); itr != files.mapFiles.end(); ++itr )
+		if( !loadMapFiles( files.mapFiles ) )
+			return false;
+
+		if( !parser->parseInterface( files.guiFiles, false ) )
+			return false;
+
+		CWidgetManager::getInstance()->updateAllLocalisedElements();
+		CWidgetManager::getInstance()->activateMasterGroup( files.masterGroup, true );
+		
+		CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( files.activeGroup );
+		if( e != NULL )
+			e->setActive( true );
+
+		onGUILoaded();
+
+		return true;
+	}
+
+	bool NelGUICtrl::loadMapFiles( const std::vector< std::string > &v )
+	{
+		std::vector< std::string >::const_iterator itr;
+		for( itr = v.begin(); itr != v.end(); ++itr )
 		{
-			std::string &file = *itr;
+			const std::string &file = *itr;
 			std::string::size_type i = file.find_last_of( '.' );
 			std::string mapFile = file.substr( 0, i );
 			mapFile.append( ".txt" );
@@ -104,21 +124,27 @@ namespace GUIEditor
 			}
 		}
 
-		if( !parser->parseInterface( files.guiFiles, false ) )
+		return true;
+	}
+
+	bool NelGUICtrl::createNewGUI( const std::string &project, const std::string &window )
+	{
+		reset();
+		bool ok = CWidgetManager::getInstance()->createNewGUI( project, window );
+		if( !ok )
 			return false;
 
+		std::string mg = std::string( "ui:" ) + project;
+		std::string ag = mg + ":" + window;
+
 		CWidgetManager::getInstance()->updateAllLocalisedElements();
-		CWidgetManager::getInstance()->activateMasterGroup( files.masterGroup, true );
+		CWidgetManager::getInstance()->activateMasterGroup( mg, true );
 		
-		CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( files.activeGroup );
+		CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( ag );
 		if( e != NULL )
 			e->setActive( true );
 
-		timerID = startTimer( 200 );
-		guiLoaded = true;
-		Q_EMIT guiLoadComplete();
-
-		CWidgetManager::getInstance()->registerSelectionWatcher( watcher );
+		onGUILoaded();
 
 		return true;
 	}
@@ -160,6 +186,15 @@ namespace GUIEditor
 		}
 	}
 
+	void NelGUICtrl::onGUILoaded()
+	{
+		timerID = startTimer( 25 );
+		guiLoaded = true;
+		Q_EMIT guiLoadComplete();
+
+		CWidgetManager::getInstance()->registerSelectionWatcher( watcher );
+	}
+
 	void NelGUICtrl::show()
 	{
 		if( timerID == 0 )
@@ -187,6 +222,12 @@ namespace GUIEditor
 		}
 	}
 
+	void NelGUICtrl::setWorkDir( const QString &dir )
+	{
+		IParser *parser = CWidgetManager::getInstance()->getParser();
+		parser->setWorkDir( std::string( dir.toUtf8().constData() ) );
+	}
+
 	QWidget* NelGUICtrl::getViewPort()
 	{
 		return w;
diff --git a/code/studio/src/plugins/gui_editor/nelgui_ctrl.h b/code/studio/src/plugins/gui_editor/nelgui_ctrl.h
index b3c68ff32..d54c78c7a 100644
--- a/code/studio/src/plugins/gui_editor/nelgui_ctrl.h
+++ b/code/studio/src/plugins/gui_editor/nelgui_ctrl.h
@@ -43,6 +43,8 @@ namespace GUIEditor
 
 		void init();
 		bool parse( SProjectFiles &files );
+		bool loadMapFiles( const std::vector< std::string > &v );
+		bool createNewGUI( const std::string &project, const std::string &window );
 		void draw();
 		void reset();
 		CEditorSelectionWatcher* getWatcher(){ return watcher; }
@@ -52,6 +54,8 @@ namespace GUIEditor
 		void show();
 		void hide();
 
+		void setWorkDir( const QString &dir );
+
 Q_SIGNALS:
 		void guiLoadComplete();
 
@@ -59,6 +63,8 @@ Q_SIGNALS:
 		void timerEvent( QTimerEvent *evnt );
 
 	private:
+		void onGUILoaded();
+
 		int timerID;
 		bool guiLoaded;
 		CEditorSelectionWatcher *watcher;
diff --git a/code/studio/src/plugins/gui_editor/new_gui_dlg.cpp b/code/studio/src/plugins/gui_editor/new_gui_dlg.cpp
new file mode 100644
index 000000000..43faabf79
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/new_gui_dlg.cpp
@@ -0,0 +1,138 @@
+// Ryzom Core Studio - GUI Editor Plugin
+//
+// Copyright (C) 2014 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+#include "new_gui_dlg.h"
+#include <QMessageBox>
+#include <QFileDialog>
+
+NewGUIDlg::NewGUIDlg( QWidget *parent ) :
+QDialog( parent )
+{
+	m_ui.setupUi( this );
+
+	// Login texture map - temporaty measure until we add default textures for widgets to use
+	m_ui.mapList->addItem( "texture_interfaces_v3_login.tga" );
+
+	connect( m_ui.okButton, SIGNAL( clicked( bool ) ), this, SLOT( onOKClicked() ) );
+	connect( m_ui.cancelButton, SIGNAL( clicked( bool ) ), this, SLOT( onCancelClicked() ) );
+	connect( m_ui.projectDirTB, SIGNAL( clicked( bool ) ), this, SLOT( onProjectDirTBClicked() ) );
+	connect( m_ui.addButton, SIGNAL( clicked( bool ) ), this, SLOT( onAddClicked() ) );
+	connect( m_ui.removeButton, SIGNAL( clicked( bool ) ), this, SLOT( onRemoveClicked() ) );
+
+}
+
+NewGUIDlg::~NewGUIDlg()
+{
+}
+
+QString NewGUIDlg::getProjectName() const
+{
+	return m_ui.projectEdit->text();
+}
+
+QString NewGUIDlg::getWindowName() const
+{
+	return m_ui.windowEdit->text();
+}
+
+QString NewGUIDlg::getProjectDirectory() const
+{
+	return m_ui.projectDirEdit->text();
+}
+
+void NewGUIDlg::getMapList( QList< QString > &l )
+{
+	l.clear();
+
+	for( int i = 0; i < m_ui.mapList->count(); i++ )
+	{
+		l.push_back( m_ui.mapList->item( i )->text() );
+	}
+}
+
+void NewGUIDlg::onOKClicked()
+{
+	if( m_ui.projectEdit->text().isEmpty() )
+	{
+		QMessageBox::information( this,
+									tr( "New project" ),
+									tr( "You must specify a project name!" ) );
+		return;
+	}
+
+	if( m_ui.windowEdit->text().isEmpty() )
+	{
+		QMessageBox::information( this,
+									tr( "New project" ),
+									tr( "You must specify a window name!" ) );
+		return;
+	}
+
+	if( m_ui.projectDirEdit->text().isEmpty() )
+	{
+		QMessageBox::information( this,
+									tr( "New project" ),
+									tr( "You must specify a project directory!" ) );
+		return;
+	}
+
+	accept();
+}
+
+void NewGUIDlg::onCancelClicked()
+{
+	reject();
+}
+
+void NewGUIDlg::onProjectDirTBClicked()
+{
+	QString dir = QFileDialog::getExistingDirectory( this,
+													tr( "Specify project directory" ),
+													"." );
+	if( dir.isEmpty() )
+		return;
+
+	m_ui.projectDirEdit->setText( dir );
+}
+
+void NewGUIDlg::onAddClicked()
+{
+	if( m_ui.mapEdit->text().isEmpty() )
+		return;
+
+	QList< QListWidgetItem* > l = m_ui.mapList->findItems( m_ui.mapEdit->text(), Qt::MatchContains );
+	if( !l.isEmpty() )
+	{
+		return;
+	}
+
+	m_ui.mapList->addItem( m_ui.mapEdit->text() );
+	m_ui.mapEdit->clear();
+}
+
+void NewGUIDlg::onRemoveClicked()
+{
+	QListWidgetItem *item = m_ui.mapList->currentItem();
+	if( item == NULL )
+		return;
+
+	delete item;
+}
+
+
+
diff --git a/code/studio/src/plugins/gui_editor/new_gui_dlg.h b/code/studio/src/plugins/gui_editor/new_gui_dlg.h
new file mode 100644
index 000000000..0d878461c
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/new_gui_dlg.h
@@ -0,0 +1,50 @@
+// Ryzom Core Studio - GUI Editor Plugin
+//
+// Copyright (C) 2014 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+#ifndef NEW_GUI_DLG_H
+#define NEW_GUI_DLG_H
+
+#include "ui_new_gui_dlg.h"
+#include <QList>
+
+class NewGUIDlg : public QDialog
+{
+	Q_OBJECT
+
+public:
+	NewGUIDlg( QWidget *parent = NULL );
+	~NewGUIDlg();
+
+	QString getProjectName() const;
+	QString getWindowName() const;
+	QString getProjectDirectory() const;
+	void getMapList( QList< QString > &l );
+
+private Q_SLOTS:
+	void onOKClicked();
+	void onCancelClicked();
+	void onProjectDirTBClicked();
+	void onAddClicked();
+	void onRemoveClicked();
+
+private:
+	Ui::NewGUIDialog m_ui;
+};
+
+#endif
+
diff --git a/code/studio/src/plugins/gui_editor/new_gui_dlg.ui b/code/studio/src/plugins/gui_editor/new_gui_dlg.ui
new file mode 100644
index 000000000..bf22e8c6b
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/new_gui_dlg.ui
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewGUIDialog</class>
+ <widget class="QDialog" name="NewGUIDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>399</width>
+    <height>354</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>New GUI</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Project name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2">
+    <widget class="QLineEdit" name="projectEdit"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Window name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QLineEdit" name="windowEdit"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Project directory</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" colspan="2">
+    <widget class="QLineEdit" name="projectDirEdit"/>
+   </item>
+   <item row="2" column="3">
+    <widget class="QToolButton" name="projectDirTB">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="4">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Map files</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="1">
+       <widget class="QPushButton" name="addButton">
+        <property name="text">
+         <string>Add</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLineEdit" name="mapEdit"/>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="removeButton">
+        <property name="text">
+         <string>Remove</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" rowspan="2">
+       <widget class="QListWidget" name="mapList"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>107</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="2" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="okButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/code/studio/src/plugins/gui_editor/project_file_parser.cpp b/code/studio/src/plugins/gui_editor/project_file_parser.cpp
index 7213b332a..856b3c164 100644
--- a/code/studio/src/plugins/gui_editor/project_file_parser.cpp
+++ b/code/studio/src/plugins/gui_editor/project_file_parser.cpp
@@ -16,6 +16,7 @@
 
 
 #include "project_file_parser.h"
+#include "nel/misc/debug.h"
 
 namespace GUIEditor
 {
@@ -57,12 +58,13 @@ namespace GUIEditor
 		projectFiles.projectName = files.projectName;
 		projectFiles.masterGroup = files.masterGroup;
 		projectFiles.activeGroup = files.activeGroup;
+		projectFiles.version = files.version;
 	}
 
 	unsigned long CProjectFileParser::getProjectVersion() const
 	{
 		if( !loaded )
-			return OLD;
+			return SProjectFiles::OLD;
 
 		return files.version;
 	}
@@ -70,7 +72,7 @@ namespace GUIEditor
 	void CProjectFileParser::clear()
 	{
 		files.projectName = "";
-		files.version = OLD;
+		files.version = SProjectFiles::OLD;
 		files.activeGroup = "";
 		files.guiFiles.clear();
 		files.mapFiles.clear();
@@ -208,7 +210,9 @@ namespace GUIEditor
 			reader.readNext();
 		}
 		if( files.mapFiles.empty() )
-			return false;
+		{
+			nlinfo( "No map file(s) specified in project file." );
+		}
 
 		return true;
 	}
diff --git a/code/studio/src/plugins/gui_editor/project_file_serializer.cpp b/code/studio/src/plugins/gui_editor/project_file_serializer.cpp
index 4eb442d3f..0b34f511b 100644
--- a/code/studio/src/plugins/gui_editor/project_file_serializer.cpp
+++ b/code/studio/src/plugins/gui_editor/project_file_serializer.cpp
@@ -25,7 +25,7 @@ namespace GUIEditor
 		if( fileName.empty() )
 			return false;
 
-		if( project.version >= MAX_PROJECTFILE_VERSION )
+		if( project.version >= SProjectFiles::MAX_PROJECTFILE_VERSION )
 			return false;
 
 		out.open( fileName.c_str() );
diff --git a/code/studio/src/plugins/gui_editor/project_files.h b/code/studio/src/plugins/gui_editor/project_files.h
index 4ae58493b..786bd22e4 100644
--- a/code/studio/src/plugins/gui_editor/project_files.h
+++ b/code/studio/src/plugins/gui_editor/project_files.h
@@ -23,16 +23,17 @@
 
 namespace GUIEditor
 {
-	enum ProjectVersion
-	{
-		OLD = 0,
-		NEW = 1,
-		MAX_PROJECTFILE_VERSION
-	};
-
 	struct SProjectFiles
 	{
 	public:
+
+		enum ProjectVersion
+		{
+			OLD = 0,
+			NEW = 1,
+			MAX_PROJECTFILE_VERSION
+		};
+
 		std::string projectName;
 		unsigned long version;
 		std::string masterGroup;
diff --git a/code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp b/code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp
index bd73fb7fa..6db5423a3 100644
--- a/code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp
+++ b/code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp
@@ -436,7 +436,7 @@ namespace GUIEditor
 		browser->clear();
 	}
 
-	void CPropBrowserCtrl::onSelectionChanged( std::string &id )
+	void CPropBrowserCtrl::onSelectionChanged()
 	{
 		if( browser == NULL )
 			return;
@@ -444,14 +444,20 @@ namespace GUIEditor
 		disablePropertyWatchers();
 		browser->clear();
 
-		CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( id );
+		std::vector< std::string > selection;
+		CWidgetManager::getInstance()->getEditorSelection( selection );
+
+		if( selection.size() != 1 )
+			return;
+
+		CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( selection[ 0 ] );
 		if( e == NULL )
 		{
 			enablePropertyWatchers();
 			return;
 		}
 
-		currentElement = id;
+		currentElement = selection[ 0 ];
 
         std::string n = e->getClassName();
 
@@ -493,6 +499,10 @@ namespace GUIEditor
 		if( e == NULL )
 			return;
 		e->setProperty( propName.toUtf8().constData(), propValue.toUtf8().constData() );
+
+		CInterfaceGroup *g = e->getParent();
+		if( g != NULL )
+			g->updateCoords();
 		
 		
 		// Make sure the changes are applied
@@ -514,13 +524,12 @@ namespace GUIEditor
 			return;
 		std::string type = itr->second;
 
+		CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
+		if( e == NULL )
+			return;
 
 		if( type == "button_type" )
 		{
-			CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
-			if( e == NULL )
-				return;
-
 			std::string v;
 			v = NelButtonType::toString( value );
 			if( v.empty() )
@@ -531,10 +540,6 @@ namespace GUIEditor
 		else
 		if( type == "text_justification" )
 		{
-			CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
-			if( e == NULL )
-				return;
-
 			std::string v;
 			v = NelTxtJustification::toString( value );
 			if( v.empty() )
@@ -545,10 +550,6 @@ namespace GUIEditor
 		else
 		if( type == "posref" )
 		{
-			CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
-			if( e == NULL )
-				return;
-
 			std::string v = NelPosRef::toString( value );
 			if( v.empty() )
 				return;
@@ -558,10 +559,6 @@ namespace GUIEditor
 		else
 		if( type == "posreftt" )
 		{
-			CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
-			if( e == NULL )
-				return;
-
 			std::string v = NelPosRefTT::toString( value );
 			if( v.empty() )
 				return;
@@ -608,10 +605,6 @@ namespace GUIEditor
 		else
 		if( type == "tooltip_parent" )
 		{
-			CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
-			if( e == NULL )
-				return;
-
 			std::string v = NelTTParent::toString( value );
 			if( v.empty() )
 				return;
@@ -621,16 +614,18 @@ namespace GUIEditor
 		else
 		if( type == "bitmap_align" )
 		{
-			CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
-			if( e == NULL )
-				return;
-
 			std::string v = NelBMAlign::toString( value );
 			if( v.empty() )
 				return;
 
 			e->setProperty( propName.toUtf8().constData(), v );
 		}
+
+
+		CInterfaceGroup *g = e->getParent();
+		if( g != NULL )
+			g->updateCoords();
+
 	}
 
 
@@ -643,6 +638,10 @@ namespace GUIEditor
 			return;
 		
 		e->setProperty( propName.toUtf8().constData(), v.toUtf8().constData() );
+
+		CInterfaceGroup *g = e->getParent();
+		if( g != NULL )
+			g->updateCoords();
 	}
 
 	void CPropBrowserCtrl::onTexturePropertyChanged( QtProperty *p, const QString &v )
@@ -654,6 +653,10 @@ namespace GUIEditor
 			return;
 		
 		e->setProperty( propName.toUtf8().constData(), v.toUtf8().constData() );
+
+		CInterfaceGroup *g = e->getParent();
+		if( g != NULL )
+			g->updateCoords();
 	}
 
 	void CPropBrowserCtrl::enablePropertyWatchers()
@@ -710,9 +713,6 @@ namespace GUIEditor
 		{
 			std::string j = element->getProperty( prop.propName );
 
-			if( j.empty() )
-				return;
-
 			QtProperty *pp = textureMgr->addProperty( prop.propName.c_str() );
 			if( pp == NULL )
 				return;
@@ -725,9 +725,6 @@ namespace GUIEditor
 		{
 			std::string j = element->getProperty( prop.propName );
 
-			if( j.empty() )
-				return;
-
 			QtProperty *pp = actionMgr->addProperty( prop.propName.c_str() );
 			if( pp == NULL )
 				return;
diff --git a/code/studio/src/plugins/gui_editor/property_browser_ctrl.h b/code/studio/src/plugins/gui_editor/property_browser_ctrl.h
index abf80d7de..3d72d92ba 100644
--- a/code/studio/src/plugins/gui_editor/property_browser_ctrl.h
+++ b/code/studio/src/plugins/gui_editor/property_browser_ctrl.h
@@ -59,7 +59,7 @@ namespace GUIEditor
 		void clear();
 
 	public Q_SLOTS:
-		void onSelectionChanged( std::string &id );
+		void onSelectionChanged();
 
 	private Q_SLOTS:
 		void onPropertyChanged( QtProperty *prop, const QVariant &v );
diff --git a/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp b/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
index 24208f4a3..17e7f6e57 100644
--- a/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
+++ b/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
@@ -18,7 +18,6 @@
 #include "widget_hierarchy.h"
 #include "nel/gui/interface_group.h"
 #include "nel/gui/widget_manager.h"
-#include "nel/gui/widget_addition_watcher.h"
 
 namespace
 {
@@ -76,18 +75,24 @@ namespace
 		GUIEditor::WidgetHierarchy *h;
 	};
 
-	class CWidgetAdditionWatcher : public IWidgetAdditionWatcher
+	class CWidgetWatcher : public CWidgetManager::IWidgetWatcher
 	{
 	public:
-		CWidgetAdditionWatcher(){ h = NULL; }
-		~CWidgetAdditionWatcher(){}
+		CWidgetWatcher(){ h = NULL; }
+		~CWidgetWatcher(){}
 
-		void widgetAdded( const std::string &name )
+		void onWidgetAdded( const std::string &name )
 		{
 			if( h != NULL )
 				h->onWidgetAdded( name );
 		}
-		
+
+		void onWidgetMoved( const std::string &oldid, const std::string &newid )
+		{
+			if( h != NULL )
+				h->onWidgetMoved( oldid, newid );
+		}
+
 		void setWidgetHierarchy( GUIEditor::WidgetHierarchy *h ){ this->h = h; }
 
 	private:
@@ -95,7 +100,7 @@ namespace
 	};
 
 	CWidgetDeletionWatcher deletionWatcher;
-	CWidgetAdditionWatcher additionWatcher;
+	CWidgetWatcher widgetwatcher;
 }
 
 namespace GUIEditor
@@ -107,7 +112,7 @@ namespace GUIEditor
 		connect( widgetHT, SIGNAL( itemDoubleClicked( QTreeWidgetItem*, int ) ),
 			this, SLOT( onItemDblClicked( QTreeWidgetItem* ) ) );
 		deletionWatcher.setWidgetHierarchy( this );
-		additionWatcher.setWidgetHierarchy( this );
+		widgetwatcher.setWidgetHierarchy( this );
 	}
 
 	WidgetHierarchy::~WidgetHierarchy()
@@ -117,7 +122,7 @@ namespace GUIEditor
 	void WidgetHierarchy::clearHierarchy()
 	{
 		CInterfaceElement::unregisterDeletionWatcher( &deletionWatcher );
-		CWidgetManager::getInstance()->unregisterAdditionWatcher( &additionWatcher );
+		CWidgetManager::getInstance()->unregisterWidgetWatcher( &widgetwatcher );
 		widgetHT->clear();
 		widgetHierarchyMap.clear();
 	}
@@ -126,7 +131,7 @@ namespace GUIEditor
 	{
 		clearHierarchy();
 		CInterfaceElement::registerDeletionWatcher( &deletionWatcher );
-		CWidgetManager::getInstance()->registerAdditionWatcher( &additionWatcher );
+		CWidgetManager::getInstance()->registerWidgetWatcher( &widgetwatcher );
 
 		CInterfaceGroup *mg = CWidgetManager::getInstance()->getMasterGroupFromId( masterGroup );
 		if( mg != NULL )
@@ -161,6 +166,9 @@ namespace GUIEditor
 		std::vector< CCtrlBase* >::const_iterator citr;
 		for( citr = controls.begin(); citr != controls.end(); ++citr )
 		{
+			if( !(*citr)->isEditorSelectable() )
+				continue;
+
 			QTreeWidgetItem *subItem = new QTreeWidgetItem( item );
 			subItem->setText( 0, makeNodeName( (*citr)->getId() ).c_str() );
 			widgetHierarchyMap[ (*citr)->getId() ] = subItem;
@@ -171,12 +179,36 @@ namespace GUIEditor
 		std::vector< CViewBase* >::const_iterator vitr;
 		for( vitr = views.begin(); vitr != views.end(); ++vitr )
 		{
+			if( !(*vitr)->isEditorSelectable() )
+				continue;
+
 			QTreeWidgetItem *subItem = new QTreeWidgetItem( item );
 			subItem->setText( 0, makeNodeName( (*vitr)->getId() ).c_str() );
 			widgetHierarchyMap[ (*vitr)->getId() ] = subItem;
 		}
 	}
 
+	QTreeWidgetItem* WidgetHierarchy::findItem( const std::string &id )
+	{
+		std::map< std::string, QTreeWidgetItem* >::iterator itr
+			= widgetHierarchyMap.find( id );
+		if( itr == widgetHierarchyMap.end() )
+			return NULL;
+		else
+			return itr->second;
+	}
+
+	QTreeWidgetItem* WidgetHierarchy::findParent( const std::string &id )
+	{
+		// Get the parent's name
+		std::string::size_type p = id.find_last_of( ':' );
+		if( p == std::string::npos )
+			return NULL;
+		std::string parentId = id.substr( 0, p );
+
+		return findItem( parentId );
+	}
+
 	void WidgetHierarchy::onWidgetDeleted( const std::string &id )
 	{
 		std::map< std::string, QTreeWidgetItem* >::iterator itr
@@ -231,16 +263,62 @@ namespace GUIEditor
 		widgetHierarchyMap[ id ] = item;
 	}
 
+	void WidgetHierarchy::onWidgetMoved( const std::string &oldid, const std::string &newid )
+	{
+		QTreeWidgetItem *newParent = NULL;
+		QTreeWidgetItem *item = NULL;
+		QString id;
+
+		newParent = findParent( newid );
+		item = findItem( oldid );
+
+		if( ( newParent == NULL ) || ( item == NULL ) )
+			return;
+
+		// Remove item from old parent
+		QTreeWidgetItem *p = item->parent();
+		if( p != NULL )
+			p->setExpanded( false );
+		p->removeChild( item );
+
+		// Remove reference to old item
+		widgetHierarchyMap.erase( oldid );
+		
+		// Add item to new parent
+		newParent->addChild( item );
+
+		// Add reference to new item
+		widgetHierarchyMap[ newid ] = item;
+
+		selectItem( item );
+	}
+
+	void WidgetHierarchy::selectItem( QTreeWidgetItem *item )
+	{
+		widgetHT->collapseAll();
+
+		QTreeWidgetItem *currItem = item;
+		while( currItem != NULL )
+		{
+			currItem->setExpanded( true );
+			currItem = currItem->parent();
+		}
+
+		widgetHT->setCurrentItem( item );
+		item->setSelected( true );
+	}
+
 	void WidgetHierarchy::getCurrentGroup( QString &g )
 	{
-		std::string s = CWidgetManager::getInstance()->getCurrentEditorSelection();
-		if( s.empty() )
+		std::vector< std::string > selection;
+		CWidgetManager::getInstance()->getEditorSelection( selection );
+		if( selection.size() != 1 )
 		{
 			g = "";
 			return;
 		}
 
-		NLGUI::CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( s );
+		NLGUI::CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( selection[ 0 ] );
 		if( e == NULL )
 		{
 			g = "";
@@ -271,8 +349,16 @@ namespace GUIEditor
 		currentSelection.clear();
 	}
 
-	void WidgetHierarchy::onSelectionChanged( std::string &newSelection )
+	void WidgetHierarchy::onSelectionChanged()
 	{
+		std::vector< std::string > selection;
+		CWidgetManager::getInstance()->getEditorSelection( selection );
+
+		if( selection.size() != 1 )
+			return;
+
+		std::string newSelection = selection[ 0 ];
+
 		if( newSelection == currentSelection )
 			return;
 
@@ -288,18 +374,11 @@ namespace GUIEditor
 		if( widgetHT->currentItem() != NULL )
 			widgetHT->currentItem()->setSelected( false );
 
-		// expand the tree items, so that we can see the selected item
-		QTreeWidgetItem *item = itr->second;
-		QTreeWidgetItem *currItem = item;
-		while( currItem != NULL )
-		{
-			currItem->setExpanded( true );
-			currItem = currItem->parent();
-		}
+		widgetHT->collapseAll();
 
 		// select the current item
-		item->setSelected( true );
-		widgetHT->setCurrentItem( item );
+		QTreeWidgetItem *item = itr->second;
+		selectItem( item );
 		currentSelection = newSelection;
 	}
 
@@ -307,9 +386,11 @@ namespace GUIEditor
 	{
 		if( item->parent() == NULL )
 			return;
+
+		selectItem( item );
 		
 		std::string n = item->text( 0 ).toUtf8().constData();
 		currentSelection = makeFullName( item, n );
-		CWidgetManager::getInstance()->setCurrentEditorSelection( currentSelection );
+		CWidgetManager::getInstance()->selectWidget( currentSelection );
 	}
 }
diff --git a/code/studio/src/plugins/gui_editor/widget_hierarchy.h b/code/studio/src/plugins/gui_editor/widget_hierarchy.h
index 4641c8ce8..cdfc9a741 100644
--- a/code/studio/src/plugins/gui_editor/widget_hierarchy.h
+++ b/code/studio/src/plugins/gui_editor/widget_hierarchy.h
@@ -44,15 +44,19 @@ namespace GUIEditor
 
 		void onWidgetDeleted( const std::string &id );
 		void onWidgetAdded( const std::string &id );
+		void onWidgetMoved( const std::string &oldid, const std::string &newid );
 
 		void getCurrentGroup( QString &g );
 
 	private:
 		void buildHierarchy( QTreeWidgetItem *parent, NLGUI::CInterfaceGroup *group );
+		QTreeWidgetItem* findItem( const std::string &id );
+		QTreeWidgetItem* findParent( const std::string &id );
+		void selectItem( QTreeWidgetItem *item );
 
 	public Q_SLOTS:
 		void onGUILoaded();
-		void onSelectionChanged( std::string &newSelection );
+		void onSelectionChanged();
 
 	private Q_SLOTS:
 		void onItemDblClicked( QTreeWidgetItem *item );
diff --git a/code/studio/src/plugins/gui_editor/widget_info_tree_node.h b/code/studio/src/plugins/gui_editor/widget_info_tree_node.h
index 0de9e6977..8aefe6f0f 100644
--- a/code/studio/src/plugins/gui_editor/widget_info_tree_node.h
+++ b/code/studio/src/plugins/gui_editor/widget_info_tree_node.h
@@ -75,6 +75,10 @@ namespace GUIEditor
 			// copy the properties to the child, since they inherit them
 			for( std::vector< SPropEntry >::const_iterator itr = this->info.props.begin(); itr != this->info.props.end(); ++itr )
 			{
+				// Don't add property if already exists, since it's an override.
+				if( node->hasProperty( itr->propName ) )
+					continue;
+
 				node->addProperty( *itr );
 			}
 		}
diff --git a/code/studio/src/plugins/gui_editor/widget_properties_parser.cpp b/code/studio/src/plugins/gui_editor/widget_properties_parser.cpp
index e0f346fc9..fd74dcae4 100644
--- a/code/studio/src/plugins/gui_editor/widget_properties_parser.cpp
+++ b/code/studio/src/plugins/gui_editor/widget_properties_parser.cpp
@@ -20,6 +20,7 @@
 #include <QStringList>
 #include "nel/misc/debug.h"
 #include "widget_info_tree.h"
+#include "gui_editor_config.h"
 
 using namespace NLMISC;
 
@@ -36,7 +37,7 @@ namespace GUIEditor
 
 	void CWidgetPropParser::parseGUIWidgets()
 	{
-		QDir d( "widgets" );
+        QDir d( WIDGETS_DIR );
 		if( !d.exists() )
 		{
 			nlwarning( "GUI widgets directory doesn't exist!" );
@@ -55,7 +56,7 @@ namespace GUIEditor
 
 		QStringListIterator itr( files );
 		while( itr.hasNext() )
-			parseGUIWidget( "widgets/" + itr.next() );
+            parseGUIWidget( QString( WIDGETS_DIR ) + QString( "/" ) + itr.next() );
 
 		buildWidgetInfoTree();
 
diff --git a/code/studio/src/plugins/gui_editor/widget_serializer.cpp b/code/studio/src/plugins/gui_editor/widget_serializer.cpp
index fd4e7cfbe..8006a6b50 100644
--- a/code/studio/src/plugins/gui_editor/widget_serializer.cpp
+++ b/code/studio/src/plugins/gui_editor/widget_serializer.cpp
@@ -93,8 +93,6 @@ namespace GUIEditor
 			return false;
 		}
 
-		ag->setActive( false );
-
 		if( mg->serializeSubGroups( root ) == NULL )
 		{
 			ag->setActive( true );
@@ -103,8 +101,6 @@ namespace GUIEditor
 			return false;
 		}
 
-		ag->setActive( true );
-
 		if( !mg->serializeLinks( root ) )
 		{
 			xmlFreeNode( root );
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlButton.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlButton.xml
index 12b82e7f6..2454f7035 100644
--- a/code/studio/src/plugins/gui_editor/widgets/CtrlButton.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/CtrlButton.xml
@@ -2,6 +2,7 @@
     <header>
         <name>CtrlButton</name>
         <guiname>CCtrlButton</guiname>
+		<classname>button</classname>
         <ancestor>CtrlBaseButton</ancestor>
         <description></description>
         <abstract>false</abstract>
@@ -10,18 +11,18 @@
     <properties>
         <property>
             <name>tx_normal</name>
-            <type>string</type>
-            <default></default>
+            <type>texture</type>
+            <default>tp_quit.tga</default>
         </property>
         <property>
             <name>tx_pushed</name>
-            <type>string</type>
-            <default></default>
+            <type>texture</type>
+            <default>tp_quit.tga</default>
         </property>
         <property>
             <name>tx_over</name>
-            <type>string</type>
-            <default></default>
+            <type>texture</type>
+            <default>tp_quit.tga</default>
         </property>
         <property>
             <name>scale</name>
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml
index ea2ba6171..7ab3e2f48 100644
--- a/code/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml
@@ -2,6 +2,7 @@
     <header>
         <name>CtrlColPick</name>
         <guiname>CCtrlColPick</guiname>
+		<classname>colpick</classname>
         <ancestor>CtrlBase</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml
index 1ad970f31..9f5fcfc60 100644
--- a/code/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml
@@ -2,6 +2,7 @@
     <header>
         <name>CtrlScroll</name>
         <guiname>CCtrlScroll</guiname>
+		<classname>scroll</classname>
         <ancestor>CtrlBase</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml
index ca66dbd62..6afd06cdf 100644
--- a/code/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml
@@ -2,6 +2,7 @@
     <header>
         <name>CtrlTextButton</name>
         <guiname>CCtrlTextButton</guiname>
+		<classname>text_button</classname>
         <ancestor>CtrlBaseButton</ancestor>
         <description></description>
         <abstract>false</abstract>
@@ -11,22 +12,22 @@
         <property>
             <name>tx_normal</name>
             <type>string</type>
-            <default></default>
+            <default>but</default>
         </property>
         <property>
             <name>tx_pushed</name>
             <type>string</type>
-            <default></default>
+            <default>but</default>
         </property>
         <property>
             <name>tx_over</name>
             <type>string</type>
-            <default></default>
+            <default>but_over</default>
         </property>
         <property>
             <name>hardtext</name>
             <type>string</type>
-            <default></default>
+            <default>push me</default>
         </property>
         <property>
             <name>wmargin</name>
@@ -156,7 +157,7 @@
         <property>
             <name>line_maxw</name>
             <type>int</type>
-            <default>0</default>
+            <default>100</default>
         </property>
         <property>
             <name>multi_line_space</name>
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml b/code/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
index 624ded887..7d78fc6b9 100644
--- a/code/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
@@ -2,6 +2,7 @@
     <header>
         <name>DBGroupSelectNumber</name>
         <guiname>CDBGroupSelectNumber</guiname>
+		<classname>select_number</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewBar.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewBar.xml
index c7f644fa4..878f9b563 100644
--- a/code/studio/src/plugins/gui_editor/widgets/DBViewBar.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/DBViewBar.xml
@@ -2,6 +2,7 @@
     <header>
         <name>DBViewBar</name>
         <guiname>CDBViewBar</guiname>
+		<classname>bar</classname>
         <ancestor>ViewBitmap</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml
index 8295c5f30..db635eb27 100644
--- a/code/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml
@@ -2,6 +2,7 @@
     <header>
         <name>DBViewBar3</name>
         <guiname>CDBViewBar3</guiname>
+		<classname>bar3</classname>
         <ancestor>ViewBitmap</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml
index 0c12445f9..1a659fd91 100644
--- a/code/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml
@@ -2,6 +2,7 @@
     <header>
         <name>DBViewDigit</name>
         <guiname>CDBViewDigit</guiname>
+		<classname>digit</classname>
         <ancestor>CtrlBase</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml
index c1861df61..99cc153ce 100644
--- a/code/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml
@@ -2,12 +2,18 @@
     <header>
         <name>DBViewNumber</name>
         <guiname>CDBViewNumber</guiname>
+		<classname>text_number</classname>
         <ancestor>ViewText</ancestor>
         <description></description>
         <abstract>false</abstract>
         <icon></icon>
     </header>
     <properties>
+		<property>
+			<name>hardtext</name>
+            <type>string</type>
+            <default>0</default>
+		</property>
         <property>
             <name>value</name>
             <type>string</type>
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml
index c24379c96..c11c1a4cc 100644
--- a/code/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml
@@ -2,6 +2,7 @@
     <header>
         <name>DBViewQuantity</name>
         <guiname>CDBViewQuantity</guiname>
+		<classname>text_quantity</classname>
         <ancestor>ViewText</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupContainer.xml b/code/studio/src/plugins/gui_editor/widgets/GroupContainer.xml
index 3d879a150..a3c9aade7 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupContainer.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupContainer.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupContainer</name>
         <guiname>CGroupContainer</guiname>
+		<classname>container</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml b/code/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml
index 31ca205c7..578262a20 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupEditBox</name>
         <guiname>CGroupEditBox</guiname>
+		<classname>edit_box</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupEditBoxDecor.xml b/code/studio/src/plugins/gui_editor/widgets/GroupEditBoxDecor.xml
new file mode 100644
index 000000000..67865e707
--- /dev/null
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupEditBoxDecor.xml
@@ -0,0 +1,68 @@
+<widget>
+    <header>
+        <name>GroupEditBoxDecor</name>
+        <guiname>CGroupEditBoxDecor</guiname>
+		<classname>edit_box_decor</classname>
+        <ancestor>GroupEditBox</ancestor>
+        <description></description>
+        <abstract>false</abstract>
+        <icon></icon>
+    </header>
+    <properties>
+		<property>
+			<name>w</name>
+			<type>int</type>
+			<default>150</default>
+		</property>
+		<property>
+			<name>h</name>
+			<type>int</type>
+			<default>25</default>
+		</property>
+         <property>
+            <name>tx_tl</name>
+            <type>texture</type>
+            <default>log_eb_tl.tga</default>
+        </property>
+         <property>
+            <name>tx_tm</name>
+            <type>texture</type>
+            <default>log_eb_t.tga</default>
+        </property>
+         <property>
+            <name>tx_tr</name>
+            <type>texture</type>
+            <default>log_eb_tr.tga</default>
+        </property>
+         <property>
+            <name>tx_bl</name>
+            <type>texture</type>
+            <default>log_eb_bl.tga</default>
+        </property>
+         <property>
+            <name>tx_bm</name>
+            <type>texture</type>
+            <default>log_eb_b.tga</default>
+        </property>
+         <property>
+            <name>tx_br</name>
+            <type>texture</type>
+            <default>log_eb_br.tga</default>
+        </property>
+         <property>
+            <name>tx_l</name>
+            <type>texture</type>
+            <default>log_eb_l.tga</default>
+        </property>
+         <property>
+            <name>tx_r</name>
+            <type>texture</type>
+            <default>log_eb_r.tga</default>
+        </property>
+		<property>
+            <name>tx_bg</name>
+            <type>texture</type>
+            <default>log_eb_m.tga</default>
+        </property>
+    </properties>
+</widget>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupHTML.xml b/code/studio/src/plugins/gui_editor/widgets/GroupHTML.xml
index 5f0521be8..894580734 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupHTML.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupHTML.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupHTML</name>
         <guiname>CGroupHTML</guiname>
+		<classname>html</classname>
         <ancestor>GroupScrollText</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupHeader.xml b/code/studio/src/plugins/gui_editor/widgets/GroupHeader.xml
index cc96fd742..91dd73e36 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupHeader.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupHeader.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupHeader</name>
         <guiname>CGroupHeader</guiname>
+		<classname>header</classname>
         <ancestor>GroupList</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupList.xml b/code/studio/src/plugins/gui_editor/widgets/GroupList.xml
index 3ca2db95c..569aa8d9d 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupList.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupList.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupList</name>
         <guiname>CGroupList</guiname>
+		<classname>list</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupMenu.xml b/code/studio/src/plugins/gui_editor/widgets/GroupMenu.xml
index cdd42ba95..3bd0c5506 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupMenu.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupMenu.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupMenu</name>
         <guiname>CGroupMenu</guiname>
+		<classname>menu</classname>
         <ancestor>GroupModal</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupModal.xml b/code/studio/src/plugins/gui_editor/widgets/GroupModal.xml
index 034e3025e..33bd6fd08 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupModal.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupModal.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupModal</name>
         <guiname>CGroupModal</guiname>
+		<classname>modal</classname>
         <ancestor>GroupFrame</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml b/code/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml
index 95719398d..53092a456 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupScrollText</name>
         <guiname>CGroupScrollText</guiname>
+		<classname>scroll_text</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupTab.xml b/code/studio/src/plugins/gui_editor/widgets/GroupTab.xml
index df148a0a3..e2e1a8bf1 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupTab.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupTab.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupTab</name>
         <guiname>CGroupTab</guiname>
+		<classname>tab</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupTable.xml b/code/studio/src/plugins/gui_editor/widgets/GroupTable.xml
index 9fa957741..dfbc4e2a8 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupTable.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupTable.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupTable</name>
         <guiname>CGroupTable</guiname>
+		<classname>table</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupTree.xml b/code/studio/src/plugins/gui_editor/widgets/GroupTree.xml
index 73b1dea3b..b20c74733 100644
--- a/code/studio/src/plugins/gui_editor/widgets/GroupTree.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/GroupTree.xml
@@ -2,6 +2,7 @@
     <header>
         <name>GroupTree</name>
         <guiname>CGroupTree</guiname>
+		<classname>tree</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml b/code/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml
index ddcdf01e6..50f7c3e83 100644
--- a/code/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml
@@ -2,6 +2,7 @@
     <header>
         <name>InterfaceGroup</name>
         <guiname>CInterfaceGroup</guiname>
+		<classname>interface_group</classname>
         <ancestor>CtrlBase</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml b/code/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
index b095ecac5..6a35671cd 100644
--- a/code/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
@@ -2,6 +2,7 @@
     <header>
         <name>InterfaceGroupWheel</name>
         <guiname>CInterfaceGroupWheel</guiname>
+		<classname>group_wheel</classname>
         <ancestor>InterfaceGroup</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml b/code/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml
index 21ef7daff..1c22d67cd 100644
--- a/code/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml
@@ -2,6 +2,7 @@
     <header>
         <name>ViewBitmap</name>
         <guiname>CViewBitmap</guiname>
+		<classname>bitmap</classname>
         <ancestor>CtrlBase</ancestor>
         <description></description>
         <abstract>false</abstract>
@@ -36,7 +37,7 @@
         <property>
             <name>texture</name>
             <type>texture</type>
-            <default></default>
+            <default>log_kami.tga</default>
         </property>
         <property>
             <name>scale</name>
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml b/code/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
index 8fc579675..461f69c55 100644
--- a/code/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
@@ -2,6 +2,7 @@
     <header>
         <name>ViewBitmapCombo</name>
         <guiname>CViewBitmapCombo</guiname>
+		<classname>bitmap_combo</classname>
         <ancestor>CtrlBase</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewText.xml b/code/studio/src/plugins/gui_editor/widgets/ViewText.xml
index 415c3167e..4862517aa 100644
--- a/code/studio/src/plugins/gui_editor/widgets/ViewText.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/ViewText.xml
@@ -2,6 +2,7 @@
     <header>
         <name>ViewText</name>
         <guiname>CViewText</guiname>
+		<classname>text</classname>
         <ancestor>InterfaceElement</ancestor>
         <description></description>
         <abstract>false</abstract>
@@ -46,7 +47,7 @@
         <property>
             <name>line_maxw</name>
             <type>int</type>
-            <default>0</default>
+            <default>100</default>
         </property>
         <property>
             <name>multi_line_space</name>
@@ -101,7 +102,7 @@
         <property>
             <name>hardtext</name>
             <type>string</type>
-            <default></default>
+            <default>Some text</default>
         </property>
         <property>
             <name>hardtext_format</name>
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml b/code/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml
index cabd081f0..36aa68102 100644
--- a/code/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml
@@ -2,6 +2,7 @@
     <header>
         <name>ViewTextFormated</name>
         <guiname>CViewTextFormated</guiname>
+		<classname>text_formated</classname>
         <ancestor>ViewText</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewTextID.xml b/code/studio/src/plugins/gui_editor/widgets/ViewTextID.xml
index 52e010ec6..43ac442c0 100644
--- a/code/studio/src/plugins/gui_editor/widgets/ViewTextID.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/ViewTextID.xml
@@ -2,6 +2,7 @@
     <header>
         <name>ViewTextID</name>
         <guiname>CViewTextID</guiname>
+		<classname>text_id</classname>
         <ancestor>ViewText</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml b/code/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
index af8dd54eb..32b08f156 100644
--- a/code/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
+++ b/code/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
@@ -2,6 +2,7 @@
     <header>
         <name>ViewTextIDFormated</name>
         <guiname>CViewTextIDFormated</guiname>
+		<classname>text_id_formated</classname>
         <ancestor>ViewTextID</ancestor>
         <description></description>
         <abstract>false</abstract>
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp b/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp
index 10985aa38..efadd3949 100644
--- a/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp
+++ b/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp
@@ -484,6 +484,11 @@ void MissionCompilerMainWindow::saveConfig() {
 	settings->sync();
 }
 
+void MissionCompilerMainWindow::onActivated()
+{
+    NLLIGO::CPrimitiveContext::instance().CurrentLigoConfig = &m_ligoConfig;
+}
+
 void MissionCompilerMainWindow::handleChangedSettings()
 {
 	QStringList servers;
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.h b/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.h
index dc19db1c6..3d59e206a 100644
--- a/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.h
+++ b/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.h
@@ -31,6 +31,8 @@ public:
 	void saveConfig();
 	QUndoStack *getUndoStack() { return m_undoStack; }
 
+    void onActivated();
+
 	typedef std::map<std::string, CMission> TMissionContainer;
 
 public Q_SLOTS:
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_plugin.h b/code/studio/src/plugins/mission_compiler/mission_compiler_plugin.h
index 2ad92b40f..cc2cac47c 100644
--- a/code/studio/src/plugins/mission_compiler/mission_compiler_plugin.h
+++ b/code/studio/src/plugins/mission_compiler/mission_compiler_plugin.h
@@ -83,6 +83,12 @@ public:
     virtual void open() {}
 
 
+    void onActivated()
+    {
+        m_missionCompilerMainWindow->onActivated();
+    }
+
+
 	MissionCompilerMainWindow *m_missionCompilerMainWindow;
 };
 
diff --git a/code/studio/src/plugins/object_viewer/object_viewer.cpp b/code/studio/src/plugins/object_viewer/object_viewer.cpp
index 566869e84..240a0d9e9 100644
--- a/code/studio/src/plugins/object_viewer/object_viewer.cpp
+++ b/code/studio/src/plugins/object_viewer/object_viewer.cpp
@@ -120,7 +120,7 @@ void CObjectViewer::init( NL3D::UDriver *driver )
 
 	NL3D::CBloomEffect::instance().setDriver(_Driver);
 	NL3D::CBloomEffect::instance().setScene(_Scene);
-	NL3D::CBloomEffect::instance().init(!_Direct3D);
+	NL3D::CBloomEffect::instance().init();
 	NL3D::CBloomEffect::instance().setDensityBloom(uint8(_BloomDensity));
 	NL3D::CBloomEffect::instance().setSquareBloom(_BloomSquare);
 
@@ -172,7 +172,7 @@ void CObjectViewer::renderDriver()
 	// Render the scene.
 	if((NL3D::CBloomEffect::instance().getDriver() != 0) && (_BloomEffect))
 	{
-		NL3D::CBloomEffect::instance().initBloom();
+		NL3D::CBloomEffect::instance().init();
 	}
 	_Driver->clearBuffers(_BackgroundColor);
 }
@@ -184,8 +184,7 @@ void CObjectViewer::renderScene()
 
 	if((NL3D::CBloomEffect::instance().getDriver() != 0) && (_BloomEffect))
 	{
-		NL3D::CBloomEffect::instance().endBloom();
-		NL3D::CBloomEffect::instance().endInterfacesDisplayBloom();
+		NL3D::CBloomEffect::instance().applyBloom();
 	}
 }
 
diff --git a/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp b/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
index dce7ad08f..a4c948140 100644
--- a/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
+++ b/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
@@ -8,6 +8,7 @@
 
 // NeL includes
 #include "nel/misc/debug.h"
+#include "nel/3d/init_3d.h"
 
 // Qt includes
 #include <QtCore/QObject>
@@ -32,6 +33,8 @@ bool ObjectViewerPlugin::initialize(ExtensionSystem::IPluginManager *pluginManag
 {
 	Q_UNUSED(errorString);
 	_plugMan = pluginManager;
+
+	NL3D::init3d();
 	Modules::init();
 	addAutoReleasedObject(new CObjectViewerContext());
 	addAutoReleasedObject(new GraphicsSettingsPage());
diff --git a/code/studio/src/plugins/tile_editor/CMakeLists.txt b/code/studio/src/plugins/tile_editor/CMakeLists.txt
index 78cc5ef49..bfb9f3440 100644
--- a/code/studio/src/plugins/tile_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/tile_editor/CMakeLists.txt
@@ -46,5 +46,18 @@ NL_ADD_LIB_SUFFIX(studio_plugin_tile_editor)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
-INSTALL(TARGETS studio_plugin_tile_editor LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d)
+IF(WIN32)
+  IF(WITH_INSTALL_LIBRARIES)
+    INSTALL(TARGETS studio_plugin_tile_editor LIBRARY DESTINATION ${OVQT_PLUGIN_DIR} ARCHIVE DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${OVQT_PLUGIN_DIR} COMPONENT tools3d)
+  ELSE(WITH_INSTALL_LIBRARIES)
+    INSTALL(TARGETS studio_plugin_tile_editor LIBRARY DESTINATION ${OVQT_PLUGIN_DIR} RUNTIME DESTINATION ${OVQT_PLUGIN_DIR} COMPONENT tools3d)
+  ENDIF(WITH_INSTALL_LIBRARIES)
+ELSE(WIN32)
+  IF(WITH_INSTALL_LIBRARIES)
+    INSTALL(TARGETS studio_plugin_tile_editor LIBRARY DESTINATION ${OVQT_PLUGIN_DIR} ARCHIVE DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
+  ELSE(WITH_INSTALL_LIBRARIES)
+    INSTALL(TARGETS studio_plugin_tile_editor LIBRARY DESTINATION ${OVQT_PLUGIN_DIR} RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
+  ENDIF(WITH_INSTALL_LIBRARIES)
+ENDIF(WIN32)
+
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_tile_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
diff --git a/code/studio/src/plugins/world_editor/world_editor_misc.cpp b/code/studio/src/plugins/world_editor/world_editor_misc.cpp
index 5d6b7f94e..a2736b1c5 100644
--- a/code/studio/src/plugins/world_editor/world_editor_misc.cpp
+++ b/code/studio/src/plugins/world_editor/world_editor_misc.cpp
@@ -59,6 +59,8 @@ bool loadWorldEditFile(const std::string &fileName, WorldEditList &worldEditList
 
 	lastError = "";
 
+	std::string p = NLMISC::CFile::getPath( fileName );
+
 	// Load the document
 	NLMISC::CIFile file;
 	if (file.open(fileName))
@@ -122,6 +124,8 @@ bool loadWorldEditFile(const std::string &fileName, WorldEditList &worldEditList
 								{
 									std::string dataDir;
 									NLMISC::CIXml::getPropertyString(dataDir, node, "VALUE");
+
+									dataDir = NLMISC::CPath::makePathAbsolute( dataDir, p );
 									worldEditList.push_back(WorldEditItem(DataDirectoryType, dataDir));
 								}
 
@@ -149,6 +153,9 @@ bool loadWorldEditFile(const std::string &fileName, WorldEditList &worldEditList
 											std::string filenameChild;
 											if ( NLMISC::CIXml::getPropertyString(filenameChild, node, "FILENAME"))
 											{
+
+												filenameChild = NLMISC::CPath::makePathAbsolute( filenameChild, p );
+
 												// Is it a landscape ?
 												if (type == "landscape")
 												{
diff --git a/code/studio/src/plugins/world_editor/world_editor_plugin.cpp b/code/studio/src/plugins/world_editor/world_editor_plugin.cpp
index 3170bce60..9b9622d00 100644
--- a/code/studio/src/plugins/world_editor/world_editor_plugin.cpp
+++ b/code/studio/src/plugins/world_editor/world_editor_plugin.cpp
@@ -54,36 +54,6 @@ bool WorldEditorPlugin::initialize(ExtensionSystem::IPluginManager *pluginManage
 
 	WorldEditorSettingsPage *weSettings = new WorldEditorSettingsPage(this);
 	addAutoReleasedObject(weSettings);
-
-	QSettings *settings = Core::ICore::instance()->settings();
-	settings->beginGroup(Constants::WORLD_EDITOR_SECTION);
-	m_ligoConfig.CellSize = settings->value(Constants::WORLD_EDITOR_CELL_SIZE, "160").toFloat();
-	m_ligoConfig.Snap = settings->value(Constants::WORLD_EDITOR_SNAP, "1").toFloat();
-	m_ligoConfig.ZoneSnapShotRes = settings->value(Constants::ZONE_SNAPSHOT_RES, "128").toUInt();
-	QString fileName = settings->value(Constants::PRIMITIVE_CLASS_FILENAME, "world_editor_classes.xml").toString();
-	settings->endGroup();
-	try
-	{
-		// Search path of file world_editor_classes.xml
-		std::string ligoPath = NLMISC::CPath::lookup(fileName.toUtf8().constData());
-		// Init LIGO
-		m_ligoConfig.readPrimitiveClass(ligoPath.c_str(), true);
-		NLLIGO::Register();
-		NLLIGO::CPrimitiveContext::instance().CurrentLigoConfig = &m_ligoConfig;
-	}
-	catch (NLMISC::Exception &e)
-	{
-		*errorString = tr("(%1)").arg(e.what());
-		return false;
-	}
-
-	// Reset
-	m_ligoConfig.resetPrimitiveConfiguration ();
-
-	// TODO: get file names! from settings
-	m_ligoConfig.readPrimitiveClass("world_editor_primitive_configuration.xml", true);
-
-
 	addAutoReleasedObject(new WorldEditorContext(this));
 	return true;
 }
@@ -116,6 +86,33 @@ WorldEditorContext::WorldEditorContext(QObject *parent)
 	: IContext(parent),
 	  m_worldEditorWindow(0)
 {
+	QSettings *settings = Core::ICore::instance()->settings();
+    settings->beginGroup(Constants::WORLD_EDITOR_SECTION);
+    m_ligoConfig.CellSize = settings->value(Constants::WORLD_EDITOR_CELL_SIZE, "160").toFloat();
+    m_ligoConfig.Snap = settings->value(Constants::WORLD_EDITOR_SNAP, "1").toFloat();
+    m_ligoConfig.ZoneSnapShotRes = settings->value(Constants::ZONE_SNAPSHOT_RES, "128").toUInt();
+    QString fileName = settings->value(Constants::PRIMITIVE_CLASS_FILENAME, "world_editor_classes.xml").toString();
+    settings->endGroup();
+    try
+    {
+        // Search path of file world_editor_classes.xml
+        std::string ligoPath = NLMISC::CPath::lookup(fileName.toUtf8().constData());
+        // Init LIGO
+        m_ligoConfig.readPrimitiveClass(ligoPath.c_str(), true);
+        NLLIGO::Register();
+        NLLIGO::CPrimitiveContext::instance().CurrentLigoConfig = &m_ligoConfig;
+    }
+    catch (NLMISC::Exception &e)
+    {
+        nlinfo( "Error starting LIGO." );
+    }
+
+    // Reset
+    m_ligoConfig.resetPrimitiveConfiguration ();
+
+    // TODO: get file names! from settings
+    m_ligoConfig.readPrimitiveClass("world_editor_primitive_configuration.xml", true);
+
 	m_worldEditorWindow = new WorldEditorWindow();
 }
 
@@ -124,6 +121,11 @@ QUndoStack *WorldEditorContext::undoStack()
 	return m_worldEditorWindow->undoStack();
 }
 
+void WorldEditorContext::onActivated()
+{
+    NLLIGO::CPrimitiveContext::instance().CurrentLigoConfig = &m_ligoConfig;
+}
+
 void WorldEditorContext::open()
 {
 	m_worldEditorWindow->open();
@@ -136,4 +138,4 @@ QWidget *WorldEditorContext::widget()
 
 }
 
-Q_EXPORT_PLUGIN(WorldEditor::WorldEditorPlugin)
\ No newline at end of file
+Q_EXPORT_PLUGIN(WorldEditor::WorldEditorPlugin)
diff --git a/code/studio/src/plugins/world_editor/world_editor_plugin.h b/code/studio/src/plugins/world_editor/world_editor_plugin.h
index 686b87e14..cfb5448e3 100644
--- a/code/studio/src/plugins/world_editor/world_editor_plugin.h
+++ b/code/studio/src/plugins/world_editor/world_editor_plugin.h
@@ -59,7 +59,6 @@ protected:
 	NLMISC::CLibraryContext *m_libContext;
 
 private:
-	NLLIGO::CLigoConfig m_ligoConfig;
 	ExtensionSystem::IPluginManager *m_plugMan;
 	QList<QObject *> m_autoReleaseObjects;
 };
@@ -88,9 +87,14 @@ public:
 
 	virtual QUndoStack *undoStack();
 
+    void onActivated();
+
 	virtual QWidget *widget();
 
 	WorldEditorWindow *m_worldEditorWindow;
+
+private:
+    NLLIGO::CLigoConfig m_ligoConfig;
 };
 
 } // namespace WorldEditor
diff --git a/code/studio/src/plugins/world_editor/world_editor_settings_page.cpp b/code/studio/src/plugins/world_editor/world_editor_settings_page.cpp
index bb8ef2a00..d3b8bb849 100644
--- a/code/studio/src/plugins/world_editor/world_editor_settings_page.cpp
+++ b/code/studio/src/plugins/world_editor/world_editor_settings_page.cpp
@@ -17,9 +17,11 @@
 // Project includes
 #include "world_editor_settings_page.h"
 #include "world_editor_constants.h"
+#include "../core/icore.h"
 
 // Qt includes
 #include <QtGui/QWidget>
+#include <QSettings>
 
 // NeL includes
 
@@ -61,11 +63,31 @@ QWidget *WorldEditorSettingsPage::createPage(QWidget *parent)
 {
 	m_currentPage = new QWidget(parent);
 	m_ui.setupUi(m_currentPage);
+	readSettings();
+
 	return m_currentPage;
 }
 
+void WorldEditorSettingsPage::readSettings()
+{
+	QSettings *settings = Core::ICore::instance()->settings();
+	settings->beginGroup(Constants::WORLD_EDITOR_SECTION);
+	bool b = false;
+
+	b = settings->value( Constants::WORLD_EDITOR_USE_OPENGL, true ).toBool();
+	m_ui.glCB->setChecked( b );
+
+	settings->endGroup();
+}
+
 void WorldEditorSettingsPage::apply()
 {
+	QSettings *settings = Core::ICore::instance()->settings();
+	settings->beginGroup(Constants::WORLD_EDITOR_SECTION);
+	bool b = false;
+	b = m_ui.glCB->isChecked();
+	settings->setValue( Constants::WORLD_EDITOR_USE_OPENGL, b );
+	settings->endGroup();
 }
 
 } /* namespace WorldEditor */
\ No newline at end of file
diff --git a/code/studio/src/plugins/world_editor/world_editor_settings_page.h b/code/studio/src/plugins/world_editor/world_editor_settings_page.h
index aa7677b9f..7eeb30e1d 100644
--- a/code/studio/src/plugins/world_editor/world_editor_settings_page.h
+++ b/code/studio/src/plugins/world_editor/world_editor_settings_page.h
@@ -46,6 +46,7 @@ public:
 	QIcon categoryIcon() const;
 	virtual QWidget *createPage(QWidget *parent);
 
+	virtual void readSettings();
 	virtual void apply();
 	virtual void finish() {}
 
diff --git a/code/studio/src/plugins/world_editor/world_editor_settings_page.ui b/code/studio/src/plugins/world_editor/world_editor_settings_page.ui
index 9219da6c4..a5cb12559 100644
--- a/code/studio/src/plugins/world_editor/world_editor_settings_page.ui
+++ b/code/studio/src/plugins/world_editor/world_editor_settings_page.ui
@@ -3,7 +3,7 @@
  <class>WorldEditorSettingsPage</class>
  <widget class="QWidget" name="WorldEditorSettingsPage">
   <property name="enabled">
-   <bool>false</bool>
+   <bool>true</bool>
   </property>
   <property name="geometry">
    <rect>
@@ -25,6 +25,9 @@
    </property>
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
      <property name="title">
       <string>Workspace</string>
      </property>
@@ -37,10 +40,18 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QSpinBox" name="spinBox_3"/>
+       <widget class="QSpinBox" name="spinBox_3">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="0" column="2">
-       <widget class="QSpinBox" name="spinBox_4"/>
+       <widget class="QSpinBox" name="spinBox_4">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_5">
@@ -50,15 +61,32 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QSpinBox" name="spinBox_5"/>
+       <widget class="QSpinBox" name="spinBox_5">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="1" column="2">
-       <widget class="QSpinBox" name="spinBox_6"/>
+       <widget class="QSpinBox" name="spinBox_6">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="2" column="0" colspan="3">
-       <widget class="QCheckBox" name="checkBox">
+       <widget class="QCheckBox" name="glCB">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
         <property name="text">
-         <string>Use OpenGL</string>
+         <string>Use OpenGL ( requires restart )</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
         </property>
        </widget>
       </item>
@@ -79,7 +107,11 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QSpinBox" name="spinBox"/>
+       <widget class="QSpinBox" name="spinBox">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
@@ -89,7 +121,11 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QSpinBox" name="spinBox_2"/>
+       <widget class="QSpinBox" name="spinBox_2">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_3">
@@ -101,10 +137,17 @@
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <widget class="QLineEdit" name="lineEdit"/>
+         <widget class="QLineEdit" name="lineEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+         </widget>
         </item>
         <item>
          <widget class="QToolButton" name="toolButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
           <property name="text">
            <string>...</string>
           </property>
diff --git a/code/studio/src/plugins/world_editor/world_editor_window.cpp b/code/studio/src/plugins/world_editor/world_editor_window.cpp
index cec3baee1..6dbd07a8a 100644
--- a/code/studio/src/plugins/world_editor/world_editor_window.cpp
+++ b/code/studio/src/plugins/world_editor/world_editor_window.cpp
@@ -436,6 +436,7 @@ void WorldEditorWindow::writeSettings()
 	settings->beginGroup(Constants::WORLD_EDITOR_SECTION);
 	settings->setValue(Constants::WORLD_WINDOW_STATE, saveState());
 	settings->setValue(Constants::WORLD_WINDOW_GEOMETRY, saveGeometry());
+	settings->setValue(Constants::WORLD_EDITOR_USE_OPENGL, settings->value(Constants::WORLD_EDITOR_USE_OPENGL));
 	settings->endGroup();
 	settings->sync();
 }
diff --git a/code/studio/src/plugins/world_editor/world_editor_window.h b/code/studio/src/plugins/world_editor/world_editor_window.h
index 60a6a988a..9080187f9 100644
--- a/code/studio/src/plugins/world_editor/world_editor_window.h
+++ b/code/studio/src/plugins/world_editor/world_editor_window.h
@@ -46,6 +46,7 @@ public:
 	~WorldEditorWindow();
 
 	QUndoStack *undoStack() const;
+    void onActivated();
 	void maybeSave();
 
 Q_SIGNALS:
diff --git a/code/studio/src/settings_dialog.cpp b/code/studio/src/startup_settings_dlg.cpp
similarity index 83%
rename from code/studio/src/settings_dialog.cpp
rename to code/studio/src/startup_settings_dlg.cpp
index 78773a666..645df7040 100644
--- a/code/studio/src/settings_dialog.cpp
+++ b/code/studio/src/startup_settings_dlg.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "settings_dialog.h"
+#include "startup_settings_dlg.h"
 #include <QFileDialog>
 #include <QSettings>
 #include <QStringList>
@@ -32,7 +32,7 @@ int findListItem( QListWidget *l, const QString &s )
 	return -1;
 }
 
-SettingsDialog::SettingsDialog( QDialog *parent ) :
+StartupSettingsDlg::StartupSettingsDlg( QDialog *parent ) :
 QDialog( parent )
 {
 	setupUi( this );
@@ -40,11 +40,11 @@ QDialog( parent )
 	settings = NULL;
 }
 
-SettingsDialog::~SettingsDialog()
+StartupSettingsDlg::~StartupSettingsDlg()
 {
 }
 
-void SettingsDialog::load()
+void StartupSettingsDlg::load()
 {
 	pluginsLE->setText( settings->value( "PluginPath" ).toString() );
 
@@ -82,7 +82,7 @@ void SettingsDialog::load()
 	settings->endGroup();
 }
 
-void SettingsDialog::saveSearchPaths()
+void StartupSettingsDlg::saveSearchPaths()
 {
 	QStringList l;
 	for( int i = 0; i < searchLW->count(); i++ )
@@ -93,7 +93,7 @@ void SettingsDialog::saveSearchPaths()
 	settings->setValue( "SearchPaths", l );
 }
 
-void SettingsDialog::saveRecursivePaths()
+void StartupSettingsDlg::saveRecursivePaths()
 {
 	QStringList l;
 	for( int i = 0; i < recursiveLW->count(); i++ )
@@ -104,7 +104,7 @@ void SettingsDialog::saveRecursivePaths()
 	settings->setValue( "RecursiveSearchPathes", l );
 }
 
-void SettingsDialog::save()
+void StartupSettingsDlg::save()
 {
 	settings->setValue( "PluginPath", pluginsLE->text() );
 
@@ -123,58 +123,59 @@ void SettingsDialog::save()
 	settings->sync();
 }
 
-void SettingsDialog::accept()
+void StartupSettingsDlg::accept()
 {
 	save();
 	QDialog::accept();
 }
 
-void SettingsDialog::reject()
+void StartupSettingsDlg::reject()
 {
 	QDialog::reject();
 }
 
-void SettingsDialog::onOKClicked()
+void StartupSettingsDlg::onOKClicked()
 {
 	accept();
 }
 
-void SettingsDialog::onCancelClicked()
+void StartupSettingsDlg::onCancelClicked()
 {
 	reject();
 }
 
-void SettingsDialog::onPluginBClicked()
+void StartupSettingsDlg::onPluginBClicked()
 {
 	QString p = QFileDialog::getExistingDirectory( this, tr( "Plugins directory" ), "" );
 	pluginsLE->setText( p );
 }
 
-void SettingsDialog::onSheetsBClicked()
+void StartupSettingsDlg::onSheetsBClicked()
 {
 	QString p = QFileDialog::getExistingDirectory( this, tr( "Sheets directory" ), "" );
 	sheetsLE->setText( p );
 }
 
-void SettingsDialog::onAssetsBClicked()
+void StartupSettingsDlg::onAssetsBClicked()
 {
 	QString p = QFileDialog::getExistingDirectory( this, tr( "Assets directory" ), "" );
 	assetsLE->setText( p );
 }
 
-void SettingsDialog::onPrimitivesBClicked()
+void StartupSettingsDlg::onPrimitivesBClicked()
 {
 	QString p = QFileDialog::getExistingDirectory( this, tr( "Primitives directory" ), "" );
 	primitivesLE->setText( p );
 }
 
-void SettingsDialog::onLigoBClicked()
+void StartupSettingsDlg::onLigoBClicked()
 {
-	QString p = QFileDialog::getExistingDirectory( this, tr( "LIGO directory" ), "" );
+    QString p;
+    p = QFileDialog::getOpenFileName( this, tr( "LIGO config file" ), "" );
 	ligoLE->setText( p );
 }
 
-void SettingsDialog::onPathAddClicked()
+void StartupSettingsDlg::onPathAddClicked()
 {
 	QString p = QFileDialog::getExistingDirectory( this, tr( "Search path" ), "" );
 	if( p.isEmpty() )
@@ -186,7 +187,7 @@ void SettingsDialog::onPathAddClicked()
 	searchLW->addItem( p );
 }
 
-void SettingsDialog::onPathRemoveClicked()
+void StartupSettingsDlg::onPathRemoveClicked()
 {
 	QListWidgetItem *i = searchLW->currentItem();
 	if( i == NULL )
@@ -195,7 +196,7 @@ void SettingsDialog::onPathRemoveClicked()
 	delete i;
 }
 
-void SettingsDialog::onRecursiveAddClicked()
+void StartupSettingsDlg::onRecursiveAddClicked()
 {
 	QString p = QFileDialog::getExistingDirectory( this, tr( "Recursive search path" ), "" );
 	if( p.isEmpty() )
@@ -207,7 +208,7 @@ void SettingsDialog::onRecursiveAddClicked()
 	recursiveLW->addItem( p );
 }
 
-void SettingsDialog::onRecursiveRemoveClicked()
+void StartupSettingsDlg::onRecursiveRemoveClicked()
 {
 	QListWidgetItem *i = recursiveLW->currentItem();
 	if( i == NULL )
@@ -217,7 +218,7 @@ void SettingsDialog::onRecursiveRemoveClicked()
 }
 
 
-void SettingsDialog::setupConnections()
+void StartupSettingsDlg::setupConnections()
 {
 	connect( bb, SIGNAL( accepted() ), this, SLOT( onOKClicked() ) );
 	connect( bb, SIGNAL( rejected() ), this, SLOT( onCancelClicked() ) );
diff --git a/code/studio/src/settings_dialog.h b/code/studio/src/startup_settings_dlg.h
similarity index 84%
rename from code/studio/src/settings_dialog.h
rename to code/studio/src/startup_settings_dlg.h
index 173ba37d4..49dd01ef7 100644
--- a/code/studio/src/settings_dialog.h
+++ b/code/studio/src/startup_settings_dlg.h
@@ -14,19 +14,19 @@
 // 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/>.
 
-#ifndef SETTINGS_DIALOG_H
-#define SETTINGS_DIALOG_H
+#ifndef STARTUP_SETTINGS_DIALOG_H
+#define STARTUP_SETTINGS_DIALOG_H
 
-#include "ui_settings_dialog.h"
+#include "ui_startup_settings_dlg.h"
 
 class QSettings;
 
-class SettingsDialog : public QDialog, public Ui::SettingsDialog
+class StartupSettingsDlg : public QDialog, public Ui::StartupSettingsDlg
 {
 	Q_OBJECT
 public:
-	SettingsDialog( QDialog *parent = NULL );
-	~SettingsDialog();
+	StartupSettingsDlg( QDialog *parent = NULL );
+	~StartupSettingsDlg();
 
 	void setSettings( QSettings *s ){ settings = s; }
 
diff --git a/code/studio/src/settings_dialog.ui b/code/studio/src/startup_settings_dlg.ui
similarity index 95%
rename from code/studio/src/settings_dialog.ui
rename to code/studio/src/startup_settings_dlg.ui
index 2fb6151d3..5f125ed14 100644
--- a/code/studio/src/settings_dialog.ui
+++ b/code/studio/src/startup_settings_dlg.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog">
+ <class>StartupSettingsDlg</class>
+ <widget class="QDialog" name="StartupSettingsDlg">
   <property name="windowModality">
    <enum>Qt::ApplicationModal</enum>
   </property>
diff --git a/code/web/private_php/ams/autoload/ticket_user.php b/code/web/private_php/ams/autoload/ticket_user.php
index 6de69ccdd..a52ffaec8 100644
--- a/code/web/private_php/ams/autoload/ticket_user.php
+++ b/code/web/private_php/ams/autoload/ticket_user.php
@@ -20,8 +20,18 @@ class Ticket_User{
     * @param $permission the permission that will be given to the user. 1=user, 2=mod, 3=admin
     */
     public static function createTicketUser( $extern_id, $permission) {
-        $dbl = new DBLayer("lib");
-		$dbl->insert("ticket_user",array('TUserId' => $extern_id, 'Permission' => $permission, 'ExternId' => $extern_id));
+          try {
+               //make connection with and put into db
+               $dbl = new DBLayer("lib");
+               $dbl->insert("ticket_user",array('TUserId' => $extern_id, 'Permission' => $permission, 'ExternId' => $extern_id));
+          }
+          catch (PDOException $e) {
+                //oh noooz...
+                //error_log(print_r($e, true));
+                //print_r($e);
+                echo "Problem creating user in database!";
+          }
+		
     }
 
 
diff --git a/code/web/private_php/ams/autoload/users.php b/code/web/private_php/ams/autoload/users.php
index ffc04ace2..67ed9af88 100644
--- a/code/web/private_php/ams/autoload/users.php
+++ b/code/web/private_php/ams/autoload/users.php
@@ -252,8 +252,8 @@ class Users{
      * @param $length the length of the SALT which is by default 2
      * @return a random salt of 2 chars
      */
-     public static function generateSALT( $length = 2 )
-    {
+     public static function generateSALT( $length = 16 )
+     {
          // start with a blank salt
         $salt = "";
          // define possible characters - any character in this string can be
@@ -282,6 +282,10 @@ class Users{
                  }
              }
          // done!
+        if ($length > 2)
+        {
+             $salt = '$6$'.$salt;
+        }
         return $salt;
      }
 
diff --git a/code/web/private_php/setup/sql/nel_00004.sql b/code/web/private_php/setup/sql/nel_00004.sql
new file mode 100644
index 000000000..8d48a4c8c
--- /dev/null
+++ b/code/web/private_php/setup/sql/nel_00004.sql
@@ -0,0 +1 @@
+ALTER TABLE `user` MODIFY `Password` VARCHAR(106);
diff --git a/code/web/private_php/setup/sql/nel_ams_00002.sql b/code/web/private_php/setup/sql/nel_ams_00002.sql
new file mode 100644
index 000000000..b1a9c9df4
--- /dev/null
+++ b/code/web/private_php/setup/sql/nel_ams_00002.sql
@@ -0,0 +1 @@
+ALTER TABLE `ams_user` MODIFY `Password` VARCHAR(106);
diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00007.sql b/code/web/private_php/setup/sql/nel_ams_lib_00007.sql
new file mode 100644
index 000000000..748793e66
--- /dev/null
+++ b/code/web/private_php/setup/sql/nel_ams_lib_00007.sql
@@ -0,0 +1,2 @@
+INSERT INTO `settings` (`idSettings`, `Setting`, `Value`) VALUES
+(2, 'Domain_Auto_Add', '1');
\ No newline at end of file
diff --git a/code/web/public_php/admin/nel/nel_message.php b/code/web/public_php/admin/nel/nel_message.php
index 5e704bff1..42dd91cbe 100644
--- a/code/web/public_php/admin/nel/nel_message.php
+++ b/code/web/public_php/admin/nel/nel_message.php
@@ -91,9 +91,10 @@
 			}
 			else
 			{
-				$this->serialUInt32(strlen($val));
+				$valLen = strlen($val);
+				$this->serialUInt32($valLen);
 				$this->Buffer .= $val;
-				$this->Pos += strlen($val);
+				$this->Pos += $valLen;
 				debug(sprintf ("write string '%s' %d<br>\n", $val, $this->Pos));
 			}
 		}
diff --git a/code/web/public_php/ams/autoload/webusers.php b/code/web/public_php/ams/autoload/webusers.php
index b01ddf02d..ebc654f5d 100644
--- a/code/web/public_php/ams/autoload/webusers.php
+++ b/code/web/public_php/ams/autoload/webusers.php
@@ -80,7 +80,14 @@ class WebUsers extends Users{
           $dbw = new DBLayer("web");
           $statement = $dbw->select("ams_user", array('value' => $value),"Login=:value OR Email=:value");
           $row = $statement->fetch();
-          $salt = substr($row['Password'],0,2);
+          if ($row['Password'][0] == '$')
+          {
+              $salt = substr($row['Password'], 0, 19);
+          }
+          else
+          {
+              $salt = substr($row['Password'], 0, 2);
+          }
           $hashed_input_pass = crypt($password, $salt);
           if($hashed_input_pass == $row['Password']){
                 return $row;
diff --git a/code/web/public_php/ams/sql/db.sql b/code/web/public_php/ams/sql/db.sql
index ccc214125..b52ae65ed 100644
--- a/code/web/public_php/ams/sql/db.sql
+++ b/code/web/public_php/ams/sql/db.sql
@@ -21,4 +21,4 @@ CREATE TABLE ams_querycache (
     `SID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
     `type` VARCHAR( 64 ) NOT NULL ,
     `query` VARCHAR( 512 ) NOT NULL 
-);
\ No newline at end of file
+);
diff --git a/code/web/public_php/ams/templates/layout.tpl b/code/web/public_php/ams/templates/layout.tpl
index c949263d1..33dbf3be0 100644
--- a/code/web/public_php/ams/templates/layout.tpl
+++ b/code/web/public_php/ams/templates/layout.tpl
@@ -167,7 +167,7 @@
 		</div>
 
 		<footer>
-			{if $permission > 1}<p class="pull-right">AMS 0.10.0 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
+			{if $permission > 1}<p class="pull-right">AMS 0.11.0 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
 		</footer>
 		{/if}
 	</div><!--/.fluid-container-->
diff --git a/code/web/public_php/crash_report/config.inc.php b/code/web/public_php/crash_report/config.inc.php
new file mode 100644
index 000000000..fe4b3e928
--- /dev/null
+++ b/code/web/public_php/crash_report/config.inc.php
@@ -0,0 +1,30 @@
+<?php
+
+// Ryzom Core MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+class BugReportConfig
+{
+	static public $dbhost = "localhost";
+	static public $dbport = "3306";
+	static public $dbdb = "bugs";
+	static public $dbuser = "bugs";
+	static public $dbpw = "bugs";
+}
+
+?>
diff --git a/code/web/public_php/crash_report/log.inc.php b/code/web/public_php/crash_report/log.inc.php
new file mode 100644
index 000000000..71deee24f
--- /dev/null
+++ b/code/web/public_php/crash_report/log.inc.php
@@ -0,0 +1,45 @@
+<?php
+
+// Ryzom Core MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+/// Simple file logger class
+class Logger
+{
+	private $lf = NULL;
+
+	function __construct()
+	{
+		$this->lf = fopen( 'log.txt', 'a' );
+		if( $this->lf === FALSE )
+			exit( 1 );
+	}
+
+	function __destruct()
+	{
+		fclose( $this->lf );
+	}
+
+	public function log( $msg )
+	{
+		$date = date( "[M d, Y H:i:s] " );
+		fwrite( $this->lf, $date . $msg . "\n" );
+	}
+}
+
+?>
diff --git a/code/web/public_php/crash_report/submit.php b/code/web/public_php/crash_report/submit.php
new file mode 100644
index 000000000..d20214d11
--- /dev/null
+++ b/code/web/public_php/crash_report/submit.php
@@ -0,0 +1,112 @@
+<?php
+
+// Ryzom Core MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// 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/>.
+
+require_once( 'config.inc.php' );
+require_once( 'log.inc.php' );
+
+/// Example web application that takes bug reports from the bug reporter Qt app
+class BugReportGatherApp
+{
+	private $db = NULL;
+	private $logger = NULL;
+
+	function __construct()
+	{
+		$this->logger = new Logger();
+	}
+
+	private function logPOSTVars()
+	{
+		$report = "";
+		$descr = "";
+		$email = "";
+
+		if( isset( $_POST[ 'report' ] ) )
+			$report = $_POST[ 'report' ];
+
+		if( isset( $_POST[ 'descr' ] ) )
+			$descr = $_POST[ 'descr' ];
+
+		if( isset( $_POST[ 'email' ] ) )
+			$email = $_POST[ 'email' ];
+
+		$this->logger->log( 'report: ' . "\n" . $report );
+		$this->logger->log( 'description: ' . "\n" . $descr );
+		$this->logger->log( 'email: ' . "\n" . $email );
+	}
+
+	private function buildQuery()
+	{
+		$report = "";
+		$descr = "";
+		$email = "";
+
+		if( isset( $_POST[ 'report' ] ) )
+			$report = $_POST[ 'report' ];
+
+		if( isset( $_POST[ 'descr' ] ) )
+			$descr = $_POST[ 'descr' ];
+
+		if( isset( $_POST[ 'email' ] ) )
+			$email = $_POST[ 'email' ];
+
+		$report = $this->db->real_escape_string( $report );
+		$descr  = $this->db->real_escape_string( $descr );
+		$email  = $this->db->real_escape_string( $email );
+
+
+		$q = "INSERT INTO `bugs` (`report`,`description`,`email`) VALUES (";
+		$q .= "'$report',";
+		$q .= "'$descr',";
+		$q .= "'$email')";
+
+		return $q;
+	}
+
+	public function exec()
+	{
+		//$this->logPOSTVars();
+
+		$this->db = new mysqli( BugReportConfig::$dbhost, BugReportConfig::$dbuser, BugReportConfig::$dbpw, BugReportConfig::$dbdb, BugReportConfig::$dbport );
+		if( mysqli_connect_error() )
+		{
+			$this->logger->log( "Connection error :(" );
+			$this->logger->log( mysqli_connect_error() );
+			return;
+		}
+
+		$q = $this->buildQuery();
+		$result = $this->db->query( $q );
+		if( $result !== TRUE )
+		{
+			$this->logger->log( "Query failed :(" );
+			$this->logger->log( 'Query: ' . $q );
+			$this->logPOSTVars();
+		}		
+
+		$this->db->close();
+	}
+}
+
+
+$app = new BugReportGatherApp();
+$app->exec();
+
+?>
diff --git a/code/web/public_php/login/r2_login.php b/code/web/public_php/login/r2_login.php
index ee4b68819..b0a8a2d79 100644
--- a/code/web/public_php/login/r2_login.php
+++ b/code/web/public_php/login/r2_login.php
@@ -14,6 +14,19 @@
 	include_once('../ring/join_shard.php');
 
 
+    function get_salt($password)
+    {
+        if ($password[0] == '$')
+        {
+            $salt = substr($password, 0, 19);
+        }
+        else
+        {
+            $salt = substr($password, 0, 2);
+        }
+        return $salt;
+    }
+
 	// see errorMsg
 	function errorMsgBlock($errNum=GENERIC_ERROR_NUM) // $mixedArgs
 	{
@@ -132,6 +145,7 @@
 	{
 		$logFile = new CWwwLog();
 		$logFile->logStr("PHP ERROR/$errno $errmsg ($filename:$linenum)");
+		$logFile->logStr("PHP CALLSTACK/" . print_r(debug_backtrace(), TRUE));
 		// Never die after an error
 	}
 
@@ -331,7 +345,7 @@
 		else
 		{
 			$row = mysqli_fetch_assoc ($result);
-			$salt = substr($row["Password"],0,2);
+			$salt = get_salt($row["Password"]);
 			if (($cp && $row["Password"] == $password) || (!$cp && $row["Password"] == crypt($password, $salt)))
 			{
 				// Store the real login (with correct case)
@@ -488,7 +502,7 @@
 		else
 		{
 			$res_array = mysqli_fetch_assoc($result);
-			$salt = substr($res_array['Password'], 0, 2);
+			$salt = get_salt($res_array['Password']);
 		}
 
 		echo "1:".$salt;
diff --git a/code/web/public_php/setup/database.php b/code/web/public_php/setup/database.php
index 6a1b836ea..6137cb00f 100644
--- a/code/web/public_php/setup/database.php
+++ b/code/web/public_php/setup/database.php
@@ -1,12 +1,12 @@
 <?php
 
 // Service
-$db_nel = 3;
+$db_nel = 4;
 $db_nel_tool = 2;
 
 // Support
-$db_nel_ams = 1;
-$db_nel_ams_lib = 6;
+$db_nel_ams = 2;
+$db_nel_ams_lib = 7;
 
 // Domain
 $db_ring_domain = 1;
diff --git a/code/web/public_php/setup/install.php b/code/web/public_php/setup/install.php
index 49fc0b3a7..438a5c332 100644
--- a/code/web/public_php/setup/install.php
+++ b/code/web/public_php/setup/install.php
@@ -42,6 +42,20 @@ require_once('setup/version.php');
 			$continue = false;
 		}
 	}
+    
+	if ($continue) {
+		try {
+            if (!in_array("mysql",PDO::getAvailableDrivers(),TRUE))
+            {
+                throw new PDOException ("Cannot work without a proper database setting up");
+            }
+        }
+        catch (PDOException $pdoEx)
+        {
+            printalert("danger", "PHP PDO seems to be missing the mysql driver");
+			$continue = false;
+        }
+	}    
 
 	// Validate basics
 	if ($continue) {
diff --git a/code/web/public_php/setup/version.php b/code/web/public_php/setup/version.php
index 3204d1e7b..baffede3f 100644
--- a/code/web/public_php/setup/version.php
+++ b/code/web/public_php/setup/version.php
@@ -1,6 +1,6 @@
 <?php
 
 // Increment whenever a web upgrade is required.
-$NEL_SETUP_VERSION = 6;
+$NEL_SETUP_VERSION = 8;
 
 /* end of file */
diff --git a/code/web/public_php/tools/nel_message.php b/code/web/public_php/tools/nel_message.php
index c970b9f2c..b696bb151 100644
--- a/code/web/public_php/tools/nel_message.php
+++ b/code/web/public_php/tools/nel_message.php
@@ -86,9 +86,10 @@
 			}
 			else
 			{
-				$this->serialUInt32(strlen($val));
+				$valLen = strlen($val);
+				$this->serialUInt32($valLen);
 				$this->Buffer .= $val;
-				$this->Pos += strlen($val);
+				$this->Pos += $valLen;
 				debug(sprintf ("write string '%s' %d<br>\n", $val, $this->Pos));
 			}
 		}
@@ -103,7 +104,8 @@
 			}
 			else
 			{
-				$this->serialUInt32($val->toInt());
+				$intValue = $val->toInt();
+				$this->serialUInt32($intValue);
 				debug(sprintf ("write enum '%s' %d<br>\n", $val->toString(), $this->Pos));
 			}
 		}