diff --git a/.hgignore b/.hgignore
index 6871a645f..1c8d9e03c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -158,8 +158,12 @@ code/snowballs/build/*
 code/ryzom/build/*
 code/build/*
 code/build-2010/*
-code/build_linux/*
-code/build_windows/*
+code/build_linux32/*
+code/build_linux64/*
+code/build_windows32/*
+code/build_debian32/*
+code/build_debian64/*
+code/build_mac/*
 build/*
 install/*
 build_vc*
diff --git a/code/CMakeModules/ConfigureChecks.cmake b/code/CMakeModules/ConfigureChecks.cmake
index 3929d65c9..20a53e8b0 100644
--- a/code/CMakeModules/ConfigureChecks.cmake
+++ b/code/CMakeModules/ConfigureChecks.cmake
@@ -47,7 +47,7 @@ MACRO(NL_CONFIGURE_CHECKS)
   SET(COPYRIGHT "${YEAR} ${AUTHOR}")
 
   IF(NOT RYZOM_CLIENT_ICON)
-    SET(RYZOM_CLIENT_ICON "ryzom_client")
+    SET(RYZOM_CLIENT_ICON "khanat_client")
   ENDIF()
 
   CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index bb94560a5..4aa4199e1 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -65,58 +65,58 @@ IF(WITH_RYZOM_CLIENT)
     SET(MAC_RESOURCES_DIR ${CMAKE_SOURCE_DIR}/ryzom/client/macosx)
   ENDIF()
 
-  ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2})
+  ADD_EXECUTABLE(khanat_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2})
 
   IF(APPLE)
-    SET_TARGET_PROPERTIES(ryzom_client PROPERTIES OUTPUT_NAME ${MACOSX_BUNDLE_BUNDLE_NAME})
-    SET_TARGET_PROPERTIES(ryzom_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist)
-    ADD_CUSTOM_COMMAND(TARGET ryzom_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR})
-    ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR})
-    ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/khanat.icns ${RYZOM_RESOURCES_DIR})
-    ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR})
+    SET_TARGET_PROPERTIES(khanat_client PROPERTIES OUTPUT_NAME ${MACOSX_BUNDLE_BUNDLE_NAME})
+    SET_TARGET_PROPERTIES(khanat_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist)
+    ADD_CUSTOM_COMMAND(TARGET khanat_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR})
+    ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR})
+    ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/khanat.icns ${RYZOM_RESOURCES_DIR})
+    ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR})
 
     # remove any present installscript_osx.vdf before signing
-    ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND rm -f ${RYZOM_OUTPUT_DIR}/installscript_osx.vdf)
+    ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND rm -f ${RYZOM_OUTPUT_DIR}/installscript_osx.vdf)
 
     IF(RYZOM_DATA_DIR)
-      ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR})
+      ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR})
     ENDIF()
 
     IF(TARGET crash_report)
-      ADD_DEPENDENCIES(ryzom_client crash_report)
+      ADD_DEPENDENCIES(khanat_client crash_report)
 
       # copy crash_report to bundle
-      ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crash_report ${RYZOM_CONTENTS_DIR}/MacOS/CrashReport)
+      ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crash_report ${RYZOM_CONTENTS_DIR}/MacOS/CrashReport)
 
       IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE)
-        ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/CrashReport" COMMENT "Signing CrashReport executable...")
+        ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/CrashReport" COMMENT "Signing CrashReport executable...")
       ENDIF()
     ENDIF()
 
-    IF(TARGET ryzom_client_patcher)
-      ADD_DEPENDENCIES(ryzom_client ryzom_client_patcher)
+    IF(TARGET khanat_client_patcher)
+      ADD_DEPENDENCIES(khanat_client khanat_client_patcher)
 
-      # copy ryzom_client_patcher to bundle
-      ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_client_patcher ${RYZOM_CONTENTS_DIR}/MacOS/RyzomClientPatcher)
+      # copy khanat_client_patcher to bundle
+      ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/khanat_client_patcher ${RYZOM_CONTENTS_DIR}/MacOS/KhanatClientPatcher)
 
       IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE)
-        ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomClientPatcher" COMMENT "Signing RyzomClientPatcher executable...")
+        ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/KhanatClientPatcher" COMMENT "Signing KhanatClientPatcher executable...")
       ENDIF()
     ENDIF()
 
     IF(TARGET ryzom_configuration_qt)
-      ADD_DEPENDENCIES(ryzom_client ryzom_configuration_qt)
+      ADD_DEPENDENCIES(khanat_client ryzom_configuration_qt)
 
       # copy ryzom_configuration_qt to bundle
-      ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_configuration_qt ${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration)
+      ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_configuration_qt ${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration)
 
       IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE)
-        ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration" COMMENT "Signing RyzomConfiguration executable...")
+        ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration" COMMENT "Signing RyzomConfiguration executable...")
       ENDIF()
     ENDIF()
 
     IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE)
-      ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_OUTPUT_DIR}" COMMENT "Signing Ryzom bundle...")
+      ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_OUTPUT_DIR}" COMMENT "Signing Ryzom bundle...")
     ENDIF()
   ENDIF()
 
@@ -129,7 +129,7 @@ IF(WITH_RYZOM_CLIENT)
         ${ZLIB_INCLUDE_DIR}
   )
 
-  TARGET_LINK_LIBRARIES(ryzom_client
+  TARGET_LINK_LIBRARIES(khanat_client
               nelmisc
               nelnet
               nelligo
@@ -149,40 +149,40 @@ IF(WITH_RYZOM_CLIENT)
   ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
   IF(NOT APPLE AND NOT WIN32)
-    TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
+    TARGET_LINK_LIBRARIES(khanat_client ${X11_LIBRARIES})
   ENDIF()
 
   IF(APPLE)
     FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
-    TARGET_LINK_LIBRARIES(ryzom_client ${FOUNDATION_LIBRARY})
+    TARGET_LINK_LIBRARIES(khanat_client ${FOUNDATION_LIBRARY})
   ENDIF()
 
   ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})
 
-  NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client")
-  NL_ADD_RUNTIME_FLAGS(ryzom_client)
+  NL_DEFAULT_PROPS(khanat_client "Khanat, Client: Khanat Client")
+  NL_ADD_RUNTIME_FLAGS(khanat_client)
 
   IF(FINAL_VERSION)
-    NL_ADD_LIB_SUFFIX(ryzom_client)
+    NL_ADD_LIB_SUFFIX(khanat_client)
   ELSE()
     IF(WIN32)
-      SET_TARGET_PROPERTIES(ryzom_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r")
+      SET_TARGET_PROPERTIES(khanat_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r")
     ELSE()
-      SET_TARGET_PROPERTIES(ryzom_client PROPERTIES POSTFIX "_dev")
+      SET_TARGET_PROPERTIES(khanat_client PROPERTIES POSTFIX "_dev")
     ENDIF()
   ENDIF()
 
   IF(WITH_RYZOM_CLIENT_UAC)
     IF(CMAKE_GENERATOR MATCHES "Visual Studio")
-      SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/level='requireAdministrator'")
+      SET_PROPERTY(TARGET khanat_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'\"")
+      SET_PROPERTY(TARGET khanat_client PROPERTY LINK_FLAGS_RELEASE "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"")
     ENDIF()
   ENDIF()
 
   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)
+    ADD_NATIVE_PRECOMPILED_HEADER(khanat_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
   ENDIF()
 
-  INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications)
+  INSTALL(TARGETS khanat_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications)
 ENDIF()
diff --git a/code/ryzom/client/src/client.rc b/code/ryzom/client/src/client.rc
index 1bf537a1f..ab2bb70a2 100644
--- a/code/ryzom/client/src/client.rc
+++ b/code/ryzom/client/src/client.rc
@@ -193,9 +193,9 @@ BEGIN
 #endif			
 #else
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "ryzom_client_dev_d.exe"
+            VALUE "OriginalFilename", "kkhanat_client_dev_d.exe"
 #else
-            VALUE "OriginalFilename", "ryzom_client_dev_r.exe"
+            VALUE "OriginalFilename", "khanat_client_dev_r.exe"
 #endif			
 #endif
             VALUE "ProductName", "Ryzom Core"
diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp
index 6cdba9602..525a84210 100644
--- a/code/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -877,8 +877,8 @@ class CAHGuildSheetOpen : public IActionHandler
 					ucstring str = toString("%03d", (sint)RT.getRyzomWeek()) + " ";
 					str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + " - ";
 					ucstring year = RT.getRyzomYearStr();
-					str += year + " - "
-					str += CI18N::get("uiEon");					
+					str += year + " - ";
+					str += CI18N::get("uiEon");		
 					pViewEnterDate->setText(str);
 				}
 
diff --git a/code/ryzom/client/unix/CMakeLists.txt b/code/ryzom/client/unix/CMakeLists.txt
index 2bcd7ab84..1dbe48949 100644
--- a/code/ryzom/client/unix/CMakeLists.txt
+++ b/code/ryzom/client/unix/CMakeLists.txt
@@ -1,9 +1,9 @@
 IF(WITH_UNIX_STRUCTURE)
-  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom_client.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop")
+  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/khanat_client.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/khanat_client.desktop")
 
-  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop" DESTINATION share/applications)
+  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/khanat_client.desktop" DESTINATION share/applications)
   INSTALL(FILES khanat_client.png DESTINATION share/pixmaps)
-  INSTALL(FILES ryzom_client.xpm DESTINATION share/pixmaps)
+  INSTALL(FILES khanat_client.xpm DESTINATION share/pixmaps)
   INSTALL(FILES khanat_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${RYZOM_CLIENT_ICON}.png)
   INSTALL(FILES khanat_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ${RYZOM_CLIENT_ICON}.png)
   INSTALL(FILES khanat_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${RYZOM_CLIENT_ICON}.png)
diff --git a/code/ryzom/client/unix/ryzom_client.desktop.in b/code/ryzom/client/unix/khanat_client.desktop.in
similarity index 61%
rename from code/ryzom/client/unix/ryzom_client.desktop.in
rename to code/ryzom/client/unix/khanat_client.desktop.in
index e7bcceb14..9941fa563 100644
--- a/code/ryzom/client/unix/ryzom_client.desktop.in
+++ b/code/ryzom/client/unix/khanat_client.desktop.in
@@ -6,11 +6,11 @@ Type=Application
 GenericName=Game client
 Comment=Khanat client
 Comment[fr_FR]=Client Khanat
-TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client
-Exec=${RYZOM_GAMES_PREFIX}/ryzom_client
+TryExec=${RYZOM_GAMES_PREFIX}/khanat_client
+Exec=${RYZOM_GAMES_PREFIX}/khanat_client
 Icon=${RYZOM_CLIENT_ICON}
 Terminal=false
 Hidden=false
 Categories=Game;RolePlaying;
-StartupWMClass=ryzom_client
-X-AppInstall-Package=ryzom-client
+StartupWMClass=khanat_client
+X-AppInstall-Package=khanat-client
diff --git a/code/ryzom/client/unix/khanat_client.xpm b/code/ryzom/client/unix/khanat_client.xpm
new file mode 100644
index 000000000..e37a7617b
--- /dev/null
+++ b/code/ryzom/client/unix/khanat_client.xpm
@@ -0,0 +1,107 @@
+/* XPM */
+static char *khanat_client[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 69 1 ",
+"  c #000065",
+". c #00006D",
+"X c #000072",
+"o c #0E0673",
+"O c #0F0873",
+"+ c #02007A",
+"@ c #0C047A",
+"# c #110773",
+"$ c #110973",
+"% c #10077C",
+"& c #120A7B",
+"* c #171174",
+"= c #1A1574",
+"- c #1E1A75",
+"; c #17117B",
+": c #1A147A",
+"> c #1E197D",
+", c #211E75",
+"< c #211D7E",
+"1 c #242277",
+"2 c #282577",
+"3 c #252278",
+"4 c #302F7A",
+"5 c #36347B",
+"6 c #38377C",
+"7 c #3E3C7E",
+"8 c #120983",
+"9 c #221D84",
+"0 c #444281",
+"q c #484781",
+"w c #4E4D85",
+"e c #545387",
+"r c #575689",
+"t c #5C5B8B",
+"y c #605F8D",
+"u c #63628E",
+"i c #6B6A93",
+"p c #727096",
+"a c #757498",
+"s c #79779B",
+"d c #7C7B9D",
+"f c #81819F",
+"g c #8383A1",
+"h c #8C8CA7",
+"j c #8E8DA8",
+"k c #908FAA",
+"l c #9696AE",
+"z c #9E9EB4",
+"x c #A3A2B7",
+"c c #A5A5B9",
+"v c #ABABBD",
+"b c #B4B4C3",
+"n c #BABAC7",
+"m c #BBBBC9",
+"M c #C2C2CE",
+"N c #C6C6D1",
+"B c #CBCBD5",
+"V c #CFCFD8",
+"C c #D1CFD9",
+"Z c #D3D3DC",
+"A c #DADAE0",
+"S c #E2E0E7",
+"D c #E3E3E8",
+"F c #EAEAEE",
+"G c #EEEEF2",
+"H c #F4F4F6",
+"J c #F7F7F9",
+"K c #FEFEFE",
+"L c None",
+/* pixels */
+"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL",
+"LLLLLLLLLLLO&#LLLL*LLLLLLLLLLLLL",
+"LLLLLLLLLLL#88OLLL91LLLLLLLLLLLL",
+"LLLLLLLLLLL#&OLLLLX LLL:#LLLLLLL",
+"LLLLLLLLLLLLLO#OXwsie .+>#LLLLLL",
+"LLLLL###LLLL##:OXsLHZvi.X1LLLLLL",
+"LLLLLO8OLLoO&o*OXgLLLJJb0LLLLLLL",
+"LLLLLL&OL*&&#o*o.gJJJLLLZuLL#LLL",
+"LLLLLLLL*:-=#O*OXgLJJJJJLZr.9oLL",
+"LLLLLLLLX..Xo=*O.hLJJJLLLLm1.>oL",
+"LLLLLLLXuhfiXX1#.gLJJLFnMJLl.=LL",
+"LLL#LLL+eBLJx#.,XgLJJLN.tGLB7LLL",
+"L#O&OL#;.0bLLm0..gLJJLN.eFLFgLLL",
+"LL#8#OO*o..lJLZu gLLLLZ.yGLJcLLL",
+"LLL##L#&#1X.sDLFsubvvvh.tGLLnXX=",
+"LLLLLL##Oo-#.tDLJa .....tHLLM=X>",
+"LLLLLLO###-XXzJLntpassu.tGLLM*X:",
+"LLLLLL#&#-X*vLLc.sLJJLB.tGLLb.X=",
+"LLLLLL#*-.2bLLz..hLLJLB.tFLJzLLL",
+"LLL&#o#:.7NLJhX..hJJJLM.tFLDsLLL",
+"LL#&8#L.wVLHg.X-.gLJJLB.eGLM:.LL",
+"LLLL#LLXegfuX.,o.gLJJLGMMLJa.<#L",
+"LLLLLLLLXX..X=*o.gLJJJJLLLxX+*LL",
+"LLLLLLLLL+#**o*o.gLJJJJLLn5.>oLL",
+"LLLLLLL#L-=&#O*O.gLJJLLJv7LLLLLL",
+"LLLLLL#8OLLo&&*O.hLLLJSgXLLLLLLL",
+"LLLLL#8##LLLLo*&+aFVng7.+-LLLLLL",
+"LLLLLOLLLLLLLO#LX5w6LL.+=#LLLLLL",
+"LLLLLLLLLLLLO&#LLL+.LLL=LLLLLLLL",
+"LLLLLLLLLLLLO8#LLL:,LLLLLLLLLLLL",
+"LLLLLLLLLLLLO#LLLLLLLLLLLLLLLLLL",
+"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL"
+};
diff --git a/code/ryzom/client/unix/khanat_logo_color.png b/code/ryzom/client/unix/khanat_logo_color.png
deleted file mode 100644
index edb9b0e72..000000000
Binary files a/code/ryzom/client/unix/khanat_logo_color.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_128x128.png b/code/ryzom/client/unix/ryzom_128x128.png
deleted file mode 100644
index a51ce87ab..000000000
Binary files a/code/ryzom/client/unix/ryzom_128x128.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_16x16.png b/code/ryzom/client/unix/ryzom_16x16.png
deleted file mode 100644
index 451f7df45..000000000
Binary files a/code/ryzom/client/unix/ryzom_16x16.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_22x22.png b/code/ryzom/client/unix/ryzom_22x22.png
deleted file mode 100644
index 2505a9259..000000000
Binary files a/code/ryzom/client/unix/ryzom_22x22.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_24x24.png b/code/ryzom/client/unix/ryzom_24x24.png
deleted file mode 100644
index 1aa4207ab..000000000
Binary files a/code/ryzom/client/unix/ryzom_24x24.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_256x256.png b/code/ryzom/client/unix/ryzom_256x256.png
deleted file mode 100644
index 36f557ca9..000000000
Binary files a/code/ryzom/client/unix/ryzom_256x256.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_32x32.png b/code/ryzom/client/unix/ryzom_32x32.png
deleted file mode 100644
index b22c586eb..000000000
Binary files a/code/ryzom/client/unix/ryzom_32x32.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_48x48.png b/code/ryzom/client/unix/ryzom_48x48.png
deleted file mode 100644
index 67e3034ef..000000000
Binary files a/code/ryzom/client/unix/ryzom_48x48.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_64x64.png b/code/ryzom/client/unix/ryzom_64x64.png
deleted file mode 100644
index 94e07d66e..000000000
Binary files a/code/ryzom/client/unix/ryzom_64x64.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_client.png b/code/ryzom/client/unix/ryzom_client.png
deleted file mode 100644
index 67e3034ef..000000000
Binary files a/code/ryzom/client/unix/ryzom_client.png and /dev/null differ
diff --git a/code/ryzom/client/unix/ryzom_client.xpm b/code/ryzom/client/unix/ryzom_client.xpm
deleted file mode 100644
index 74df2446f..000000000
--- a/code/ryzom/client/unix/ryzom_client.xpm
+++ /dev/null
@@ -1,265 +0,0 @@
-/* XPM */
-static char *ryzom[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 227 2 ",
-"   c #281C09",
-".  c #1D250B",
-"X  c #2A360B",
-"o  c #39360D",
-"O  c #2A2C17",
-"+  c #332A10",
-"@  c #2D3411",
-"#  c #333312",
-"$  c #373817",
-"%  c #30290F",
-"&  c #2C3523",
-"*  c #3B3E2B",
-"=  c #343826",
-"-  c #3B2F3F",
-";  c #383A38",
-":  c #252B2B",
-">  c #483818",
-",  c #523A19",
-"<  c #402D0E",
-"1  c #443A21",
-"2  c #483F31",
-"3  c #3C4C15",
-"4  c #384717",
-"5  c #3C5415",
-"6  c #3B5315",
-"7  c #3B4426",
-"8  c #3D5029",
-"9  c #384435",
-"0  c #344934",
-"q  c #47491A",
-"w  c #52461C",
-"e  c #42541B",
-"r  c #455719",
-"t  c #51581D",
-"y  c #67421B",
-"u  c #63531F",
-"i  c #4C6519",
-"p  c #58661E",
-"a  c #5B761F",
-"s  c #4C781A",
-"d  c #6E6E1E",
-"f  c #4B4224",
-"g  c #444A23",
-"h  c #464728",
-"j  c #594222",
-"k  c #564C23",
-"l  c #564A28",
-"z  c #495A28",
-"x  c #535423",
-"c  c #585728",
-"v  c #464333",
-"b  c #494934",
-"n  c #454738",
-"m  c #564C31",
-"M  c #4C513D",
-"N  c #555334",
-"B  c #55533B",
-"V  c #585935",
-"C  c #6A4D26",
-"Z  c #714F22",
-"A  c #695629",
-"S  c #785724",
-"D  c #63563B",
-"F  c #695838",
-"G  c #4C6327",
-"H  c #566727",
-"J  c #557521",
-"K  c #5A7D24",
-"L  c #587728",
-"P  c #526334",
-"I  c #56613A",
-"U  c #5A7633",
-"Y  c #4B6E33",
-"T  c #626826",
-"R  c #756A27",
-"E  c #667E28",
-"W  c #72772A",
-"Q  c #6C643C",
-"!  c #75663A",
-"~  c #64753A",
-"^  c #7E7535",
-"/  c #2E3B4A",
-"(  c #353445",
-")  c #353649",
-"_  c #373849",
-"`  c #3C4B4C",
-"'  c #384949",
-"]  c #2D4459",
-"[  c #334B5B",
-"{  c #394455",
-"}  c #3E5455",
-"|  c #2E4B64",
-" . c #374E64",
-".. c #3C5464",
-"X. c #335269",
-"o. c #385567",
-"O. c #3F677A",
-"+. c #454E45",
-"@. c #495746",
-"#. c #535443",
-"$. c #5C5A4B",
-"%. c #575848",
-"&. c #45545A",
-"*. c #495D5B",
-"=. c #465656",
-"-. c #515C54",
-";. c #675C48",
-":. c #625D53",
-">. c #536349",
-",. c #576D4A",
-"<. c #576959",
-"1. c #4E6244",
-"2. c #6C634B",
-"3. c #656649",
-"4. c #766E4E",
-"5. c #69774A",
-"6. c #6B6452",
-"7. c #6B6A56",
-"8. c #66695B",
-"9. c #736D56",
-"0. c #687A56",
-"q. c #7C795C",
-"w. c #7C754E",
-"e. c #445C63",
-"r. c #455B68",
-"t. c #4E6766",
-"y. c #556867",
-"u. c #597764",
-"i. c #436274",
-"p. c #4C6672",
-"a. c #4D6B7A",
-"s. c #5B7271",
-"d. c #4A7661",
-"f. c #666C66",
-"g. c #67756B",
-"h. c #7B7A62",
-"j. c #787868",
-"k. c #6B7877",
-"l. c #7A7E77",
-"z. c #805D3A",
-"x. c #84652C",
-"c. c #876A38",
-"v. c #837536",
-"b. c #957530",
-"n. c #A47E33",
-"m. c #80684D",
-"M. c #827255",
-"N. c #847051",
-"B. c #A0764C",
-"V. c #837B64",
-"C. c #877865",
-"Z. c #817675",
-"A. c #5A8622",
-"S. c #648627",
-"D. c #668833",
-"F. c #65834A",
-"G. c #708046",
-"H. c #7C885D",
-"J. c #6F8E4F",
-"K. c #7E916F",
-"L. c #768679",
-"P. c #738571",
-"I. c #87882C",
-"U. c #979237",
-"Y. c #A68B3C",
-"T. c #A79035",
-"R. c #928E52",
-"E. c #89A556",
-"W. c #878469",
-"Q. c #928A6D",
-"!. c #898677",
-"~. c #958674",
-"^. c #94987D",
-"/. c #8E9A70",
-"(. c #AA926F",
-"). c #94A57F",
-"_. c #AEA278",
-"`. c #CCB055",
-"'. c #C9A453",
-"]. c #D4B874",
-"[. c #C6A166",
-"{. c #4B6D83",
-"}. c #4A7787",
-"|. c #587789",
-" X c #627A84",
-".X c #617780",
-"XX c #518395",
-"oX c #688089",
-"OX c #758887",
-"+X c #688798",
-"@X c #7B8F95",
-"#X c #7A959E",
-"$X c #6E8EA0",
-"%X c #6E90A3",
-"&X c #868887",
-"*X c #889487",
-"=X c #969589",
-"-X c #8A9695",
-";X c #9C9C94",
-":X c #958F84",
-">X c #A49887",
-",X c #A69F90",
-"<X c #9FAF82",
-"1X c #9BA795",
-"2X c #8DA189",
-"3X c #AEA597",
-"4X c #ACA98C",
-"5X c #839DAB",
-"6X c #94A4A7",
-"7X c #81A1B1",
-"8X c #97ACB4",
-"9X c #BBB2A9",
-"0X c #A7B5B9",
-"qX c #BDB7B0",
-"wX c #ADAEA6",
-"eX c #C4B9AE",
-"rX c #B9C0BB",
-"tX c #C6C5B8",
-"yX c #D2C3A6",
-"uX c #E1D6BF",
-"iX c #B7C0C4",
-"pX c #C6C9C7",
-"aX c #D2CAC5",
-"sX c #D8CDC3",
-"dX c #D5D4D4",
-"fX c #D6DEE0",
-"gX c None",
-/* pixels */
-"gXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgX",
-"gXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgX",
-"gXgXgXgXgXgXgXgXgXE.E.tXpX;XOX0XpXqX=XV.q.*XgXgXgXgXgXgXgXgXgXgX",
-"gXgXgXgXgXgXgXgX4XG.8.j.!.&X3X:Xj.).=X;.2 $.>X XgXgXgXgXgXgXgXgX",
-"gXgXgXgXgXgXgX_.h.#.:.Z.=X!.^.4.Q H.;X3.z g b H ,.gXgXgXgXgXgXgX",
-"gXgXgXgXgXE.Q.W.9.h.M.8.v f F V D !.=X5.5.I h r L 0.OXgXgXgXgXgX",
-"gXgXgXgX<Xh.v f A m 3.B l c a K H.W.6.W.).).h.V G U g.u.gXgXgXgX",
-"gXgXgXgXw.f q t g N m c W u i q 2.>X3XV.m 7 * v 7 5 8 >.gXgXgXgX",
-"gXgXgXgXt t E r k j y W i w , F yXpXwX,X>X!.q.B z b O ; -.gXgXgX",
-"gXgXgXA.X 3 4 o , S d S.T S x.(.qX;X:Xj.C.M.~.H.F.J.2 1 #.gXgXgX",
-"gXgXgXS.3 % + , y x.S.a H x.c.(.>XC.;.M.N.N.(.!.f.g.n 1 g >.gXgX",
-"gXgXE A.4 w z.B.n.I.i a p u x.(.eX>X3XtX4XF =XeX!.g.; v @ Y gXgX",
-"gXgXp 5 $ 5.! ! b.R c J t Z n.[.sXeXsXeX9X;.Z.dXwX-Xg.%.` <.&.gX",
-"gXgXx f V ~ ! x c A ^ ^ v.Y.T.U.4XdXaXeXwX7.,XdX8X8.oXy.=.*.` gX",
-"gX5.k 6.;Xj.4.F w R `.`.Y.Y.I.a m Z.eXaX>X6.V.iX5X@.M = & 9 ' gX",
-"gXU N $.&X$.V = q R.].].'.'.W q ;.Z.eX:X;.v D 0X X= v t # $ ' gX",
-"gXgXf O ; 9 h $ c c.R.tXuXyX(.N.C.C.6.F F w G.OX9 + 3 a 4 7 0 gX",
-"gXgXw # 0 0 N 2.A R E U 9.N.m.;.;.l , Z l H K g > # 5 A.5 . 4 gX",
-"gXgXJ o   # H /.q.A t J r v P H l C C Z , m e $ > % 5 s X q 6 gX",
-"gXJ x 4 < o i K /.4.t 8 7 =.d.8 @.;.F F , C > > > > q 5 . 3 @ gX",
-"gXgXx g % $ % e J.H.F.%.$.s.}.O.|.y.+.N b j j w z L 4 X O 8 gXgX",
-"gXgXH f $ 1 > q K Y >.f.2.~ F.d.}.e.} +.c T H A.A.s @ z } gXgXgX",
-"gXgXgXx f #.!.7.z 5 * 9 N V z 8 @.=.I P L S.D.J.A.7 4 ,.` gXgXgX",
-"gXgXgXP g #.y.6XK.~ 7.<.f.6.+.` =.@.0 G ~ J z P.@.: 7 = : gXgXgX",
-"gXgXgXgXP B @.k.8X*X>.7.l.9.B =.-.0.,.@.P.n = .Xa.0 ` ' gXgXgXgX",
-"gXgXgXgXe.$.n =.s.@.@.0.h.#.B %.P.<X-XL.-X-.n t.a.] { ( gXgXgXgX",
-"gXgXgXgXgXr.&.=.*.*.1.F.0.M :.!.-X6X8X8X#X<.@.e.i.{ gXgXgXgXgXgX",
-"gXgXgXgXgXgX[ e.p.a.|.#X#X@XOXk.@X#X7X#Xk.' : r.o.{ gXgXgXgXgXgX",
-"gXgXgXgXgXgXgX[ o.i.a.|.%X%X X X+X$X+X|.p.......{ gXgXgXgXgXgXgX",
-"gXgXgXgXgXgXgXgX/ ] X.o.O.{.|.{.{.a.i...[ .. ._ gXgXgXgXgXgXgXgX",
-"gXgXgXgXgXgXgXgXgXgX) / ] | X.X.X.| ] / / _ - gXgXgXgXgXgXgXgXgX",
-"gXgXgXgXgXgXgXgXgXgXgXgX( ) ) ) _ _ ( ( gXgXgXgXgXgXgXgXgXgXgXgX"
-};
diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
index bfa9bbc58..e29c9a4cc 100644
--- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
+++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
@@ -146,13 +146,13 @@ void CClientConfigDialog::onClickPlay()
 	bool started = false;
 
 #ifdef Q_OS_WIN32
-	started = QProcess::startDetached( "ryzom_client_r.exe" );
+	started = QProcess::startDetached( "khanat_client_r.exe" );
 	if( !started )
-		QProcess::startDetached( "ryzom_client_d.exe" );
+		QProcess::startDetached( "khanat_client_d.exe" );
 #elif defined(Q_OS_MAC)
-	started = QProcess::startDetached( "./Ryzom.app" );
+	started = QProcess::startDetached( "./Khanat.app" );
 #else
-	started = QProcess::startDetached( "./ryzom_client" );
+	started = QProcess::startDetached( "./khanat_client" );
 #endif
 
 	onClickOK();
diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
index 0b32a9867..fbecf551c 100644
--- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt
+++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
@@ -12,7 +12,7 @@ FILE(GLOB SRC main.cpp
 # always enable custom patch server
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DRZ_USE_CUSTOM_PATCH_SERVER)
 
-ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
+ADD_EXECUTABLE(khanat_client_patcher ${SRC})
 
 INCLUDE_DIRECTORIES(
 			${LIBXML2_INCLUDE_DIR}
@@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES(
 			${CMAKE_SOURCE_DIR}/ryzom/client/src
 )
 
-TARGET_LINK_LIBRARIES(ryzom_client_patcher
+TARGET_LINK_LIBRARIES(khanat_client_patcher
 				nelmisc
 				nelnet
 				ryzom_gameshare
@@ -29,16 +29,16 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 
 IF(APPLE)
   FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
-  TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
+  TARGET_LINK_LIBRARIES(khanat_client_patcher ${FOUNDATION_LIBRARY})
 ENDIF(APPLE)
 
 ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
 
-NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")
-NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher)
+NL_DEFAULT_PROPS(khanat_client_patcher "Khanat, Tools: Khanat Client Patcher")
+NL_ADD_RUNTIME_FLAGS(khanat_client_patcher)
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client_patcher ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(khanat_client_patcher ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client)
+INSTALL(TARGETS khanat_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client)