From 0258f0788069e4fb305d1a613946a410ecac2312 Mon Sep 17 00:00:00 2001
From: Nuno <ulukyn@gmail.com>
Date: Wed, 2 Feb 2022 21:05:13 +0100
Subject: [PATCH] Apply WG changes, remove core4 changes (need be reapplied
 later)

---
 .../data/gamedev/interfaces_v3/actions.xml    |   2 +
 .../client/data/gamedev/interfaces_v3/ark.lua | 111 +++-
 .../gamedev/interfaces_v3/bg_downloader.lua   |   8 +-
 .../gamedev/interfaces_v3/bot_chat_v4.xml     | 100 ++-
 .../data/gamedev/interfaces_v3/commands.xml   |   2 +-
 .../data/gamedev/interfaces_v3/compass.xml    |  24 +-
 .../data/gamedev/interfaces_v3/config.xml     | 159 ++---
 .../gamedev/interfaces_v3/encyclopedia.xml    |  30 +-
 .../gamedev/interfaces_v3/game_config.xml     |  16 +-
 .../interfaces_v3/game_context_menu.xml       |   3 +-
 .../gamedev/interfaces_v3/game_r2_loading.lua |  12 +-
 .../data/gamedev/interfaces_v3/guild.lua      |   8 +-
 .../data/gamedev/interfaces_v3/guild.xml      | 132 ++--
 .../data/gamedev/interfaces_v3/help.xml       |  31 +-
 .../gamedev/interfaces_v3/info_player.lua     | 625 +++++++++++++++---
 .../gamedev/interfaces_v3/info_player.xml     |  57 +-
 .../gamedev/interfaces_v3/interaction.lua     |  56 +-
 .../gamedev/interfaces_v3/interaction.xml     | 158 ++---
 .../data/gamedev/interfaces_v3/inventory.xml  |  37 +-
 .../data/gamedev/interfaces_v3/keys.xml       |  41 +-
 .../gamedev/interfaces_v3/keys_bi.wasd.xml    |  41 +-
 .../interfaces_v3/keys_bi.wow_alike.xml       |   1 +
 .../gamedev/interfaces_v3/keys_bi.zqsd.xml    |  41 +-
 .../gamedev/interfaces_v3/local_database.xml  |  39 +-
 .../gamedev/interfaces_v3/login_config.xml    |   8 +-
 .../data/gamedev/interfaces_v3/login_main.xml |  36 +-
 .../gamedev/interfaces_v3/login_widgets.xml   |   8 +-
 .../client/data/gamedev/interfaces_v3/map.lua |  26 +
 .../client/data/gamedev/interfaces_v3/map.xml |   4 +-
 .../gamedev/interfaces_v3/out_v2_appear.lua   |   4 +-
 .../gamedev/interfaces_v3/out_v2_appear.xml   |  21 +-
 .../gamedev/interfaces_v3/out_v2_config.xml   |   2 +
 .../gamedev/interfaces_v3/out_v2_location.xml |   3 +-
 .../gamedev/interfaces_v3/out_v2_select.xml   |  54 +-
 .../gamedev/interfaces_v3/outgame_config.xml  |   2 +
 .../gamedev/interfaces_v3/outgame_select.xml  |  16 +-
 .../gamedev/interfaces_v3/outgame_summary.xml |   4 +-
 .../gamedev/interfaces_v3/outgame_widgets.xml |   4 +-
 .../data/gamedev/interfaces_v3/outpost.lua    |  30 +-
 .../data/gamedev/interfaces_v3/outpost.xml    |  44 +-
 .../data/gamedev/interfaces_v3/phrase.xml     |  29 +-
 .../data/gamedev/interfaces_v3/player.lua     |  58 +-
 .../data/gamedev/interfaces_v3/player.xml     |  16 +-
 .../gamedev/interfaces_v3/player_trade.lua    |  32 +
 .../gamedev/interfaces_v3/player_trade.xml    | 101 +--
 .../data/gamedev/interfaces_v3/r2ed.xml       |   8 +-
 .../gamedev/interfaces_v3/r2ed_scenario.xml   |  10 +-
 .../data/gamedev/interfaces_v3/reset.xml      |   2 +-
 .../interfaces_v3/ring_access_point.lua       |  81 ++-
 .../ring_access_point_filter.lua              |  34 +-
 .../gamedev/interfaces_v3/ring_window.xml     |   4 +-
 .../data/gamedev/interfaces_v3/taskbar.lua    |  14 +-
 .../data/gamedev/interfaces_v3/taskbar.xml    |  28 +-
 .../data/gamedev/interfaces_v3/webig.lua      |   2 -
 .../gamedev/interfaces_v3/webig_widgets.xml   |   8 +
 .../data/gamedev/interfaces_v3/widgets.xml    |  50 +-
 .../src/ai_service/doc/doxycfg/doxygen.css    | 124 ++--
 57 files changed, 1604 insertions(+), 997 deletions(-)
 create mode 100644 ryzom/client/data/gamedev/interfaces_v3/player_trade.lua

diff --git a/ryzom/client/data/gamedev/interfaces_v3/actions.xml b/ryzom/client/data/gamedev/interfaces_v3/actions.xml
index 35b03a199..bfd245806 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/actions.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/actions.xml
@@ -43,6 +43,7 @@
         <value value="game_config" hardtext="uiGlobalSettings" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" />
         <value value="connection" hardtext="uiConnection" contexts="game" />
         <value value="mp3_player" hardtext="uimwMP3Player" contexts="game" />
+        <value value="bg_downloader" hardtext="uimwBGDownloader" contexts="game" />
         <value value="links" hardtext="uiLinks" contexts="game" />
         <value value="debug_info" hardtext="uiDebug" contexts="game" />
         <!-- r2ed specifics -->
@@ -461,6 +462,7 @@
                 <instance template="container_window_list" />
             </parameter>
         </action>
+        <action name="fullmap" hardtext="uiShowFullMap" contexts="game, r2ed_anim_test, r2ed_anim_dm, r2ed" />
         <!-- in r2 virtual desktop are used for the different mode (edition, dm, test) -->
         <action name="set_desktop" hardtext="uiSetDesktop" repeat="1" keyup="1" contexts="game">
             <parameter hardtext="uiDesktopNumber">
diff --git a/ryzom/client/data/gamedev/interfaces_v3/ark.lua b/ryzom/client/data/gamedev/interfaces_v3/ark.lua
index 8666be557..fa08c5e00 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/ark.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/ark.lua
@@ -22,31 +22,55 @@ if ArkMissionCatalog == nil then
 	}
 end
 
-function ArkMissionCatalog:OpenWindow(urlA, urlB)
-	local winframe = WebBrowser:addWindow("ark_mission_catalog", "Mission Catalog", getUI(ArkMissionCatalog.window_id))
+function ArkMissionCatalog:OpenWindow(urlA, urlB, dont_active)
+	ArkMissionCatalog.window_id = "ui:interface:encyclopedia"
+	local winframe = getUI(ArkMissionCatalog.window_id)
 	winframe.opened=true
-	winframe.active=true
-	winframe.w = 950
+	if dont_active ~= true then
+		winframe.active=true
+	end
 
 	ArkMissionCatalog.window = winframe
 
-	getUI(ArkMissionCatalog.window_id..":content:htmlA"):browse(urlA)
+	getUI("ui:interface:encyclopedia:content:htmlA"):browse(urlA)
 
-	local htmlb = getUI(ArkMissionCatalog.window_id..":content:htmlB")
-	if htmlb.home == "" then
-		htmlb.home = urlB
-	end
+	local htmlb = getUI("ui:interface:encyclopedia:content:htmlB")
+	htmlb.home = urlB
 	htmlb:browse("home")
-
 end
 
-
-function ArkMissionCatalog:OpenCat(url)
+function ArkMissionCatalog:OpenCat(cat, url)
+	local ency = getUI("ui:interface:encyclopedia")
+	setOnDraw(ency, "")
+	ArkMissionCatalog.cat = cat
 	local htmlb = getUI(ArkMissionCatalog.window_id..":content:htmlB")
-	htmlb.home = url+"&continent="+getContinentSheet()
+	local htmlc = getUI(ArkMissionCatalog.window_id..":content:htmlC")
+	if cat == "title" then
+		ArkMissionCatalog.posxB = 180
+		ArkMissionCatalog.widthB = 240
+		ArkMissionCatalog.widthC = 530
+		ArkMissionCatalog.posxC = 405
+
+		local htmlB = getUI(ArkMissionCatalog.window_id..":content:htmlB")
+		local htmlC = getUI(ArkMissionCatalog.window_id..":content:htmlC")
+		htmlB.x = ArkMissionCatalog.posxB
+		htmlB.w = ArkMissionCatalog.widthB
+		htmlC.w = ArkMissionCatalog.widthC
+		htmlC.x = ArkMissionCatalog.posxC
+		htmlC.active = true
+	else
+		ArkMissionCatalog.widthB = 740
+		htmlb.w = ArkMissionCatalog.widthB
+		if htmlc then
+			htmlc.active = false
+		end
+	end
+	htmlb.home = url.."&continent="..getContinentSheet()
 	htmlb:browse("home")
+	setOnDraw(ency, "ArkMissionCatalog:autoResize()")
 end
 
+-- TODO: check removing fromUTF8
 function ArkMissionCatalog:UpdateMissionTexts(win, id, text1, text2)
 	local w = win:find("ark_mission_"..id)
 	local text = ucstring()
@@ -72,36 +96,59 @@ function ArkMissionCatalog:autoResize()
 	local ui = getUI(ArkMissionCatalog.window_id)
 	local htmlA = getUI(ArkMissionCatalog.window_id..":content:htmlA")
 	local htmlB = getUI(ArkMissionCatalog.window_id..":content:htmlB")
+	local htmlC = getUI(ArkMissionCatalog.window_id..":content:htmlC")
 
-	if ArkMissionCatalog.cat == "storyline" then
-		if ui.w < 784 then
-			if ArkMissionCatalog.cat == "storyline" then
+	if htmlC.active == false then
+		if ArkMissionCatalog.cat == "storyline" then
+			if ui.w < 784 then
 				local td30 = htmlB:find("storyline_content")
 				if td30 ~= nil then
 					td30.x = math.max(0, 200-784+ui.w)
 					ArkMissionCatalog.need_restore_td30 = true
 				end
-			end
-		else
-			if ArkMissionCatalog.need_restore_td30 then
-				local td30 = htmlB:find("storyline_content")
-				if td30 ~= nil then
-					td30.x = 200
-					ArkMissionCatalog.need_restore_td30 = false
+			else
+				if ArkMissionCatalog.need_restore_td30 then
+					local td30 = htmlB:find("storyline_content")
+					if td30 ~= nil then
+						td30.x = 200
+						ArkMissionCatalog.need_restore_td30 = false
+					end
 				end
 			end
 		end
-	end
 
-	if ui.w < 950 then
-		htmlA.w = math.max(60, 220-950+ui.w)
-		htmlB.x = math.max(35, 190-950+ui.w)
-		ArkMissionCatalog.need_restore = true
+		if ui.w < 950 then
+			htmlA.w = math.max(60, 220-950+ui.w)
+			htmlB.x = math.max(35, 190-950+ui.w)
+			ArkMissionCatalog.need_restore = true
+		else
+			if ArkMissionCatalog.need_restore then
+				htmlA.w = 220
+				htmlB.x = 190
+				ArkMissionCatalog.need_restore = false
+			end
+		end
 	else
-		if ArkMissionCatalog.need_restore then
-			htmlA.w = 220
-			htmlB.x = 190
-			ArkMissionCatalog.need_restore = false
+		if ui.w < 950 then
+			htmlA.w = math.max(68, 220-950+ui.w)
+			htmlB.x = math.max(35, ArkMissionCatalog.posxB-950+ui.w)
+			if htmlB:find("scroll_bar").h > 0 then
+				htmlC.x = math.max(80, ui.w-htmlC.w)
+				htmlB.w = math.max(62, ui.w-htmlA.w-htmlC.x+16)
+			else
+				htmlC.x = math.max(75, ui.w-htmlC.w-16)
+				htmlB.w = math.max(55, htmlC.x-htmlB.x+16)
+			end
+			ArkMissionCatalog.need_restore = true
+		else
+			if ArkMissionCatalog.need_restore then
+				htmlA.w = 220
+				htmlB.w = ArkMissionCatalog.widthB
+				htmlB.x = ArkMissionCatalog.posxB
+				htmlC.w = ArkMissionCatalog.widthC
+				htmlC.x = ArkMissionCatalog.posxC
+				ArkMissionCatalog.need_restore = false
+			end
 		end
 	end
 end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.lua b/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.lua
index f133eae27..161012d9e 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.lua
@@ -48,7 +48,7 @@ function bgdownloader:setProgressText(ucstr, color, progress, ellipsis)
 	local text = self:getProgressGroup():find("text")
 	local ellipsisTxt = self:getProgressGroup():find("ellipsis")
 	text.color = color
-	text.text = ucstr
+	text.uc_hardtext = ucstr
 	if ellipsis then
 		ellipsisTxt.hardtext = ellipsis
 	else
@@ -60,7 +60,7 @@ function bgdownloader:setProgressText(ucstr, color, progress, ellipsis)
 		-- any current download to finish, otherwise connection may be lost)
 		self:setIcon("bgd_pause.tga")
 		ellipsisTxt.hardtext = ""
-		text.text = pausedText
+		text.uc_hardtext = pausedText
 	else				
 		self:setIcon("")
 		local progressCtrl = self:getProgressBar()
@@ -88,7 +88,7 @@ function bgdownloader:setPatchProgress(progress)
 	local progressDate = nltime.getLocalTime() / 500
 	local colValue = math.floor(230 + 24 * math.sin(progressDate))
 	local color = string.format("%d %d 	%d %d", colValue, colValue, colValue, 255)
-	self:setProgressText(concatString(i18n.get("uiBGD_Progress"), progressPercentText), color, progress, progressSymbol[progressPostfix + 1])
+	self:setProgressText(concatUCString(i18n.get("uiBGD_Progress"), ucstring(progressPercentText)), color, progress, progressSymbol[progressPostfix + 1])
 end
 
 ------------------------------------------------------------------------------------------------------------
@@ -110,7 +110,7 @@ function bgdownloader:setPatchError()
 		self:getProgressGroup().active = true		
 	end
 	local errMsg = getPatchLastErrorMessage()
-	if errMsg == "" then
+	if errMsg == ucstring() then		
 		self:setProgressText(i18n.get("uiBGD_PatchError"), "255 0 0 255", 0)
 	else		
 		self:setProgressText(errMsg, "255 0 0 255", 0)
diff --git a/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml b/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
index d76df41cb..e1d76646b 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
@@ -22,31 +22,6 @@
         <view type="bitmap" id="sep4" posref="BL BL" scale="true" sizeref="w" h="2" w="0" texture="W_line_hor.tga" y="-1" />
         <view type="bitmap" id="sep4" posref="BL BL" scale="true" sizeref="w" h="2" w="0" texture="W_line_hor.tga" y="-1" />
     </template>
-    <!-- a text with border -->
-    <template name="bc_border_text" posref="TM TM" posparent="parent" x="0" y="-20" w="-4">
-        <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="true" sizeref="w" w="#w">
-            <!--
-                <group id="text" posref="TL TL" x="4" y="-4" child_resize_h="true" sizeref="w" w="-8">
-                        <view type="bitmap" id="bg" sizeref="hw" h="0" w="0" scale="true" texture="W_box_blank.tga"/>
-                        <view type="text_id_formated" format="$t" id="text" textid="#text_id" multi_line="true" fontsize="12" shadow="true" global_color="false"/>
-                </group>
-  -->
-            <!-- the border -->
-            <!--
-                <instance template="thin_bc_border" posparent="text"/>
-                -->
-        </group>
-    </template>
-    <template name="bc_border_text2" posref="TM TM" posparent="parent" x="0" y="0" w="-4">
-        <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="true" w="#w">
-            <group id="text" posref="TL TL" x="4" y="-4" child_resize_h="true" sizeref="w" w="-8">
-                <view type="bitmap" id="bg" sizeref="hw" h="0" w="0" scale="true" texture="W_box_blank.tga" />
-                <view type="text_id_formated" format="$t" id="text" textid="#text_id" multi_line="true" fontsize="12" shadow="true" global_color="false" />
-            </group>
-            <!-- the border -->
-            <instance template="thin_bc_border" posparent="text" />
-        </group>
-    </template>
     <!-- EXCHANGE slot -->
     <style style="xchg_slot" type="sheet" onclick_r="open_help_auto" dragable="true" oncandrop="can_drop_to_exchange" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
     <!-- Basic container style -->
@@ -135,14 +110,14 @@
             <instance template="edit_box_widget" id="edit" posparent="intro" posref="TL TL" x="0" w="380" y="-24" h="12" text_x="0" text_y="0" text_ref="ML ML" fontsize="12" prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="32" onenter="" params="" enter_recover_focus="false" reset_focus_on_hide="true" max_historic="0" title="uiGuildNameWarning" tooltip="uiGuildNameWarning" entry_type="text" />
             <view type="text" id="guild_name" posparent="edit" posref="TL BL" x="0" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiGuildName" />
             <!-- DESCRIPTION -->
-            <instance template="edit_box_widget" id="desc" posref="BL TL" y="-24" posparent="edit" child_resize_h="true" w="380" multi_line="true" max_num_chars="200" onenter="" title="uiGuildDescWarning" tooltip="uiGuildDescWarning" />
+            <instance template="edit_box_widget" id="desc" posref="BL TL" multi_line="true" max_num_chars="200" y="-24" posparent="edit" child_resize_h="true" w="380" onenter="" title="uiGuildDescWarning" tooltip="uiGuildDescWarning" />
             <view type="text" id="guild_desc" posparent="desc" posref="TL BL" x="0" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiGuildDescription" />
             <!-- BLASON DESIGN -->
             <instance template="box_widget" id="back" posparent="desc" posref="BM TM" w="300" h="120" x="0" y="-24" />
             <!-- GUILD ICON -->
             <ctrl type="sheet" id="blason" posref="TL TL" x="5" y="-18" posparent="back" nature="guild_flag" value="UI:TEMP:GUILD_CREATION" dragable="false" color="255 255 255 255" />
             <view type="text" id="guild_blason" posref="TL BL" posparent="blason" x="0" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiGuildBlason" />
-            <!-- GUILD ICON DESIGNER -->
+            <!-- GUILD ICON Desinger -->
             <view type="text" id="guild_blason_design" posref="TL BL" posparent="back" x="0" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiGuildBlasonDesign" />
             <ctrl type="sheet" id="back_layer" posref="TL TL" x="100" y="-18" posparent="back" nature="guild_flag" value="UI:TEMP:GUILD:BACK" global_color="false" onclick_l="enter_modal" params_l="group=ui:interface:guild_flag_back" />
             <view type="text" id="blason_back" posref="TL BL" posparent="back_layer" x="0" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiGuildBlasonBack" />
@@ -298,7 +273,7 @@
     <variable entry="UI:TEMP:TRADE_ITEM:QUALITY" type="sint64" value="0" />
     <variable entry="UI:TEMP:TRADE_ITEM:QUANTITY" type="sint64" value="0" />
     <variable entry="UI:TEMP:TRADE_ITEM:SLOT_TYPE" type="sint64" value="0" />
-    <variable entry="UI:TEMP:TRADE_ITEM:USER_COLOR" type="sint32" value="1" />
+    <variable entry="UI:TEMP:TRADE_ITEM:USER_COLOR" type="sint32" value="0" />
     <variable entry="UI:TEMP:TRADE_ITEM:WEIGHT" type="sint32" value="0" />
     <variable entry="UI:TEMP:TRADE_ITEM:NAMEID" type="sint32" value="0" />
     <variable entry="UI:TEMP:TRADE_ITEM:INFO_VERSION" type="sint32" value="0" />
@@ -313,7 +288,7 @@
     <variable entry="UI:TEMP:TRADE_ITEM:BUILD_ITEMS:$i:QUALITY" type="sint32" value="0" size="64" />
     <variable entry="UI:TEMP:TRADE_ITEM:BUILD_ITEMS:$i:QUANTITY" type="sint32" value="0" size="64" />
     <variable entry="UI:TEMP:TRADE_ITEM:BUILD_ITEMS:$i:SLOT_TYPE" type="sint32" value="0" size="64" />
-    <variable entry="UI:TEMP:TRADE_ITEM:BUILD_ITEMS:$i:USER_COLOR" type="sint32" value="1" size="64" />
+    <variable entry="UI:TEMP:TRADE_ITEM:BUILD_ITEMS:$i:USER_COLOR" type="sint32" value="0" size="64" />
     <variable entry="UI:TEMP:TRADE_ITEM:BUILD_ITEMS:$i:NAMEID" type="sint32" value="0" size="64" />
     <variable entry="UI:TEMP:TRADE_ITEM:BUILD_ITEMS:$i:INFO_VERSION" type="sint32" value="0" size="64" />
     <variable entry="UI:TEMP:TRADE_ITEM:BUILD_ITEMS:$i:ENCHANT" type="sint32" value="0" size="64" />
@@ -329,22 +304,22 @@
     </template>
     <!-- Enable/disable resale -->
     <!--
-  <proc id="click_resale_button">
+        <proc id="click_resale_button" >
                 <action handler="set" params="dblink=UI:TEMP:TRADE_ITEM:ENABLE_RESALE|value=not(@@UI:TEMP:TRADE_ITEM:ENABLE_RESALE)" />
                 <action handler="set_focus_margin" />
-  </proc>
-  <template name="resale_button" id="" posparent="parent" posref="TL TL" x="0" y="0" sizeref="w" w="0" h="14" text="">
+        </proc>
+        <template name="resale_button" id="" posparent="parent" posref="TL TL" x="0" y="0" sizeref="w" w="0" h="14" text="" >
                 <group id="#id" sizeref="w" w="0" h="20" x="#x" y="#y" posref="#posref" posparent="#posparent">
                         <ctrl type="button" id="but" button_type="toggle_button" x="8" y="0" posref="ML ML"
-                                tx_normal="W_slot_on.tga" tx_pushed="W_opacity_on.tga"
-                                global_color_normal="false" global_color_over="false" global_color_pushed="false"
-                                click_when_pushed="true" onclick_l="proc" params_l="click_resale_button" />
+                                                                                        tx_normal="W_slot_on.tga" tx_pushed="W_opacity_on.tga"
+                                                                                        global_color_normal="false" global_color_over="false" global_color_pushed="false"
+                                                                                        click_when_pushed="true" onclick_l="proc" params_l="click_resale_button" />
 
                         <view type="text" id="text" posparent="but" posref="MR ML" x="4" y="-3" fontsize="11" global_color="true" shadow="true" hardtext="#text" />
 
                         <link expr="@UI:TEMP:TRADE_ITEM:ENABLE_RESALE" target="but:pushed" />
                 </group>
-  </template>
+        </template>
 -->
     <!-- modal box to confirm destruction of the item -->
     <group type="modal" id="bot_chat_destroy_confirm_modal" exit_click_out="true" posref="TL TL" x="-8" y="8" w="104" h="96" on_enter="botchat_confirm_destroy" options="skin_modal">
@@ -368,7 +343,7 @@
             <instance template="box_widget" id="box1" posref="TL TL" sizeref="w" w="-18" h="16" x="18" />
             <view type="text" id="val1" posparent="box1" posref="MR MR" x="-3" y="0" color="135 243 28 255" shadow="true" fontsize="10" hardtext="" global_color="false" />
             <ctrl type="tooltip" id="tt" instant_help="true" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0" />
-            <link expr="getPriceWithFame(@#value,@#value_fame)" target="val1:hardtext" />
+            <link expr="getPriceWithFame(@#value,@#value_fame)" target="val1:uc_hardtext" />
             <link expr="ifthenelse(eq(@UI:TEMP:TRADE_ITEM:IS_SELL_DLG,1),ifthenelse(eq(@#value,@#value_fame),localize('uittPriceWithFameEqual'),localize('uittPriceWithFameDiff')),'')" target="tt:tooltip" />
         </group>
     </template>
@@ -378,7 +353,7 @@
             <view type="bitmap" id="icone" posref="TL TL" texture="money_seve.tga" global_color="false" />
             <instance template="box_widget" id="box1" posref="TL TL" sizeref="w" w="-18" h="16" x="18" />
             <view type="text" id="val1" posparent="box1" posref="MR MR" x="-3" y="0" color="135 243 28 255" shadow="true" fontsize="10" hardtext="" global_color="false" />
-            <link expr="getBonusOnResale(@#value_high,@#value_low)" target="val1:hardtext" />
+            <link expr="getBonusOnResale(@#value_high,@#value_low)" target="val1:uc_hardtext" />
         </group>
     </template>
     <!-- the modal -->
@@ -550,8 +525,8 @@
     <template name="temp_list_sell" id="" dbentry="" db_animal_status="">
         <!-- PLAYER NAME -->
         <!--
-  <view type="text_formated" id="player_name" posref="TL TL" x="4" y="-8" color="255 255 255 255" fontsize="14" shadow="true" format="$p"/>
-  -->
+        <view type="text_formated" id="player_name" posref="TL TL" x="4" y="-8" color="255 255 255 255" fontsize="14" shadow="true" format="$p"/>
+        -->
         <!-- LIST OF ITEMS TO SELL  -->
         <!-- The H should be "42+hspace" * Number of rows. Setup list.max_h too below-->
         <group type="list_sheet_trade" sizeref="w" x="2" y="0" w="0" h="%trade_slot_height" id="#id" posparent="parent" posref="TL TL" xitem="2" yitem="-2" xtext="46" ytext="-2" hspace="4" array="false" value="#dbentry" want_price="true" use_quantity="true" use_quality="true" dragable="false" use_slot_type_db_entry="false" nature="auto" onclick_l="sell_item" onclick_r="open_help_auto" over_color="%bot_chat_sheet_selection_normal" over_col_pushed="%bot_chat_sheet_selection_pushed" over_col_over="%bot_chat_sheet_selection_over" click_when_pushed="true" color="255 255 255 255" fontsize="8" shadow="true" multi_line="true" multi_line_space="0" multiply_price_by_quantity="true" db_animal_status="#db_animal_status" test_drop_or_sell="true" apply_fame_price_factor="true">
@@ -565,8 +540,8 @@
     <template name="temp_list_buy" id="" use_quantity="" filter_seller_type="none">
         <!-- VENDOR NAME -->
         <!--
-  <view type="text_formated" id="vendor_name" posref="TL TL" x="4" y="-8" color="255 255 255 255" fontsize="14" shadow="true" format="$b"/>
-  -->
+        <view type="text_formated" id="vendor_name" posref="TL TL" x="4" y="-8" color="255 255 255 255" fontsize="14" shadow="true" format="$b"/>
+        -->
         <!-- LIST OF ITEMS TO BUY  -->
         <!-- The H should be "42+hspace" * Number of rows. Setup list.max_h too below-->
         <group type="list_sheet_trade" sizeref="w" w="0" x="4" y="0" h="%trade_slot_height" id="#id" posparent="parent" posref="TL TL" xitem="2" yitem="-2" xtext="46" ytext="2" hspace="4" array="false" value="%trade" want_price="true" use_quantity="#use_quantity" use_quality="true" dragable="false" use_slot_type_db_entry="false" nature="auto" onclick_l="buy_item" onclick_r="open_help_auto" over_color="%bot_chat_sheet_selection_normal" over_col_pushed="%bot_chat_sheet_selection_pushed" over_col_over="%bot_chat_sheet_selection_over" click_when_pushed="true" color="255 255 255 255" fontsize="8" shadow="true" multi_line="true" multi_line_space="0" multiply_price_by_quantity="#use_quantity" filter_seller_type="#filter_seller_type">
@@ -686,11 +661,11 @@
     <define id="trade_slot_back_w" value="346" />
     <define id="trade_slot_w" value="342" />
     <!-- The Trade Page -->
-    <group id="bot_chat_trade" style="bot_chat_window" posref="BL TL" min_w="708" max_w="708" w="708" x="302" y="200" pop_max_h="700" max_h="2000" active="false" title="uiBotChatTrade" help_page="interf_bot_trade.html">
-        <group id="header_opened" child_resize_h="true" w="700" x="0" y="0" posref="TL TL">
+    <group id="bot_chat_trade" style="bot_chat_window" posref="BL TL" min_w="828" max_w="828" w="828" x="302" y="200" pop_max_h="700" max_h="2000" active="false" title="uiBotChatTrade" help_page="interf_bot_trade.html">
+        <group id="header_opened" child_resize_h="true" w="1000" x="0" y="0" posref="TL TL">
             <instance template="bc_border_text" id="intro" text_id="SERVER:BOTCHAT:TRADE" />
             <group id="trade_content" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="32" posref="BL TL" posparent="intro" y="0">
-                <instance template="box_widget" id="sell_back" posref="TL TL" w="%trade_slot_back_w" h="%trade_slot_back_h" x="0" y="-52" />
+                <instance template="box_widget" id="sell_back" posref="TL TL" w="464" h="%trade_slot_back_h" x="0" y="-52" />
                 <instance template="box_widget" id="buy_back" posref="TR TR" w="%trade_slot_back_w" h="%trade_slot_back_h" x="0" y="-52" />
                 <view type="text" id="sell_title" posparent="sell_back" posref="TL BL" x="0" y="32" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiSellTo" />
                 <view type="text" id="buy_title" posparent="buy_back" posref="TL BL" x="0" y="32" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiBuyFrom" />
@@ -698,7 +673,7 @@
                 <view type="text_formated" id="vendor_name2" posparent="buy_title" posref="TR TL" x="0" y="0" color="255 255 255 255" global_color="false" fontsize="12" shadow="true" format="$s" />
                 <!-- **** SELL **** -->
                 <!-- GroupTab for SELL Inventory Selection -->
-                <group id="inventory_select_sell" w="%trade_slot_w" h="24" posref="TL TL" x="0" y="-24">
+                <group id="inventory_select_sell" w="460" h="24" posref="TL TL" x="0" y="-24">
                     <group type="tab" id="tab" child_resize_w="true" h="24" posref="TL TL">
                         <ctrl style="tab_button_new" id="tab0" x="0" posref="TL TL" hardtext="uitabBag" group="sell:bag_sell" />
                         <!-- MAX_INVENTORY_ANIMAL -->
@@ -706,12 +681,18 @@
                         <ctrl style="tab_button_new" id="tab2" posparent="tab1" hardtext="uitabPacker1" group="sell:beast1_sell" />
                         <ctrl style="tab_button_new" id="tab3" posparent="tab2" hardtext="uitabPacker2" group="sell:beast2_sell" />
                         <ctrl style="tab_button_new" id="tab4" posparent="tab3" hardtext="uitabPacker3" group="sell:beast3_sell" />
+                        <ctrl style="tab_button_new" id="tab5" posparent="tab4" hardtext="uiPATitleMount5" group="sell:beast4_sell" />
+                        <ctrl style="tab_button_new" id="tab6" posparent="tab5" hardtext="uiPATitleMount6" group="sell:beast5_sell" />
+                        <ctrl style="tab_button_new" id="tab7" posparent="tab6" hardtext="uiPATitleMount7" group="sell:beast6_sell" />
                         <!-- Hide the buttons if we don't own the associated animal -->
                         <!-- MAX_INVENTORY_ANIMAL -->
                         <link expr="isAnimalStatusPresent(@%pa_beast0:STATUS)" target="tab1:active" />
                         <link expr="isAnimalStatusPresent(@%pa_beast1:STATUS)" target="tab2:active" />
                         <link expr="isAnimalStatusPresent(@%pa_beast2:STATUS)" target="tab3:active" />
                         <link expr="isAnimalStatusPresent(@%pa_beast3:STATUS)" target="tab4:active" />
+                        <link expr="isAnimalStatusPresent(@%pa_beast4:STATUS)" target="tab5:active" />
+                        <link expr="isAnimalStatusPresent(@%pa_beast5:STATUS)" target="tab6:active" />
+                        <link expr="isAnimalStatusPresent(@%pa_beast6:STATUS)" target="tab7:active" />
                         <!-- MAX_INVENTORY_ANIMAL -->
                         <link expr="switch(@%pa_beast0:TYPE, 'uitabPacker0', 'uitabInvPAMount0', 'uitabInvPAPacker0', 'uitabInvPADemon0')" target="tab1:hardtext" />
                         <link expr="switch(@%pa_beast1:TYPE, 'uitabPacker1', 'uitabInvPAMount1', 'uitabInvPAPacker1', 'uitabInvPADemon1')" target="tab2:hardtext" />
@@ -721,7 +702,7 @@
                     <view type="bitmap" id="sep" posparent="tab" posref="BR BL" w="1000" h="1" scale="true" texture="blank.tga" color="166 166 166 255" />
                 </group>
                 <!-- SELL -->
-                <group id="sell" x="4" y="-54" child_resize_h="true" w="%trade_slot_w" posref="TL TL">
+                <group id="sell" x="4" y="-54" child_resize_h="true" w="460" posref="TL TL">
                     <!-- Those groups are show/hide according to GroupTab -->
                     <instance template="temp_list_sell" id="bag_sell" dbentry="%bag" db_animal_status="" />
                     <!-- MAX_INVENTORY_ANIMAL -->
@@ -729,10 +710,13 @@
                     <instance template="temp_list_sell" id="beast1_sell" dbentry="%pa_bag1" db_animal_status="%pa_beast1:STATUS" />
                     <instance template="temp_list_sell" id="beast2_sell" dbentry="%pa_bag2" db_animal_status="%pa_beast2:STATUS" />
                     <instance template="temp_list_sell" id="beast3_sell" dbentry="%pa_bag3" db_animal_status="%pa_beast3:STATUS" />
+                    <instance template="temp_list_sell" id="beast4_sell" dbentry="%pa_bag4" db_animal_status="%pa_beast4:STATUS" />
+                    <instance template="temp_list_sell" id="beast5_sell" dbentry="%pa_bag5" db_animal_status="%pa_beast5:STATUS" />
+                    <instance template="temp_list_sell" id="beast6_sell" dbentry="%pa_bag6" db_animal_status="%pa_beast6:STATUS" />
                 </group>
                 <!-- **** BUY **** -->
                 <!-- GroupTab for BUY Inventory Selection -->
-                <group id="inventory_select_buy" w="%trade_slot_w" h="24" posref="TM TL" x="0" y="-24">
+                <group id="inventory_select_buy" w="%trade_slot_w" h="24" posref="TM TL" x="60" y="-24">
                     <group type="tab" id="tab" child_resize_w="true" h="24" posref="TL TL">
                         <ctrl style="tab_button_new" id="tab0" x="0" posref="TL TL" hardtext="uitabBuyNpc" group="buy:general_buy" onclick_l="set" params_l="dblink=UI:VARIABLES:BOTCHAT:BUY_LIST_SELECTED|value=0" />
                         <ctrl style="tab_button_new" id="tab1" posparent="tab0" hardtext="uitabBuyResale" group="buy:resale_buy" onclick_l="set" params_l="dblink=UI:VARIABLES:BOTCHAT:BUY_LIST_SELECTED|value=0" />
@@ -744,8 +728,8 @@
                 <group id="buy" child_resize_h="true" x="-4" y="-54" w="%trade_slot_w" posref="TR TR">
                     <!-- Those groups are show/hide according to GroupTab -->
                     <!--
-                                  <instance template="temp_list_buy" id="general_buy" use_quantity="true" filter_seller_type="npc_and_resale" />
-                                  -->
+                                <instance template="temp_list_buy" id="general_buy" use_quantity="true" filter_seller_type="npc_and_resale" />
+                                -->
                     <instance template="temp_list_buy" id="general_buy" use_quantity="true" filter_seller_type="npc" />
                     <instance template="temp_list_buy" id="resale_buy" use_quantity="true" filter_seller_type="resale" />
                     <instance template="temp_list_buy" id="player_buy" use_quantity="true" filter_seller_type="user" />
@@ -856,7 +840,7 @@
         </group>
     </group>
     <!-- ************************************** -->
-    <!-- *     BOT CHAT PAGE FOR NEWS          * -->
+    <!-- *     BOT CHAT PAGE FOR NEWS         * -->
     <!-- ************************************** -->
     <group id="bot_chat_news" style="bot_chat_window" posref="BL TL" min_w="320" max_w="320" w="320" x="352" y="200" pop_max_h="700" max_h="2000" active="false" title="uiBotChatNews">
         <group id="header_opened" child_resize_h="true" w="288" x="16" y="0" posref="TL TL">
@@ -887,8 +871,8 @@
             <!-- accept next step -->
             <!--
                 <group id="accept" posref="BR TR" posparent="mission_end_text" child_resize_h="true" child_resize_w="true">
-                        <ctrl type="button" id="confirm_button" posref="TR TR" x="0" y="0" button_type="push_button" onclick_l="accept_next_step" tx_normal="w_answer_16_valid.tga" tx_pushed="w_answer_16_valid.tga" tx_over="W_button_16_over.tga" global_color_normal="false" global_color_pushed="false"/>
-                        <view type="text" id="sell_text" posref="ML MR" posparent="confirm_button" x="-8" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiSell" active="false" global_color="false" />
+                        <ctrl type="button" id="confirm_button"                  posref="TR TR" x="0" y="0" button_type="push_button" onclick_l="accept_next_step" tx_normal="w_answer_16_valid.tga" tx_pushed="w_answer_16_valid.tga" tx_over="W_button_16_over.tga" global_color_normal="false" global_color_pushed="false"/>
+                        <view type="text"   id="sell_text"                               posref="ML MR" posparent="confirm_button" x="-8" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiSell"           active="false" global_color="false" />
                 </group>
                 -->
         </group>
@@ -949,11 +933,11 @@
     <!-- *   BOT CHAT PAGE FOR MISSIONS * -->
     <!-- ******************************** -->
     <!-- Mission Page is used for :
-  - Mission
-  - ZC Charge acquiring
-  - Building acquiring
-  - BotMaster Buy
-  - BotMaster Upgrade
+        - Mission
+        - ZC Charge acquiring
+        - Building acquiring
+        - BotMaster Buy
+        - BotMaster Upgrade
 -->
     <variable entry="UI:TEMP:MISSION:ICON" type="sint32" value="0" />
     <variable entry="UI:TEMP:MISSION:MISSION_TYPE" type="sint32" value="0" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/commands.xml b/ryzom/client/data/gamedev/interfaces_v3/commands.xml
index 09b4b2a78..3ca5c85fb 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/commands.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/commands.xml
@@ -87,10 +87,10 @@
     <command name="showonline" action="command" params="a showOnline $" />
     <command name="showOnline" action="command" params="a showOnline $" />
     <command name="loot" action="inv_temp_all" params="" />
-    <command name="setuiscale" action="set_ui_scale" params="scale=$" />
     <command name="mapsearch" action="proc" params="map_search_show_set|+" />
     <command name="mapsearch" action="proc" params="map_search_show" />
     <!-- WebIG -->
     <command name="go" action="browse" params="name=ui:interface:webig:content:html|url=home" />
     <command name="webdev" action="browse" params="name=ui:interface:webig:content:html|url=http://localhost/index.html" />
+    <command name="setuiscale" action="set_ui_scale" params="scale=$" />
 </interface_config>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/compass.xml b/ryzom/client/data/gamedev/interfaces_v3/compass.xml
index 4c4863e51..1862a96eb 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/compass.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/compass.xml
@@ -37,7 +37,7 @@
         <action handler="music_player" params="pause" cond="eq(@UI:TEMP:MP3_PLAYING,0)" />
     </proc>
     <group type="modal" id="playlist" posparent="mp3_player" posref="BM TM" w="234" max_h="250" child_resize_h="true" child_resize_hmargin="10" options="layer0" mouse_pos="false" escapable="true" exit_click_out="true" on_active="" on_active_params="">
-        <view type="text" id="title" posref="TL TL" x="8" y="-8" hardtext="uiPlaylistTitle" shadow="true" color="255 255 255 255" fontsize="12" />
+        <view type="text" id="title" posref="TL TL" x="8" y="-8" hardtext="" shadow="true" color="255 255 255 255" fontsize="12" />
         <ctrl type="button" id="close" button_type="push_button" posref="TR TR" x="-8" y="-8" tx_normal="w_win_close.tga" tx_pushed="w_win_close.tga" tx_over="W_button_14_over.tga" onclick_l="leave_modal" params_l="" />
         <ctrl style="text_button_header" button_type="push_button" id="refresh" posparent="close" posref="ML MR" x="-4" y="0" hardtext="uiPlaylistRefresh" onclick_l="music_player" params_l="play_songs" />
         <ctrl style="text_button_header" button_type="toggle_button" id="shuffle" posparent="refresh" posref="ML MR" x="-4" y="0" hardtext="S" onclick_l="proc" params_l="proc_mp3_toggle_shuffle" />
@@ -78,13 +78,13 @@
             <!-- Slots of Open/Playlist buttons -->
             <view id="slot5" type="bitmap" posref="MR ML" posparent="volume_control" x="4" y="3" texture="mp3_button_slot.tga" />
             <!--
-<view id="slot6" type="bitmap" posref="TR TL" posparent="slot5" x="2" y="0" texture="mp3_button_slot.tga" />
+    <view id="slot6" type="bitmap" posref="TR TL" posparent="slot5" x="2" y="0" texture="mp3_button_slot.tga" />
                 -->
             <!-- Open/Playlist buttons -->
             <ctrl type="button" id="but_open" button_type="push_button" posref="MM MM" posparent="slot5" tx_normal="mp3_button_list.tga" tx_pushed="mp3_button_list.tga" tx_over="mp3_button_over.tga" onclick_l="enter_modal" params_l="group=ui:interface:playlist" tooltip="uiMP3Playlist" />
             <!--
                 <ctrl type="button" id="but_list" button_type="push_button" posref="MM MM" posparent="slot6"
-                        tx_normal="mp3_button_list.tga" tx_pushed="mp3_button_list.tga" tx_over="mp3_button_over.tga"
+      tx_normal="mp3_button_list.tga" tx_pushed="mp3_button_list.tga" tx_over="mp3_button_over.tga"
                         onclick_l="enter_modal" params_l="group=ui:interface:playlist" tooltip="uiMP3Playlist" />
                 -->
             <!-- TOOLTIPS -->
@@ -123,8 +123,8 @@
         <action handler="set" cond="ne(@UI:SAVE:RADARZOOM,3)" params="dblink=UI:SAVE:RADARZOOM|value=add(@UI:SAVE:RADARZOOM,1)" icon="w_button_radar_moins.tga" />
     </proc>
     <proc id="radar_proc_zoom">
-        <action handler="set" params="target_property=ui:interface:compass:visuel:range:hardtext|value=switch(@0, 'uiRadarZoom0', 'uiRadarZoom1', 'uiRadarZoom2', 'uiRadarZoom3')" />
-        <action handler="set" params="target_property=ui:interface:compass:visuel:radar:world_size|value=switch(@0, 50.0, 100.0, 250.0, 500.0)" />
+        <action handler="set" params="target_property=ui:interface:compass:visuel:range:hardtext| value=switch(@0, 'uiRadarZoom0', 'uiRadarZoom1', 'uiRadarZoom2', 'uiRadarZoom3')" />
+        <action handler="set" params="target_property=ui:interface:compass:visuel:radar:world_size| value=switch(@0, 50.0, 100.0, 250.0, 500.0)" />
     </proc>
     <define id="landmark_menu_max_visible" value="25" />
     <group id="compass_menu" type="menu_compas" extends="base_menu_with_color" posref="TL TL" x="0" y="0" mouse_pos="true" exit_click_b="true" force_inside_screen="true" compass="ui:interface:compass">
@@ -239,9 +239,9 @@
         <action id="zo" name="uimZoomOut" handler="proc" params="radar_proc_zoom_out" icon="arbo_open_first.tga" />
         <separator />
         <!--
-  <action id="lock_unlock" name="uimLockUnlock" handler="lock_unlock" cond="eq(@UI:VARIABLES:GC_POPUP, 1)"/>    
-  <action id="help" name="uimHelp" handler="ic_help" cond="eq(@UI:VARIABLES:GC_HAS_HELP, 1)"/>
-  -->
+        <action id="lock_unlock" name="uimLockUnlock" handler="lock_unlock" cond="eq(@UI:VARIABLES:GC_POPUP, 1)"/>
+        <action id="help" name="uimHelp" handler="ic_help" cond="eq(@UI:VARIABLES:GC_HAS_HELP, 1)"/>
+        -->
     </group>
     <group id="compass" type="compas" movable="true" w="182" h="150" openable="false" resizer="false" header_active="false" right_button="false" group_onclick_r="active_menu" opened="false" options="compass" on_active="proc" on_active_params="compass_proc_active" on_deactive="proc" on_deactive_params="compas_proc_deactive" group_params_r="menu=ui:interface:compass_menu" north_color="255 255 255 255" selection_color="0 0 255 255" respawn_color="66 66 77 255" home_color="255 0 255 255" continent_landmark_color="0 255 0 255" mission_landmark_color="255 0 255 255" user_landmark_color="255 255 0 255" new_target_selected_color="255 0 0 255" help_page="interf_compass.html">
         <group id="header_closed" x="0" y="0" w="166" h="156" posref="TL TL">
@@ -258,7 +258,7 @@
         <group id="mail" posref="BR BR" group_onclick_l="show_hide" group_params_l="mailbox" tooltip="uiMk_interaction5" w="32" h="24" x="-4" y="50">
             <view id="envelop" type="bitmap" texture="mail.tga" global_color="false" />
             <view type="text" id="mail_nb" posref="BR BR" x="0" y="0" color="255 255 255 255" shadow="true" global_color="false" fontsize="10" hardtext="" />
-            <!--    <view type="text" id="mail_nb2" posparent="mail_nb" posref="BL BR" x="-2" y="0" color="255 255 255 255" shadow="true" global_color="false" fontsize="10" hardtext="x" /> -->
+            <!--      <view type="text" id="mail_nb2" posparent="mail_nb" posref="BL BR" x="-2" y="0" color="255 255 255 255" shadow="true" global_color="false" fontsize="10" hardtext="x" /> -->
         </group>
         <link expr="@UI:VARIABLES:MAIL_WAITING" target="mail:active" />
         <!-- new guild forum message notifier -->
@@ -320,10 +320,10 @@
                 <ctrl type="button" id="zoom_out" button_type="push_button" posref="BL BL" x="9" y="9"
                         tx_normal="w_button_radar_moins.tga" tx_pushed="w_button_radar_moins.tga" tx_over="W_button_14_over.tga"
                         color="255 255 255 255" col_pushed="255 255 255 255" col_over="255 255 255 255"
-                        onclick_l="proc" params_l="radar_proc_zoom_out" render_layer="4" />
+                        onclick_l="proc" params_l="radar_proc_zoom_out" render_layer="4"  />
                 -->
             <view id="radar" type="radar" texture_std="w_radar_point.tga" texture_missionlist="radar_mission_16.tga" texture_missionauto="radar_mission3_16.tga" texture_missionstep="radar_mission2_16.tga" mini_texture_missionlist="radar_mission_mini_16.tga" mini_texture_missionauto="radar_mission3_mini_16.tga" mini_texture_missionstep="radar_mission2_mini_16.tga" world_size="50.0" posparent="back" posref="MM MM" w="108" h="108" y="8" global_color="false" />
-            <!--    
+            <!--
                 <link expr="ne(@UI:SAVE:RADARZOOM,0)" target="zoom_in:active" />
                 <link expr="ne(@UI:SAVE:RADARZOOM,3)" target="zoom_out:active" />
                 -->
@@ -344,7 +344,7 @@
     <group id="connection" type="container" title="uiConnectionTitle_short" title_opened="uiConnectionTitle" w="192" global_color="false" movable="true" active="false" openable="true" opened="true" resizer="false" header_color="UI:SAVE:WIN:COLORS:OPT" on_active="set" on_active_params="dblink=UI:VARIABLES:ISACTIVE:CONNECTION|value=1" on_deactive="set" on_deactive_params="dblink=UI:VARIABLES:ISACTIVE:CONNECTION|value=0" on_open="set" on_open_params="target_property=ui:interface:connection:w|value=192" on_close="set" on_close_params="target_property=ui:interface:connection:w|value=64">
         <group id="header_closed" x="0" y="0" h="74" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
             <!--
-                <group id="server_state" posref="TM TM" w="28" h="16" x="0">
+                <group id="server_state" posref="TM TM" w="28" h="16" x="0" >
                         <view type="text" id="server0" posref="ML ML" color="255 255 255 255" fontsize="10" shadow="true" global_color="false" hardtext="uiServerState0" />
                         <view type="text" id="server1" posref="ML ML" color="255 255 255 255" fontsize="10" shadow="true" global_color="false" hardtext="uiServerState1" />
                         <view type="text" id="server2" posref="ML ML" color="255 255 255 255" fontsize="10" shadow="true" global_color="false" hardtext="uiServerState2" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/config.xml b/ryzom/client/data/gamedev/interfaces_v3/config.xml
index 4f461162d..cb4a66c9c 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/config.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/config.xml
@@ -1,13 +1,13 @@
 <interface_config>
     <root id="interface" x="0" y="0" w="800" h="600" active="true" />
-    <!-- This value is saved/loaded in the .icfg (default: 0). 
- It is used in combination with RESET_VER_* defines, to avoid loading old DB parts of .icfg 
- Increment it each time you want to force to reset some db vars, and add/replace the RESET_VER_* defines
- of the variables you want to force
+    <!-- This value is saved/loaded in the .icfg (default: 0).
+        It is used in combination with RESET_VER_* defines, to avoid loading old DB parts of .icfg
+        Increment it each time you want to force to reset some db vars, and add/replace the RESET_VER_* defines
+        of the variables you want to force
 -->
     <define id="UI_DB_SAVE_VERSION" value="1" />
     <!-- ****************************** -->
-    <!-- *  WINDOWS COLORS  * -->
+    <!-- *       WINDOWS COLORS       * -->
     <!-- ****************************** -->
     <variable entry="UI:SAVE:WIN:COLORS:PLA" type="rgba" value="167 205 107 255" />
     <variable entry="UI:SAVE:WIN:COLORS:ANI" type="rgba" value="189 154 123 255" />
@@ -62,11 +62,11 @@
     <variable entry="UI:SAVE:R2_FORM:ROLLOVER_CONTAINER_ALPHA" type="sint32" value="0" />
     <variable entry="UI:SAVE:R2_FORM:USE_GLOBAL_ALPHA_SETTINGS" type="bool" value="true" />
     <!-- ****************************** -->
-    <!-- *  ENTITIES COLORS      * -->
+    <!-- *       ENTITIES COLORS      * -->
     <!-- ****************************** -->
     <variable entry="UI:SAVE:ENTITY:CONTEXT_HELP" type="bool" value="true" />
     <!-- ****************************** -->
-    <!-- *  ENTITIES COLORS      * -->
+    <!-- *       ENTITIES COLORS      * -->
     <!-- ****************************** -->
     <variable entry="UI:SAVE:ENTITY:COLORS:DEAD" type="rgba" value="255 255 0 255" />
     <variable entry="UI:SAVE:ENTITY:COLORS:USER" type="rgba" value="255 112 249 255" />
@@ -94,13 +94,13 @@
     <variable entry="UI:INTERFACE:ENTITY:COLORS:EG" type="rgba" value="98 225 240 255" />
     <variable entry="UI:INTERFACE:ENTITY:COLORS:OBSERVER" type="rgba" value="248 68 7 255" />
     <link expr="depends(@UI:SAVE:ENTITY:COLORS)" action="update_entities_color" params="" />
-    <!-- at .icfg load: don't load those variables if the define value is < UI_DB_SAVE_VERSION that is in the old .icfg 
- NB: replace the ':' of the db name with '_'
+    <!-- at .icfg load: don't load those variables if the define value is < UI_DB_SAVE_VERSION that is in the old .icfg
+        NB: replace the ':' of the db name with '_'
 -->
     <define id="RESET_VER_UI_SAVE_ENTITY_COLORS_TARGET" value="1" />
     <define id="RESET_VER_UI_SAVE_ENTITY_COLORS_NPC" value="1" />
     <!-- ****************************** -->
-    <!-- *  INSCENE INTERFACE    * -->
+    <!-- *       INSCENE INTERFACE    * -->
     <!-- ****************************** -->
     <variable entry="UI:SAVE:INSCENE:USER:GUILD_SYMBOL" type="bool" value="false" />
     <variable entry="UI:SAVE:INSCENE:USER:NAME" type="bool" value="false" />
@@ -169,7 +169,7 @@
     <define id="armour_color_6" value="250 250 250 255" />
     <define id="armour_color_7" value="80 80 120 255" />
     <!-- ****************************** -->
-    <!-- *  LANDMARK COLORS      * -->
+    <!-- *       LANDMARK COLORS      * -->
     <!-- ****************************** -->
     <variable entry="UI:SAVE:LANDMARK:COLORS:MISC" type="rgba" value="255 0 255 255" />
     <variable entry="UI:SAVE:LANDMARK:COLORS:TRIBE" type="rgba" value="180 180 180 255" />
@@ -919,6 +919,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
         <param name="ctrl_sheet_greenify_color" value="140 255 140 150" />
         <param name="ctrl_text_greenify_color" value="140 255 140 150" />
         <param name="text_over_back_color" value="64 64 64 255" />
+        <!--    <param name="font"
+           value="basic.ttf" /> -->
         <param name="font" value="ryzom.ttf" />
         <param name="monospace_font" value="ryzom_monospace.ttf" />
         <param name="add_coef_font" value="1" />
@@ -1116,28 +1118,28 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <!-- index of the selected trade item in the vendor list-->
     <define id="num_stackable_item_to_trade" value="%bot_chat_base:NUM_STACKABLE" />
     <define id="max_num_stackable_item_to_trade" value="%bot_chat_base:MAX_NUM_STACKABLE" />
-    <!--<define id="bag1_touched" value="UI:BAG_TOUCHED:1"/>
-<define id="bag2_touched" value="UI:BAG_TOUCHED:2"/>
-<define id="bag3_touched" value="UI:BAG_TOUCHED:3"/>
-<define id="bag4_touched" value="UI:BAG_TOUCHED:4"/>
-<define id="bag5_touched" value="UI:BAG_TOUCHED:5"/>
-<define id="bag6_touched" value="UI:BAG_TOUCHED:6"/>-->
+    <!--<define id="bag1_touched"                   value="UI:BAG_TOUCHED:1"/>
+<define id="bag2_touched"                   value="UI:BAG_TOUCHED:2"/>
+<define id="bag3_touched"                   value="UI:BAG_TOUCHED:3"/>
+<define id="bag4_touched"                   value="UI:BAG_TOUCHED:4"/>
+<define id="bag5_touched"                   value="UI:BAG_TOUCHED:5"/>
+<define id="bag6_touched"                   value="UI:BAG_TOUCHED:6"/>-->
     <define id="inventory_touched" value="UI:INVENTORY_TOUCHED" />
-    <!--<define id="bags_touched" value="UI:PLAYER_TOUCHED"/>
-<define id="player_touched" value="UI:PLAYER_TOUCHED"/>
-<define id="money_touched" value="UI:MONEY_TOUCHED"/>
-<define id="bag1_open_value" value="UI:BAG_OPEN_VALUE:1"/>
-<define id="bag2_open_value" value="UI:BAG_OPEN_VALUE:2"/>
-<define id="bag3_open_value" value="UI:BAG_OPEN_VALUE:3"/>
-<define id="bag4_open_value" value="UI:BAG_OPEN_VALUE:4"/>-->
+    <!--<define id="bags_touched"                   value="UI:PLAYER_TOUCHED"/>
+<define id="player_touched"                 value="UI:PLAYER_TOUCHED"/>
+<define id="money_touched"                  value="UI:MONEY_TOUCHED"/>
+<define id="bag1_open_value"                value="UI:BAG_OPEN_VALUE:1"/>
+<define id="bag2_open_value"                value="UI:BAG_OPEN_VALUE:2"/>
+<define id="bag3_open_value"                value="UI:BAG_OPEN_VALUE:3"/>
+<define id="bag4_open_value"                value="UI:BAG_OPEN_VALUE:4"/>-->
     <define id="inventory_open_value" value="UI:INVENTORY_OPEN_VALUE" />
-    <!--<define id="bags_open_value" value="UI:PLAYER_OPEN_VALUE"/>
-<define id="player_open_value" value="UI:PLAYER_OPEN_VALUE"/>
-<define id="money_open_value" value="UI:MONEY_OPEN_VALUE"/>-->
+    <!--<define id="bags_open_value"                value="UI:PLAYER_OPEN_VALUE"/>
+<define id="player_open_value"              value="UI:PLAYER_OPEN_VALUE"/>
+<define id="money_open_value"               value="UI:MONEY_OPEN_VALUE"/>-->
     <!--
-<define id="trade_item" value="UI:SELECTED_ITEM_SELECTION_GROUP"/>
-<define id="selected_item_sheet_id" value="UI:SELECTED_ITEM_SHEET_ID" />
-<define id="price_of_item_to_trade" value="%bot_chat_base:PRICE_OF_ITEM_TO_TRADE" />-->
+<define id="trade_item"  value="UI:SELECTED_ITEM_SELECTION_GROUP"/>
+<define id="selected_item_sheet_id"         value="UI:SELECTED_ITEM_SHEET_ID" />
+<define id="price_of_item_to_trade"         value="%bot_chat_base:PRICE_OF_ITEM_TO_TRADE" />-->
     <!-- price of the item to sell, or -1 if it hasn't been received from server -->
     <define id="money_proposal" value="UI:MONEY_PROPOSAL" />
     <define id="can_valid_player_trade" value="UI:CAN_VALID_PLAYER_TRADE" />
@@ -1148,33 +1150,33 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <!-- ********************** -->
     <define id="set_base" value="LOCAL:INVENTORY" />
     <!-- Sheathes -->
-    <!-- mgt of active sheath is special: must write in %ui_set_active but must read in %set_active 
- It's because Server Replication will write in %set_active. Since we need to put observers on %ui_set_active
- to send msg to servers when the value change, %ui_set_active and %set_active MUST NOT be the same variable.
- Else it will loops: receive SERVER:INVENTORY:ACTIVE_SHEAT, copies to LOCAL:INVENTORY:ACTIVE_SHEAT, and if different
- from last time (possible due to lag!!) then activate observers and resend a msg to server!
+    <!-- mgt of active sheath is special: must write in %ui_set_active but must read in %set_active
+        It's because Server Replication will write in %set_active. Since we need to put observers on %ui_set_active
+        to send msg to servers when the value change, %ui_set_active and %set_active MUST NOT be the same variable.
+        Else it will loops: receive SERVER:INVENTORY:ACTIVE_SHEAT, copies to LOCAL:INVENTORY:ACTIVE_SHEAT, and if different
+        from last time (possible due to lag!!) then activate observers and resend a msg to server!
 -->
     <!--
-<define id="ui_set_active" value="UI:INVENTORY:ACTIVE_SHEATH" />
-<define id="set_active" value="%set_base:ACTIVE_SHEATH" />
-<define id="set_nb" value="%set_base:NB_SHEATH" />
-<define id="from_code_set0" value_from_code="getInventorySlot('sheath1')" />
-<define id="from_code_set1" value_from_code="getInventorySlot('sheath2')" />
-<define id="from_code_set2" value_from_code="getInventorySlot('sheath3')" />
-<define id="from_code_set3" value_from_code="getInventorySlot('sheath4')" />
-<define id="from_code_set4" value_from_code="getInventorySlot('sheath5')" />
-<define id="from_code_set5" value_from_code="getInventorySlot('sheath6')" />
-<define id="set0" value="%set_base:%from_code_set0" />
-<define id="set1" value="%set_base:%from_code_set1" />
-<define id="set2" value="%set_base:%from_code_set2" />
-<define id="set3" value="%set_base:%from_code_set3" />
-<define id="set4" value="%set_base:%from_code_set4" />
-<define id="set5" value="%set_base:%from_code_set5" />
+<define id="ui_set_active"      value="UI:INVENTORY:ACTIVE_SHEATH" />
+<define id="set_active"         value="%set_base:ACTIVE_SHEATH" />
+<define id="set_nb"             value="%set_base:NB_SHEATH" />
+<define id="from_code_set0"     value_from_code="getInventorySlot('sheath1')" />
+<define id="from_code_set1"     value_from_code="getInventorySlot('sheath2')" />
+<define id="from_code_set2"     value_from_code="getInventorySlot('sheath3')" />
+<define id="from_code_set3"     value_from_code="getInventorySlot('sheath4')" />
+<define id="from_code_set4"     value_from_code="getInventorySlot('sheath5')" />
+<define id="from_code_set5"     value_from_code="getInventorySlot('sheath6')" />
+<define id="set0"                       value="%set_base:%from_code_set0" />
+<define id="set1"                       value="%set_base:%from_code_set1" />
+<define id="set2"                       value="%set_base:%from_code_set2" />
+<define id="set3"                       value="%set_base:%from_code_set3" />
+<define id="set4"                       value="%set_base:%from_code_set4" />
+<define id="set5"                       value="%set_base:%from_code_set5" />
 -->
     <define id="hand_r" value="%set_base:HAND:0" />
     <define id="hand_l" value="%set_base:HAND:1" />
     <define id="bag" value="%set_base:BAG" />
-    <!--<define id="bag_nb" value="%set_base:NB_BAG" />-->
+    <!--<define id="bag_nb"                 value="%set_base:NB_BAG" />-->
     <define id="bag_bulk_max" value="SERVER:STATIC_DATA:BAG_BULK_MAX" />
     <!-- Animals -->
     <define id="pa" value="SERVER:PACK_ANIMAL" />
@@ -1267,10 +1269,10 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <define id="max_room_invslot" value_from_code="getMaxRoomInvSlot()" />
     <define id="max_guild_invslot" value_from_code="getMaxGuildInvSlot()" />
     <define id="max_temp_invslot" value_from_code="getMaxTempInvSlot()" />
-    <!--<define id="from_code_harvest" value_from_code="getInventorySlot('harvest')"/>
-<define id="harvest_inventory" value="%set_base:%from_code_harvest"/>
-<define id="from_code_pickup" value_from_code="getInventorySlot('pickup')"/>
-<define id="pickup_inventory" value="%set_base:%from_code_pickup"/>-->
+    <!--<define id="from_code_harvest"      value_from_code="getInventorySlot('harvest')"/>
+<define id="harvest_inventory"  value="%set_base:%from_code_harvest"/>
+<define id="from_code_pickup"   value_from_code="getInventorySlot('pickup')"/>
+<define id="pickup_inventory"   value="%set_base:%from_code_pickup"/>-->
     <!-- TEMP TEMP TEMP : we have to found an entry with gamedev for the temp inventory -->
     <define id="temp_inv_dbentry" value="%set_base:TEMP" />
     <define id="guild_inv_dbentry" value="SERVER:GUILD:INVENTORY" />
@@ -1409,12 +1411,12 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <sheet_selection name="teleport_selection" texture="item_selection.tga" color="255 255 255 255" global_color="true" />
     <sheet_selection name="mission_selection" texture="item_selection.tga" color="255 255 255 255" global_color="true" />
     <!-- ****************************** -->
-    <!-- *     CODE FILTERS     * -->
+    <!-- *     CODE FILTERS           * -->
     <!-- ****************************** -->
     <!-- dummy for sheets not linked -->
     <variable entry="UI:EMPTY:SHEET" type="sint64" value="0" />
     <!-- ****************************** -->
-    <!-- *        MISC          * -->
+    <!-- *             MISC           * -->
     <!-- ****************************** -->
     <variable entry="UI:SAVE:SHOW_CLOCK" type="bool" value="false" />
     <variable entry="UI:SAVE:SHOW_CLOCK_12H" type="bool" value="false" />
@@ -1469,7 +1471,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <link expr="identity(ilinear(getLightLevel(), getRed(intToColor(@UI:SAVE:DAY_COLOR)), getRed(intToColor(@UI:SAVE:NIGHT_COLOR))), @UI:VARIABLES:CURRENT_TIME)" target="@UI:SAVE:COLOR:R" />
     <link expr="identity(ilinear(getLightLevel(), getGreen(intToColor(@UI:SAVE:DAY_COLOR)), getGreen(intToColor(@UI:SAVE:NIGHT_COLOR))), @UI:VARIABLES:CURRENT_TIME)" target="@UI:SAVE:COLOR:G" />
     <link expr="identity(ilinear(getLightLevel(), getBlue(intToColor(@UI:SAVE:DAY_COLOR)), getBlue(intToColor(@UI:SAVE:NIGHT_COLOR))), @UI:VARIABLES:CURRENT_TIME)" target="@UI:SAVE:COLOR:B" />
-    <!--<link expr="depends(@UI:VARIABLES:CURRENT_TIME)" action="set" params="dblink=UI:SAVE:COLOR:A|value=ilinear(getLightLevel(), @UI:SAVE:DAY_COLOR:A, @UI:SAVE:NIGHT_COLOR:A)" />-->
+    <!--<link expr="depends(@UI:VARIABLES:CURRENT_TIME)" action="set"
+                params="dblink=UI:SAVE:COLOR:A|value=ilinear(getLightLevel(), @UI:SAVE:DAY_COLOR:A, @UI:SAVE:NIGHT_COLOR:A)" />-->
     <!-- The User Target Slot and UID -->
     <variable entry="UI:VARIABLES:TARGET:UID" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:TARGET:SLOT" type="sint64" value="-1" />
@@ -1497,6 +1500,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <variable entry="UI:SAVE:CHAT:FONT_SIZE" type="sint32" value="10" />
     <variable entry="UI:SAVE:CHAT:MULTI_LINE_SPACE" type="sint32" value="0" />
     <variable entry="UI:SAVE:CHAT:SHADOWED_TEXT" type="bool" value="true" />
+    <!-- ******************************* -->
+    <!-- * CHAT TRANSLATION PARAMETERS * -->
+    <!-- ******************************* -->
     <variable entry="UI:SAVE:TRANSLATION:EN:INVERSE_DISPLAY" type="bool" value="false" />
     <variable entry="UI:SAVE:TRANSLATION:EN:HIDE_FLAG" type="bool" value="false" />
     <variable entry="UI:SAVE:TRANSLATION:FR:INVERSE_DISPLAY" type="bool" value="false" />
@@ -1520,7 +1526,7 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <variable entry="UI:SAVE:TRANSLATION:SYSTEM:DISABLE" type="bool" value="false" />
     <variable entry="UI:SAVE:TRANSLATION:REGION:DISABLE" type="bool" value="false" />
     <!-- ****************************** -->
-    <!-- *    CHAT COLORS    * -->
+    <!-- *         CHAT COLORS        * -->
     <!-- ****************************** -->
     <variable entry="UI:SAVE:CHAT:COLORS:SPEAKER" type="rgba" value="220 220 50 255" />
     <variable entry="UI:SAVE:CHAT:COLORS:SAY" type="rgba" value="255 255 255 255" />
@@ -1715,6 +1721,7 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <variable entry="UI:VARIABLES:ISACTIVE:MACROS" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:ISACTIVE:ENCYCLOPEDIA" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:ISACTIVE:MP3PLAYER" type="sint32" value="0" />
+    <variable entry="UI:VARIABLES:ISACTIVE:BG_DOWNLOADER" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:ISACTIVE:COSMETICS" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:ISACTIVE:MILKO_PAD" type="sint32" value="0" />
     <!-- ***************************** -->
@@ -1734,7 +1741,7 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <variable entry="UI:SAVE:BOTCHAT_FILTER:ITEM_TYPE" type="sint32" value="%item_type_unknown" />
     <variable entry="UI:SAVE:BOTCHAT_FILTER:RESET_ON_OPEN" type="sint32" value="1" />
     <!-- ***************************** -->
-    <!-- *  STRING CASE OPTION      * -->
+    <!-- *  STRING CASE OPTION       * -->
     <!-- ***************************** -->
     <define id="case_normal" value="0" />
     <define id="case_lower" value="1" />
@@ -1761,7 +1768,7 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <define id="focus_color" value="0 128 255 255" />
     <define id="bulk_color" value="215 185 75 255" />
     <!-- ***************************** -->
-    <!-- *     ITEM PART ICONS         * -->
+    <!-- *          ITEM PART ICONS          * -->
     <!-- ***************************** -->
     <define id="item_part_icon_MpL" value="ICO_Blade.tga" />
     <define id="item_part_icon_MpH" value="ICO_hammer.tga" />
@@ -1792,7 +1799,7 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <!-- None, for item part selection -->
     <define id="item_part_icon_" value="No_Action.tga" />
     <!-- ***************************** -->
-    <!-- *     PVP FACTION ICONS     * -->
+    <!-- *          PVP FACTION ICONS        * -->
     <!-- ***************************** -->
     <define id="pvp_faction_icon_None" value="" />
     <define id="pvp_faction_icon_Neutral" value="" />
@@ -1803,13 +1810,13 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <define id="pvp_faction_icon_Tryker" value="faction_Tryker.tga" />
     <define id="pvp_faction_icon_Zorai" value="faction_Zorai.tga" />
     <!-- ******************************** -->
-    <!-- *     BRICK FALGS        * -->
+    <!-- *          BRICK FALGS             * -->
     <!-- ******************************** -->
     <define id="brick_flags_critical_hit" value="8" />
     <define id="brick_flags_parry" value="16" />
     <define id="brick_flags_dodge" value="32" />
     <!-- ******************************** -->
-    <!-- *     ITEM TYPE TO ITEM SHEET * -->
+    <!-- *          ITEM TYPE TO ITEM SHEET * -->
     <!-- ******************************** -->
     <!-- Melee weapons -->
     <define id="item_type_to_item_sheet_DAGGER" value="iccm1pd.sitem" />
@@ -1865,14 +1872,14 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <define id="item_type_to_item_sheet_PENDANT" value="icfjp.sitem" />
     <define id="item_type_to_item_sheet_RING" value="icfjr.sitem" />
     <!--
-<define id="item_type_to_item_sheet_CLEAVER" value="" />
-<define id="item_type_to_item_sheet_SHEARS" value="" />
-<define id="item_type_to_item_sheet_FISHINGPROD" value="" />
-<define id="item_type_to_item_sheet_SEARAKE" value="" />
-<define id="item_type_to_item_sheet_SPADE" value="" />
-<define id="item_type_to_item_sheet_CATLEPROD" value="" />
-<define id="item_type_to_item_sheet_STICK" value="" />
-<define id="item_type_to_item_sheet_WHIP" value="" />
+<define id="item_type_to_item_sheet_CLEAVER"            value="" />
+<define id="item_type_to_item_sheet_SHEARS"             value="" />
+<define id="item_type_to_item_sheet_FISHINGPROD"                value="" />
+<define id="item_type_to_item_sheet_SEARAKE"            value="" />
+<define id="item_type_to_item_sheet_SPADE"              value="" />
+<define id="item_type_to_item_sheet_CATLEPROD"          value="" />
+<define id="item_type_to_item_sheet_STICK"              value="" />
+<define id="item_type_to_item_sheet_WHIP"               value="" />
 -->
     <!-- Tools -->
     <define id="item_type_to_item_sheet_ArmorTool" value="itarmor.sitem" />
@@ -1882,20 +1889,20 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <define id="item_type_to_item_sheet_JewelryTool" value="itjewel.sitem" />
     <define id="item_type_to_item_sheet_ToolMaker" value="ittool.sitem" />
     <!--
-<define id="item_type_to_item_sheet_CAMPSFIRE" value="" />
+<define id="item_type_to_item_sheet_CAMPSFIRE"          value="" />
 -->
     <!-- Misc -->
     <define id="item_type_to_item_sheet_MEKTOUB_PACKER_TICKET" value="iapd.sitem" />
     <define id="item_type_to_item_sheet_MEKTOUB_MOUNT_TICKET" value="iasd.sitem" />
     <define id="item_type_to_item_sheet_JOB_ELEMENT" value="rpjob_elementary.sitem" />
     <!-- ************************ -->
-    <!-- *     DYNAMIC CHAT    * -->
+    <!-- *          DYNAMIC CHAT    * -->
     <!-- ************************ -->
     <define id="max_dyn_chan_per_player" value_from_code="getMaxDynChanPerPlayer()" />
     <variable entry="UI:SAVE:ISDETACHED:DYNAMIC_CHAT$i" type="sint32" value="0" size="%max_dyn_chan_per_player" />
     <variable entry="UI:SAVE:ISENABLED:DYNAMIC_CHAT$i" type="sint32" value="1" size="%max_dyn_chan_per_player" />
     <!-- ************************ -->
-    <!-- *     MUSIC from DB   * -->
+    <!-- *          MUSIC from DB   * -->
     <!-- ************************ -->
     <!-- Mission musics -->
     <define id="max_num_missions" value_from_code="getMaxNumMissions()" />
@@ -1907,7 +1914,7 @@ This MUST follow the Enum MISSION_DESC::TIconId
     </template>
     <vector template="temp_music_for_mission" index="$i" _size="%max_num_missions" />
     <!-- ************************ -->
-    <!-- *     BAR MANAGER     * -->
+    <!-- *          BAR MANAGER     * -->
     <!-- ************************ -->
     <!-- Bars Variables -->
     <define id="max_animal" value_from_code="getMaxAnimal()" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml b/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml
index ff08a84e9..927d7d35f 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml
@@ -56,7 +56,7 @@
         <group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL">
             <group id="sbtree" posref="TL TL" sizeref="w3h" x="0" w="-14" y="-4" h="-4">
                 <group id="tree_list" type="tree" posref="TL TL" x="14" y="-4" col_over="255 255 255 48" col_select="255 255 255 80" max_sizeparent="parent" max_sizeref="wh" max_w="-10" max_h="-4">
-                    <!--                            
+                    <!--
                                 <node id="album"                name="uiEncyAlbum"              handler="proc"  params="ency_album"     fontsize="11" y_decal="-1" >
                                         <node id="theme"        name="uiEncyTheme"              handler="proc"  params="ency_theme"     fontsize="10" y_decal="-1" />
                                 </node>
@@ -93,7 +93,7 @@
                 <!--
                                 <group id="reward_text" posref="BM TM" posparent="reward" x="0" y="0" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="4" >
                                         <view type="bitmap" id="sep" posref="TL TL" scale="true" sizeref="w" h="2" texture="W_line_hor.tga" />
-                                        
+
                                         <view type="text_id" id="desc" posref="TL TL" sizeref="w" color="255 255 255 160" y="-8"
                                                 fontsize="12" shadow="true" multi_line="true" multi_line_space="0" />
                                 </group>
@@ -101,15 +101,15 @@
                 <!--
                                 <group id="reward" posref="TM TM" x="0" y="-16" sizeref="w" w="0" h="44">
                                         <view type="bitmap" id="sep" posref="TL TL" scale="true" sizeref="w" h="2" texture="W_line_hor.tga" />
-                                        
+
                                         <view style="ency_title2" type="text" id="icon" posref="MM MM" x="0" y="0" hardtext="WORK IN PROGRESS" />
                                 </group>
-                                
-                                
-                                
+
+
+
                                 <group id="reward_text" posref="BM TM" posparent="reward" x="0" y="0" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="4">
                                         <view type="bitmap" id="sep" posref="TL TL" scale="true" sizeref="w" h="2" texture="W_line_hor.tga" />
-                                        
+
                                         <view type="text" id="reward_txt" posref="TL TL" sizeref="w" color="255 255 255 160" y="-8"
                                                 fontsize="12" shadow="true" multi_line="true" multi_line_space="0" hardtext="uiEncyExplanation" />
                                 </group>
@@ -189,21 +189,27 @@
             <ctrl style="skin_scroll" id="scroll_bar_theme" align="T" target="theme" posparent="crop" posref="TL TR" x="-8" y="0" />
         </group>
     </group>
-    <group type="container" id="encyclopedia" active="false" w="950" h="700" pop_max_w="950" pop_max_h="700" pop_min_w="585" pop_min_h="120" header_color="UI:SAVE:WIN:COLORS:PLA" posref="TL TL" title="Mission Catalog" global_color="true" global_color_over="true" right_button="true" movable="true" lockable="true" openable="true" opened="true" resizer="true" active_savable="false">
+    <group type="container" id="encyclopedia" active="false" w="950" h="700" pop_max_w="950" pop_max_h="700" pop_min_w="621" pop_min_h="120" header_color="UI:SAVE:WIN:COLORS:PLA" posref="TL TL" title="Mission Catalog" global_color="true" global_color_over="true" right_button="true" movable="true" lockable="true" openable="true" opened="true" resizer="true" active_savable="false">
         <group id="header_closed" x="0" y="0" w="120" h="16" posref="TL TL" on_active="lua" on_active_params="game:closeWindowHeader()"></group>
-        <group id="header_opened" x="0" y="0" w="950" h="16" posref="TL TL" on_active="lua" on_active_params="game:openWindowHeader()" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">&gt;</group>
+        <group id="header_opened" x="0" y="0" w="950" h="16" posref="TL TL" on_active="lua" on_active_params="game:openWindowHeader()" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color"></group>
         <group id="content" x="0" y="0" w="0" h="0" posref="TL TL">
-            <group id="htmlA" type="html" posref="ML ML" url="http://app.ryzom.com" title_prefix="" sizeref="h" x="-16" y="0" w="220" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline">
+            <group id="htmlA" type="html" posref="TL TL" url="http://app.ryzom.com" title_prefix="" sizeref="h" x="-16" y="0" w="220" h="49" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline">
                 <group id="black" posref="BR BR" sizeref="hw" w="-16" h="0" inherit_gc_alpha="true" />
                 <view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false" color="255 255 255 0" />
                 <group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000" />
                 <ctrl style="skin_scroll" id="scroll_bar" x="8" />
             </group>
-            <group id="htmlB" type="html" posref="ML ML" url="http://app.ryzom.com" title_prefix="" sizeref="h" x="190" y="0" w="740" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline">
+            <group id="htmlB" type="html" posref="TL TL" url="http://app.ryzom.com" title_prefix="" sizeref="h" x="190" y="0" w="740" h="49" background_color="0 0 0 255" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline">
                 <group id="black" posref="BR BR" sizeref="hw" w="-16" h="0" inherit_gc_alpha="true" />
                 <view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false" color="255 255 255 0" />
                 <group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000" />
-                <ctrl style="skin_scroll" id="scroll_bar" x="8" />
+                <ctrl style="skin_scroll" id="scroll_bar" posref="TR TL" posparent="text_list" x="-8" />
+            </group>
+            <group id="htmlC" type="html" posref="TL TL" url="http://app.ryzom.com" title_prefix="" sizeref="h" x="190" y="0" w="740" h="49" background_color="0 0 0 255" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline">
+                <group id="black" posref="BR BR" sizeref="hw" w="-16" h="0" inherit_gc_alpha="true" />
+                <view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false" color="255 255 255 0" />
+                <group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000" />
+                <ctrl style="skin_scroll" id="scroll_bar" posref="TR TL" posparent="text_list" x="-8" />
             </group>
         </group>
     </group>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/game_config.xml b/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
index 59541bf75..ac594feac 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
@@ -289,8 +289,8 @@
             <group id="hud" active="false" posparent="crop" posref="TM TM" x="0" y="-8" sizeref="w" child_resize_h="true" child_resize_hmargin="4" w="-4" max_sizeparent="crop" max_sizeref="h" max_h="-4">
                 <!-- Entities Names -->
                 <view style="sgc_title" type="text" id="en" posref="TM TM" x="0" y="0" hardtext="uiHud" />
-                <!--<instance template="tgcw_checkbox" id="suc" text="uiShowUnderCursor" posref="TL TL" x="0" y="-20" />
-                   <instance template="tgcw_checkbox" id="sta" text="uiShowTargeted" posref="BL TL" posparent="suc" x="0" y="-12" />-->
+                <!--<instance template="tgcw_checkbox" id="suc"  text="uiShowUnderCursor"               posref="TL TL" x="0" y="-20" />
+                        <instance template="tgcw_checkbox" id="sta"  text="uiShowTargeted"                      posref="BL TL" posparent="suc"  x="0" y="-12" />-->
                 <instance template="tgcw_checkbox" id="swrc" text="uiSelectWithRClick" posref="TL TL" x="0" y="-20" />
                 <instance template="tgcw_checkbox" id="foa" text="uiFollowOnAtk" posref="BL TL" posparent="swrc" x="0" y="-12" />
                 <instance template="tgcw_checkbox" id="aos" text="uiAtkOnSelect" posref="BL TL" posparent="foa" x="0" y="-12" />
@@ -653,8 +653,8 @@
                 <param ui="fx:bloom_gr:square_bloom:c" type="cfg" widget="boolbut" realtime="true" link="SquareBloom" preset="UI:TEMP:PRESET_FX" />
                 <param ui="fx:bloom_gr:density_bloom:c" type="cfg" widget="sbfloat_round" realtime="true" ui_view="fx:bloom_gr:density_bloom:c_res" link="DensityBloom" preset="UI:TEMP:PRESET_FX" />
                 <!--
-                   <param ui="hud:suc:c" type="cfg" widget="boolbut" link="ShowNameUnderCursor" realtime="true"/>
-                   <param ui="hud:sta:c" type="cfg" widget="boolbut" link="ShowNameSelected" realtime="true"/>
+                        <param ui="hud:suc:c"  type="cfg" widget="boolbut" link="ShowNameUnderCursor" realtime="true"/>
+                        <param ui="hud:sta:c"  type="cfg" widget="boolbut" link="ShowNameSelected"    realtime="true"/>
 -->
                 <param ui="hud:swrc:c" type="cfg" widget="boolbut" link="SelectWithRClick" realtime="true" />
                 <param ui="hud:foa:c" type="cfg" widget="boolbut" link="FollowOnAtk" realtime="true" />
@@ -707,10 +707,10 @@
                 <param ui="chat_colors:cc_dyn6:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:DYN:6" realtime="true" />
                 <param ui="chat_colors:cc_dyn7:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:DYN:7" realtime="true" />
                 <!--
-                   <param ui="chat_colors:cc_shout:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:SHOUT" realtime="true" />
-                   <param ui="chat_colors:cc_civi:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:CIVILIZATION" realtime="true" />
-                   <param ui="chat_colors:cc_terri:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:TERRITORY" realtime="true" />
-                   -->
+                        <param ui="chat_colors:cc_shout:c"              type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:SHOUT" realtime="true" />
+                        <param ui="chat_colors:cc_civi:c"               type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:CIVILIZATION" realtime="true" />
+                        <param ui="chat_colors:cc_terri:c"              type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:TERRITORY"  realtime="true" />
+                        -->
                 <param ui="chat_colors:enter_dontquit_cb:c" type="db" widget="boolbut" link="UI:SAVE:CHAT:ENTER_DONT_QUIT_CB" realtime="true" />
                 <param ui="chat_colors:save_channel_cb:c" type="db" widget="boolbut" link="UI:SAVE:CHAT:SAVE_CHANNEL" realtime="true" />
                 <param ui="chat_colors:auto_channel_cb:c" type="db" widget="boolbut" link="UI:SAVE:CHAT:AUTO_CHANNEL" realtime="true" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml b/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
index 0f6c2a249..c4579c551 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
@@ -49,13 +49,12 @@
         <action id="upgrade_rm" name="uimGcmUpgradeRM" handler="context_upgrade_rm" params="" />
         <action id="outpost_bannish_player" name="uimGcmOutpostBanishPlayer" handler="outpost_ban_player" params="" />
         <action id="outpost_bannish_guild" name="uimGcmOutpostBanishGuild" handler="outpost_ban_guild" params="" />
-        <!-- talk : engage conversation with player or ask news to a npc -->
+        <!-- interaction -->
         <action id="talk" name="uimGcmTalk" handler="context_talk" params="" icon="r2_mini_activity_empty_chat.tga" />
         <action id="news" name="uimGcmChat" handler="lua" params="game:TalkWithNpc(0)" icon="radar_mission3_16.tga" />
         <action id="news_aggressive" name="uimGcmBullying" handler="lua" params="game:TalkWithNpc(1)" icon="bullying.tga" />
         <action id="attack" name="uimGcmAttack" handler="context_attack" params="" icon="ico_blade.tga" />
         <action id="info" name="uimGcmInfo" handler="open_title_help" params="from=target" icon="spe_status.tga" />
-        <!-- Action misc with selection -->
         <action id="duel" name="uimGcmDuel" handler="context_duel" params="" icon="pvp_duel.tga" />
         <action id="unduel" name="uimGcmUnDuel" handler="context_unduel" params="" icon="pvp_neutral.tga" />
         <!-- <action id="pvp_challenge"                 name="uimGcmPvpChallenge"               handler="context_pvp_challenge"                 params="" /> -->
diff --git a/ryzom/client/data/gamedev/interfaces_v3/game_r2_loading.lua b/ryzom/client/data/gamedev/interfaces_v3/game_r2_loading.lua
index 6ebb82bf0..33a3810d3 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/game_r2_loading.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/game_r2_loading.lua
@@ -100,7 +100,7 @@ function GameR2Loading:setScenarioLanguage(header)
 	local lvlWidget = win:find("Language")
 	if header.Language then
 		local language = "uiR2ED"..header.Language
-		lvlWidget.hardtext = i18n.get(language)
+		lvlWidget.hardtext = i18n.get(language):toUtf8()
 	else
 		lvlWidget.hardtext = ""
 	end
@@ -124,7 +124,7 @@ function GameR2Loading:setScenarioRingAccess(header)
 	local okButton = win:find("validate")
 
 	if getDbProp("SERVER:USER:IS_NEWBIE") == 1 and isPlayerFreeTrial() and not header.OtherCharAccess or header.OtherCharAccess ~= "RoSOnly" then
-		accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_No")
+		accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_No"):toUtf8()
 		okButton.frozen = true
 	end
 
@@ -132,9 +132,9 @@ function GameR2Loading:setScenarioRingAccess(header)
 		self.RingAccess = game.checkRingAccess(header.RingPointLevel)
 		if self.RingAccess == true then
 
-			accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_Yes")
+			accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_Yes"):toUtf8()
 		else
-			accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_No")
+			accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_No"):toUtf8()
 		end
 		
 		okButton.frozen = not self.RingAccess
@@ -561,9 +561,9 @@ function GameR2Loading:getTreeTooltip()
 
 	local isInNoobLand = getDbProp("SERVER:USER:IS_NEWBIE")
 	if isInNoobLand == 1 and isPlayerFreeTrial() then
-		tree.tooltip = i18n.get("uiR2EdPropertyToolTip_LoadScenario_LoadScenario_NewbieTreeInfo")
+		tree.tooltip = i18n.get("uiR2EdPropertyToolTip_LoadScenario_LoadScenario_NewbieTreeInfo"):toUtf8()
 	else
-		tree.tooltip = i18n.get("uiR2EdPropertyToolTip_LoadScenario_LoadScenario_TreeInfo")
+		tree.tooltip = i18n.get("uiR2EdPropertyToolTip_LoadScenario_LoadScenario_TreeInfo"):toUtf8()
 	end
 end
 
diff --git a/ryzom/client/data/gamedev/interfaces_v3/guild.lua b/ryzom/client/data/gamedev/interfaces_v3/guild.lua
index 06a804cfd..4c3bc0646 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/guild.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/guild.lua
@@ -61,13 +61,13 @@ function game:guildBuildInterface()
 			uiMember.name.hardtext = getGuildMemberName(i);
 			local memberGrade = getGuildMemberGrade(i);
 			if (memberGrade == 'Leader') then
-				uiMember.grade.text = i18n.get('uiGuildLeader');
+				uiMember.grade.uc_hardtext = i18n.get('uiGuildLeader');
 			elseif (memberGrade == 'HighOfficer') then
-				uiMember.grade.text = i18n.get('uiGuildHighOfficer');
+				uiMember.grade.uc_hardtext = i18n.get('uiGuildHighOfficer');
 			elseif (memberGrade == 'Officer') then
-				uiMember.grade.text = i18n.get('uiGuildOfficer');
+				uiMember.grade.uc_hardtext = i18n.get('uiGuildOfficer');
 			else
-				uiMember.grade.text = i18n.get('uiGuildMember');
+				uiMember.grade.uc_hardtext = i18n.get('uiGuildMember');
 			end
 			uiMemberList:addChild(uiMember);
 		end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/guild.xml b/ryzom/client/data/gamedev/interfaces_v3/guild.xml
index 8d7e68452..f30c7b08d 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/guild.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/guild.xml
@@ -16,106 +16,146 @@
     <proc id="guild_tell_member_proc">
         <action handler="guild_tell_member" params="" />
     </proc>
+    <proc id="select_guild_island">
+        <action handler="set" params="target='ui:interface:guild:w'|value=600" />
+        <action handler="lua" params="game:openGuildIsland('http://app.ryzom.com/app_guild/island.php?')" />
+    </proc>
     <!-- ******************* -->
     <!-- * TEMPLATE MEMBER * -->
     <!-- ******************* -->
     <group type="menu" id="menu_member" extends="base_menu" on_active="guild_member_menu_open">
-        <action id="sort" name="uimSort" handler="sort_guild_list" params="" />
+        <action id="sort" name="uimSort" handler="sort_guild_list" params="" icon="ico_automove.tga" />
         <separator />
-        <action id="lead" name="uimGuildLeader" handler="guild_member_chg_to_leader" />
-        <action id="hiof" name="uimGuildHighOfficer" handler="guild_member_chg_to_high_officer" />
-        <action id="offi" name="uimGuildOfficer" handler="guild_member_chg_to_officer" />
-        <action id="memb" name="uimGuildMember" handler="guild_member_chg_to_member" />
-        <action id="kick" name="uimGuildKick" handler="guild_member_kick" />
+        <action id="lead" name="uimGuildLeader" handler="guild_member_chg_to_leader" icon="token_xl.tga" />
+        <action id="hiof" name="uimGuildHighOfficer" handler="guild_member_chg_to_high_officer" icon="token_choice.tga" />
+        <action id="offi" name="uimGuildOfficer" handler="guild_member_chg_to_officer" icon="token_fine.tga" />
+        <action id="memb" name="uimGuildMember" handler="guild_member_chg_to_member" icon="token_basic.tga" />
+        <action id="kick" name="uimGuildKick" handler="guild_member_kick" icon="r2ed_kicked_char.tga" />
     </group>
     <!--
-  <action id="recr" name="uimGuildRecruiter" handler="guild_member_chg_to_recruiter" />
-  <action id="bear" name="uimGuildBearer" handler="guild_member_chg_to_bearer" />
+        <action id="recr" name="uimGuildRecruiter"              handler="guild_member_chg_to_recruiter" />
+        <action id="bear" name="uimGuildBearer"                 handler="guild_member_chg_to_bearer" />
 -->
     <template name="member_template" keep="true" posparent="parent" posref="TL TL" h="16" id="">
         <group id="#id" w="294" h="#h" posparent="#posparent" posref="#posref" group_onclick_l="proc" group_params_l="guild_tell_member_proc" group_onclick_r="active_menu" group_params_r="menu=ui:interface:menu_member">
-            <view type="text" id="name" x="4" y="0" fontsize="12" shadow="true" case_mode="%case_normal" />
+            <view type="text" id="name" x="4" y="0" fontsize="12" shadow="true" case_mode="%case_first_word_letter_up" />
             <view type="text" id="grade" x="158" y="0" fontsize="10" shadow="true" />
-            <view type="bitmap" id="online" x="-10" y="0" posref="MR MR" texture="w_online.tga" global_color="false" />
+            <view type="bitmap" id="online" x="-4" y="0" posref="MR MR" texture="w_online.tga" global_color="false" />
             <ctrl type="tooltip" id="tt_online" posparent="online" posref="MR MR" x="0" y="0" sizeref="wh" w="0" h="0" tooltip="uittFriendsOnline" tooltip_parent="win" />
+            <!-- add team invite button -->
+            <ctrl type="button" id="invite_button" button_type="push_button" posref="MR MR" x="-20" tx_normal="team_invite.tga" tx_pushed="team_invite.tga" tx_over="W_button_14_over.tga" global_color_normal="false" global_color_over="false" global_color_pushed="false" onclick_l="lua" params_l="game:teamInviteFromGuild('#id')" tooltip="uimGcmInvit" tooltip_parent="win" />
         </group>
     </template>
     <!-- **************** -->
     <!-- *  GUILD MAIN  * -->
     <!-- **************** -->
-    <group type="container" id="guild" title="uiGuildTitle" w="330" h="350" pop_max_h="700" resizer="false" global_color="false" header_color="UI:SAVE:WIN:COLORS:MEM" openable="false" opened="true" movable="true" active="false" savable="false" on_active="proc" on_active_params="guild_proc_active" on_deactive="proc" on_deactive_params="guild_proc_deactive">
+    <group type="container" id="guild" title="uiGuildTitle" w="340" h="350" pop_max_h="700" resizer="false" global_color="false" header_color="UI:SAVE:WIN:COLORS:MEM" openable="true" opened="true" movable="true" active="false" savable="false" on_active="proc" on_active_params="guild_proc_active" on_deactive="proc" on_deactive_params="guild_proc_deactive">
+        <group id="bstatus" x="0" y="0" h="0" value="" posref="TL TL">
+            <link expr="depends(@UI:VARIABLES:PING)" action="lua" params="game:updateGLinvB()" />
+        </group>
         <group id="header_closed" x="0" y="0" h="12" posref="TL TL"></group>
         <group id="header_opened" x="0" y="0" w="100" h="48" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
             <group type="tab" id="guild_select" child_resize_w="true" h="24" posref="TL TL" x="0" y="-24">
-                <ctrl style="tab_button_new" id="tab0" x="0" posref="TL TL" group="content:tab_guild" hardtext="uiGuildTabGuild" onclick_r="" params_r="" onclick_l="set" params_l="target='ui:interface:guild:w'|value=330" />
-                <ctrl style="tab_button_new" id="tab1" posparent="tab0" group="content:tab_outpost" hardtext="uiGuildTabOutpost" onclick_r="" params_r="" onclick_l="set" params_l="target='ui:interface:guild:w'|value=450" />
+                <ctrl style="tab_button_new" id="tab0" x="0" posref="TL TL" group="content:tab_guild_info" hardtext="uiGuildTabGuild" onclick_r="" params_r="" onclick_l="set" params_l="target='ui:interface:guild:w'|value=340" />
+                <ctrl style="tab_button_new" id="tab1" posparent="tab0" group="content:tab_guild" hardtext="uiGuildMembers" onclick_r="" params_r="" onclick_l="set" params_l="target='ui:interface:guild:w'|value=330" />
+                <ctrl style="tab_button_new" id="tab2" posparent="tab1" group="content:tab_outpost" hardtext="uiGuildTabOutpost" onclick_r="" params_r="" onclick_l="set" params_l="target='ui:interface:guild:w'|value=450" />
+                <ctrl style="tab_button_new" id="tab3" posparent="tab2" group="content:tab_island" hardtext="uiGuildTabIsland" onclick_r="" params_r="" onclick_l="proc" params_l="select_guild_island" />
             </group>
             <view type="bitmap" id="sep" posparent="guild_select" posref="BR BL" sizeparent="parent" sizeref="w" w="0" h="1" scale="true" texture="blank.tga" color="166 166 166 255" />
         </group>
         <group id="content" posref="TL TL" x="0" y="0" w="0" h="0" child_resize_h="true" child_resize_hmargin="4">
-            <group id="tab_guild" posref="TL TL" x="0" y="0" h="0" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="8">
+            <group id="tab_guild_info" posref="TL TL" x="0" y="0" h="0" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="8">
                 <!-- LOGO & NAME -->
                 <ctrl type="sheet" id="blason" posref="TL TL" x="2" y="-8" nature="guild_flag" slot="false" value="SERVER:GUILD" dragable="false" color="255 255 255 255" />
                 <view type="text_id" id="name" posparent="blason" posref="TR TL" x="8" w="200" y="-2" h="20" shadow="true" global_color="false" fontsize="16" textid="SERVER:GUILD:NAME" dynamic_string="false" />
                 <!-- Age / Effectif -->
-                <view type="text_number" id="age" posparent="blason" posref="BR BL" x="8" y="0" fontsize="10" shadow="true" value="SERVER:GUILD:CREATION_DATE" positive="true" />
+                <view type="text_number" id="age" posparent="blason" posref="BR BL" x="8" y="-4" fontsize="10" shadow="true" value="SERVER:GUILD:CREATION_DATE" positive="true" />
                 <view type="text" id="days" posparent="age" posref="MR ML" x="2" y="0" fontsize="10" shadow="true" hardtext="uiGuildInfoAge" />
                 <view type="text" id="sep" posparent="days" posref="MR ML" x="2" y="0" fontsize="10" shadow="true" hardtext="/" />
                 <view type="text" id="member_count" posparent="sep" posref="MR ML" x="2" y="0" fontsize="10" shadow="true" value="" positive="true" />
                 <view type="text" id="members" posparent="member_count" posref="MR ML" x="2" y="0" fontsize="10" shadow="true" hardtext="uiGuildInfoEff" />
+                <view type="text" id="sep_2" posparent="members" posref="MR ML" x="2" y="0" fontsize="10" shadow="true" hardtext="/" />
+                <view type="text" id="member_count_online" posparent="sep_2" posref="MR ML" x="2" y="0" fontsize="10" shadow="true" value="" positive="true" />
+                <view type="text" id="members_online_text" posparent="member_count_online" posref="MR ML" x="2" y="0" fontsize="10" shadow="true" hardtext="uiGuildMemberOnline" />
                 <!-- DESCRIPTION -->
-                <view type="text" id="desc_title" posparent="blason" shadow="true" posref="BL TL" x="0" y="-6" fontsize="12" hardtext="uiGuildInfoDes" global_color="false" case_mode="%case_upper" />
+                <view type="text" id="desc_title" posparent="blason" shadow="true" posref="BL TL" x="0" y="-12" fontsize="12" hardtext="uiGuildInfoDes" global_color="false" case_mode="%case_upper" />
                 <view type="text_id" id="desc" posparent="desc_title" posref="BL TL" x="0" y="-2" shadow="true" fontsize="10" multi_line="true" multi_line_space="0" textid="SERVER:GUILD:DESCRIPTION" dynamic_string="false" />
-                <!-- HEADQUARTERS -->
-                <view type="text" id="head_title" posparent="desc" shadow="true" posref="BL TL" x="0" y="-4" fontsize="12" hardtext="uiGuildInfoHead" global_color="false" case_mode="%case_upper" />
-                <view type="text_id" id="head" posparent="head_title" posref="MR ML" x="0" y="-1" fontsize="10" shadow="true" hardtext="uiGuildInfoHead2" textid="SERVER:GUILD:VILLAGE" dynamic_string="true" />
-                <!--
+                <!--HEADQUARTERS 
+        <view type="text"
+              id="head_title"
+              posparent="desc"
+              shadow="true"
+              posref="BL TL"
+              x="0"
+              y="-4"
+              fontsize="12"
+              hardtext="uiGuildInfoHead"
+              global_color="false"
+              case_mode="%case_upper" />
+        <view type="text_id"
+              id="head"
+              posparent="head_title"
+              posref="MR ML"
+              x="0"
+              y="-1"
+              fontsize="10"
+              shadow="true"
+              hardtext="uiGuildInfoHead2"
+              textid="SERVER:GUILD:VILLAGE"
+              dynamic_string="true" />
                 <view type="text" id="fame_title" posparent="head_title" shadow="true" posref="BL TL" x="0" y="-2" fontsize="12" hardtext="uiGuildInfoFame" global_color="false" case_mode="%case_upper" />
                 <view type="text_number" id="fame" posparent="fame_title" posref="MR ML" x="0" y="-1" fontsize="10" shadow="true" value="SERVER:GUILD:FAME" positive="false" />
 -->
                 <!-- XP Score -->
-                <view type="text" id="XP_title" posparent="head_title" shadow="true" posref="BL TL" x="0" y="-2" fontsize="12" hardtext="uiGuildInfoScore" global_color="false" case_mode="%case_upper" />
-                <view type="text_number" id="xp" posparent="XP_title" posref="MR ML" x="0" y="-1" fontsize="10" shadow="true" value="SERVER:GUILD:XP" positive="true" />
+                <view type="text" id="XP_title" posparent="desc" shadow="true" posref="BL TL" x="0" y="-5" fontsize="12" hardtext="uiGuildInfoScore" global_color="false" case_mode="%case_upper" />
+                <view type="text_number" id="xp" posparent="XP_title" posref="MR ML" x="0" y="0" fontsize="10" shadow="true" value="SERVER:GUILD:XP" positive="true" />
                 <!-- Money -->
                 <instance template="argent" id="money" tooltip="uittGuildMoney" posparent="XP_title" posref="BL TL" x="0" y="-4" w="130" h="16" value="SERVER:GUILD:INVENTORY:MONEY" />
+                <!-- QUIT GUILD BUTTON -->
+                <ctrl style="text_button_16" id="quit_guild" posparent="money" posref="MR ML" x="10" y="0" hardtext="uiQuitGuild" color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255" global_color_normal="true" global_color_over="true" global_color_pushed="true" onclick_l="context_quit_guild" params_l="" />
+                <!-- invite to guild button -->
+                <ctrl style="text_button_16" id="invite" active="false" posparent="quit_guild" posref="MR ML" x="5" hardtext="uiInviteToRingSession" color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255" global_color_normal="true" global_color_over="true" global_color_pushed="true" onclick_l="add_contact_begin" params_l="group=ui:interface:add_guild" />
+            </group>
+            <group id="tab_guild" posref="TL TL" x="0" y="0" h="0" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="0">
                 <!-- MEMBERS LIST -->
-                <group id="list_member" posparent="money" posref="BL TL" x="0" y="-8" sizeparent="parent" sizeref="w" w="-8" h="208">
-                    <view type="text" id="title" posref="TL TL" x="0" y="-5" fontsize="12" shadow="true" global_color="false" hardtext="uiGuildMembers" />
+                <group id="list_member" posref="TL TL" x="0" y="-8" sizeparent="parent" sizeref="w" w="-8" h="390">
+                    <view type="text" id="title" posref="TL TL" x="15" y="-5" fontsize="12" shadow="true" global_color="false" hardtext="uiGuildMembers" />
                     <view type="text" id="rank" posref="TL TL" x="170" y="-8" fontsize="10" shadow="true" global_color="false" hardtext="uiGuildMemberRank" />
                     <view type="text" id="online" posref="TR TR" x="-10" y="-8" fontsize="10" shadow="true" global_color="false" hardtext="uiGuildMemberOnline" />
-                    <group type="list" id="guild_members" posref="TL TL" x="12" y="-24" sizeref="h" h="-30" w="310" over="true" child_resize_hmargin="2"></group>
+                    <group type="list" id="guild_members" posref="TL TL" x="12" y="-24" sizeref="h" h="-40" w="290" over="true" child_resize_hmargin="2"></group>
                     <ctrl style="skin_scroll" id="scroll_bar_guild" posref="TL TL" x="0" y="-24" target="guild_members" target_stepy="16" />
-                    <group id="black" posref="TL TL" sizeparent="guild_members" x="0" y="2" sizeref="w" w="0" h="180" posparent="guild_members" inherit_gc_alpha="true" />
+                    <group id="black" posref="TL TL" sizeparent="guild_members" x="0" y="2" sizeref="w" w="0" h="355" posparent="guild_members" inherit_gc_alpha="true" />
                     <instance template="inner_thin_border" posparent="black" inherit_gc_alpha="true" />
                 </group>
-                <!-- QUIT GUILD BUTTON -->
-                <ctrl style="text_button_16" id="quit_guild" posparent="list_member" posref="BR TR" x="0" y="-6" hardtext="uiQuitGuild" color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255" global_color_normal="true" global_color_over="true" global_color_pushed="true" onclick_l="context_quit_guild" params_l="" />
             </group>
             <group id="tab_outpost" posref="TL TL" x="0" y="0" h="0" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="0">
                 <instance template="t_outpost_manager" id="outpost_manager" />
             </group>
+            <group id="tab_island" posref="TL TL" x="0" y="0" h="350" w="0" sizeref="w" child_resize_hmargin="0">
+                <group id="props" y="0" h="115" posref="TL TL" sizeref="w">
+                    <instance template="webig_html" home="" browse_redo="" browse_undo="" browse_refresh="" bg_color="0 0 0 0" />
+                </group>
+                <group id="inv" y="-105" h="245" posref="TL TL" sizeref="w">
+                    <instance template="webig_html" home="http://app.ryzom.com/app_arcc/index.php?action=mItem_DisplayGuildItems" browse_redo="" browse_undo="" browse_refresh="" bg_color="0 0 0 0" />
+                </group>
+            </group>
         </group>
     </group>
     <tree node="guild" />
+    <!-- add a player to guild -->
+    <group type="modal" id="add_guild" exit_click_out="true" posref="MM MR" w="212" child_resize_h="true" child_resize_hmargin="14" options="skin_modal" on_active="set_keyboard_focus" on_active_params="target=ui:interface:add_guild:add_contact_eb:eb|select_all=false">
+        <view type="text" id="text" case_mode="%case_first_word_letter_up" posref="TL TL" x="8" y="-8" color="255 255 255 255" global_color="false" fontsize="12" shadow="true" hardtext="uimGcmGuildInvit" />
+        <instance template="edit_box_widget" id="add_contact_eb" posref="TL TL" x="6" y="-24" child_resize_h="true" w="200" onenter="lua:game:invToGuild()" max_num_chars="255" entry_type="playername" />
+        <instance template="button_ok_cancel" posparent="add_contact_eb" posref="BR TR" x="0" y="-2" onclick_ok="lua" onclick_ok_param="game:invToGuild()" onclick_cancel="leave_modal" onclick_cancel_param="" />
+    </group>
     <!-- ***************** -->
     <!-- *  GUILD FORUM  * -->
     <!-- ***************** -->
-    <proc id="guild_forum_proc_active">
-        <action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:GUILD_FORUM|value=1" />
-        <action handler="set" cond="not(%is_guild_present)" params="target='ui:interface:guild_forum:active'|value=0" />
-        <action handler="browse" params="name=ui:interface:guild_forum:content:html|url=home|show=0" />
-    </proc>
-    <proc id="guild_forum_proc_deactive">
-        <action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:GUILD_FORUM|value=0" />
-    </proc>
-    <group type="menu" id="guild_forum_menu" extends="base_menu_with_color">
-        <action id="home" name="uiHOME" handler="browse" params="name=ui:interface:guild_forum:content:html|url=home" />
-    </group>
     <group type="container" id="guild_forum" w="480" h="400" title="" global_color="false" open_button="false" force_open_out="true" header_color="UI:SAVE:WIN:COLORS:MEM" resizer="true" pop_min_w="220" pop_min_h="96" pop_max_w="2000" pop_max_h="1600" title_bar_open="false" lockable="true" openable="false" opened="true" movable="true" active="true" on_active="proc" on_active_params="guild_forum_proc_active" on_deactive="proc" on_deactive_params="guild_forum_proc_deactive">
         <group id="header_closed" x="0" y="0" h="12" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color"></group>
         <group id="header_opened" x="0" y="0" w="480" h="13" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:guild_forum_menu"></group>
         <group id="content" x="0" y="0" w="0" h="0" posref="TL TL">
-            <group type="forum_html" id="html" posref="TL TL" url="home" title_prefix="uiGuildForumTitle" sizeref="wh" x="0" y="0" w="0" h="0" background_color="0 0 0 255" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="20" h2_font_size="18" h3_font_size="16" h4_font_size="14" h5_font_size="12" h6_font_size="12" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="black2" browse_next_time="false" form_text_area_group="edit_box_widget_multiline">
+            <group type="html" id="html" posref="TL TL" url="home" title_prefix="uiGuildForumTitle" sizeref="wh" x="0" y="0" w="0" h="0" background_color="0 0 0 255" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="20" h2_font_size="18" h3_font_size="16" h4_font_size="14" h5_font_size="12" h6_font_size="12" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="black2" browse_next_time="false" form_text_area_group="edit_box_widget_multiline">
                 <group id="black" posref="BR BR" sizeref="hw" w="-10" h="-12" inherit_gc_alpha="true" />
                 <instance template="inner_thin_border" posparent="black" inherit_gc_alpha="true" />
                 <view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false" />
@@ -161,9 +201,9 @@
         <action handler="set_keyboard_focus" params="select_all=true|target=ui:interface:guild_inv_money:box1:eb" />
         <action handler="enter_modal" params="group=ui:interface:guild_inv_money" />
     </proc>
-    <!-- see what to do with that
-        on_active="proc" on_active_params="guild_inv_activated"
-        on_deactive="" on_deactive_params="" -->
+    <!-- see what to do with that 
+ on_active="proc" on_active_params="guild_inv_activated" 
+ on_deactive="" on_deactive_params="" -->
     <group style="inv_container_guild" id="inv_guild" header_color="UI:SAVE:WIN:COLORS:TRADE" title="uitabInvGuild" on_close_button="set" on_close_button_params="dblink=UI:SAVE:INVENTORY_GUILD_WANT_POPUP|value=0">
         <group id="header_closed" x="0" y="0" h="12" posref="TL TL"></group>
         <group id="header_opened" x="0" y="0" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
@@ -221,7 +261,7 @@
         <action id="home" name="uiHOME" handler="browse" params="name=ui:interface:webig:content:html|url=home" icon="building_state2.tga" />
     </group>
     <group type="container" id="webig" w="480" h="400" title="" global_color="false" open_button="false" force_open_out="true" header_color="UI:SAVE:WIN:COLORS:COM" resizer="true" pop_min_w="220" pop_min_h="96" pop_max_w="2000" pop_max_h="1600" title_bar_open="false" lockable="true" openable="true" opened="true" movable="true" active="true" on_active="proc" on_active_params="webig_proc_active" on_deactive="proc" on_deactive_params="webig_proc_deactive">
-        <group id="header_closed" x="0" y="0" h="12" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:webig_menu" on_active="lua" on_active_params="game:closeWebIGBrowserHeader()" />
+        <group id="header_closed" x="0" y="0" h="12" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:webig_menu" on_active="lua" on_active_params="game:closeWebIGBrowserHeader()"></group>
         <group id="header_opened" x="0" y="0" w="480" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:webig_menu" on_active="lua" on_active_params="game:openWebIGBrowserHeader()">
             <!-- must be frozen by default cause no undo/redo at start -->
             <ctrl style="text_button_header" button_type="push_button" id="browse_redo" posref="MR MR" x="-16" y="0" hardtext="uiBrowseRedoButton" tooltip="uittBrowseRedo" onclick_l="browse_redo" params_l="name=ui:interface:webig:content:html" frozen="true" />
@@ -241,7 +281,7 @@
     </group>
     <tree node="webig" />
     <group type="container" id="web_transactions" w="480" h="400" title="" global_color="false" open_button="false" force_open_out="true" header_color="UI:SAVE:WIN:COLORS:COM" resizer="true" pop_min_w="220" pop_min_h="96" pop_max_w="2000" pop_max_h="1600" title_bar_open="false" lockable="true" openable="false" opened="true" movable="true" active="true">
-        <group id="header_closed" x="0" y="0" h="12" posref="TL TL" />
+        <group id="header_closed" x="0" y="0" h="12" posref="TL TL"></group>
         <group id="header_opened" x="0" y="0" w="480" h="16" posref="TL TL">
             <!-- must be frozen by default cause no undo/redo at start -->
             <ctrl style="text_button_header" button_type="push_button" id="browse_redo" posref="MR MR" x="-16" y="0" hardtext="uiBrowseRedoButton" tooltip="uittBrowseRedo" onclick_l="browse_redo" params_l="name=ui:interface:web_transactions:content:html" frozen="true" />
@@ -261,7 +301,7 @@
     </group>
     <tree node="web_transactions" />
     <group type="container" id="web_lua_action" w="480" h="400" title="" global_color="false" open_button="false" force_open_out="true" header_color="UI:SAVE:WIN:COLORS:COM" resizer="true" pop_min_w="220" pop_min_h="96" pop_max_w="2000" pop_max_h="1600" title_bar_open="false" lockable="true" openable="false" opened="true" movable="true" active="true">
-        <group id="header_closed" x="0" y="0" h="12" posref="TL TL" />
+        <group id="header_closed" x="0" y="0" h="12" posref="TL TL"></group>
         <group id="header_opened" x="0" y="0" w="480" h="16" posref="TL TL">
             <!-- must be frozen by default cause no undo/redo at start -->
             <ctrl style="text_button_header" button_type="push_button" id="browse_redo" posref="MR MR" x="-16" y="0" hardtext="uiBrowseRedoButton" tooltip="uittBrowseRedo" onclick_l="browse_redo" params_l="name=ui:interface:web_lua_action:content:html" frozen="true" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/help.xml b/ryzom/client/data/gamedev/interfaces_v3/help.xml
index aa8552786..81ae758bf 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/help.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/help.xml
@@ -72,9 +72,10 @@
     </group>
     <!-- If necessary, not already displayed this session, and not avoided by user, show the warning -->
     <!--
-<link expr="and(@UI:VARIABLES:UNIVERSE_CHANEL_WARNING_WANTED,
-                                  not(@UI:VARIABLES:UNIVERSE_CHANEL_WARNING_DONE),
-                                  not(@UI:SAVE:UNIVERSE_CHANEL_WARNING_AVOID))" target="ui:interface:universe_chanel_warning:active" /> -->
+  <link expr="and(@UI:VARIABLES:UNIVERSE_CHANEL_WARNING_WANTED,
+                                not(@UI:VARIABLES:UNIVERSE_CHANEL_WARNING_DONE),
+                                not(@UI:SAVE:UNIVERSE_CHANEL_WARNING_AVOID))"
+        target="ui:interface:universe_chanel_warning:active" /> -->
     <tree node="universe_chanel_warning"></tree>
     <tree node="welcome_info"></tree>
     <!--********************-->
@@ -540,8 +541,8 @@
     <!-- Main proc called by the game -->
     <proc id="proc_stat_report">
         <!--
-  <action handler="enter_modal" cond="eq(@UI:SAVE:AUTO_STAT_REPORT,0)" params="group=ui:interface:stat_report_message_box" />
-  <action handler="send_stat_report" cond="eq(@UI:SAVE:AUTO_STAT_REPORT,1)" />
+        <action handler="enter_modal" cond="eq(@UI:SAVE:AUTO_STAT_REPORT,0)" params="group=ui:interface:stat_report_message_box" />
+        <action handler="send_stat_report" cond="eq(@UI:SAVE:AUTO_STAT_REPORT,1)" />
 -->
     </proc>
     <!-- Proc called by the always button -->
@@ -569,16 +570,22 @@
     <!-- ****************** -->
     <group type="container" id="r2ed_web_admin" w="410" h="400" title="uiHelp" global_color="false" resizer="true" pop_min_w="100" pop_min_h="96" pop_max_w="2000" pop_max_h="1600" title_bar_open="false" open_button="false" force_open_out="true" lockable="true" openable="false" opened="true" movable="true" active="false">
         <!--
-  <group id="header_closed" x="0" y="0" h="12" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
-  </group>
+        <group id="header_closed" x="0" y="0" h="12" posref="TL TL"
+                        group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color" >
+        </group>
 
-  <group id="header_opened" x="0" y="0" w="0" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
+        <group id="header_opened" x="0" y="0" w="0" h="16" posref="TL TL"
+                        group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color" >
                         
-                        <ctrl style="text_button_header" button_type="push_button" id="browse_redo" posref="MR MR" x="-16" y="0" hardtext="uiBrowseRedoButton" tooltip="uittBrowseRedo" onclick_l="browse_redo" params_l="name=ui:interface:r2ed_web_admin:admin_web_page" frozen="true" />
-                        <ctrl style="text_button_header" button_type="push_button" id="browse_undo" posparent="browse_redo" posref="ML MR" x="-4" y="0" hardtext="uiBrowseUndoButton" tooltip="uittBrowseUndo" onclick_l="browse_undo" params_l="name=ui:interface:r2ed_web_admin:admin_web_page" frozen="true" />
-  </group>
+                        <ctrl style="text_button_header" button_type="push_button" id="browse_redo" posref="MR MR" x="-16" y="0"
+                                hardtext="uiBrowseRedoButton" tooltip="uittBrowseRedo" onclick_l="browse_redo" 
+                                params_l="name=ui:interface:r2ed_web_admin:admin_web_page" frozen="true" />
+                        <ctrl style="text_button_header" button_type="push_button" id="browse_undo" posparent="browse_redo" posref="ML MR" x="-4" y="0"
+                                hardtext="uiBrowseUndoButton" tooltip="uittBrowseUndo" onclick_l="browse_undo" 
+                                params_l="name=ui:interface:r2ed_web_admin:admin_web_page" frozen="true" />
+        </group>
 
-  -->
+        -->
         <group id="header_closed" x="0" y="0" h="12" posref="TL TL"></group>
         <group id="header_opened" x="0" y="0" w="0" h="16" posref="TL TL">
             <ctrl style="text_button_header" button_type="push_button" id="browse_redo" posref="MR MR" x="-16" y="0" hardtext="uiBrowseRedoButton" tooltip="uittBrowseRedo" onclick_l="browse_redo" params_l="name=ui:interface:r2ed_web_admin:admin_web_page" frozen="true" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/info_player.lua b/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
index 93cf7b159..479b18b59 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
@@ -129,7 +129,7 @@ function game:displayMagicProtect(dbVal)
 	local	uiText= ui.val;
 
 	-- set the text (percentage)
-	uiText.text= tostring(val) .. "%";
+	uiText.uc_hardtext= tostring(val) .. "%";
 
 	-- set color and global color according to maximum reached or not
 	if(val >= vMax) then
@@ -223,7 +223,7 @@ function game:displayMagicResist(dbVal)
 	local	uiText= ui.val;
 
 	-- set the text (final value)
-	uiText.text= tostring(val);
+	uiText.uc_hardtext= tostring(val);
 
 	-- set color and global color according to maximum reached or not
 	if(val >= vMax) then
@@ -282,14 +282,14 @@ function game:onDrawNpcWebPage()
 		if(available) then
 			local	ucUrl
 			if config.Local == 1 then
-				ucUrl = NicoMagicURL -- for test in local mode
+				ucUrl = ucstring(NicoMagicURL) -- for test in local mode
 			else
 				ucUrl = getDynString(self.NpcWebPage.UrlTextId);
 			end
 			-- browse
 			local	uiStr= getUIId(getUICaller());
 			-- if the url
-			local utf8Url = ucUrl
+			local utf8Url = ucUrl:toUtf8()
 			local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil
 			if isRing then
 				getUI("ui:interface:npc_web_browser").active = false
@@ -340,7 +340,7 @@ end
 
 function game:getOpenAppPageMessage()
 	local ucUrl = getDynString(self.NpcWebPage.UrlTextId)
-	local url = ucUrl
+	local url = ucUrl:toUtf8()
 	surl = url:split("&")
 	for i=1,#surl do
 		if surl[i]:sub(1, 12) == "open_message" then
@@ -353,8 +353,12 @@ end
 function game:onDbChangeAppPage()
 	if getDbProp("UI:VARIABLES:CURRENT_SERVER_TICK") > self.NpcWebPage.Timeout then
 		local npcName = getTargetName()
+
+		local message  = ucstring()
+
 		local text = game:getOpenAppPageMessage()
-		displaySystemInfo(text, "AMB")
+		message:fromUtf8(text)
+		displaySystemInfo(message, "AMB")
 		removeOnDbChange(getUI("ui:interface:npc_web_browser"),"@UI:VARIABLES:CURRENT_SERVER_TICK")
 	end
 end
@@ -376,7 +380,7 @@ function game:startNpcWebPage()
 			removeOnDbChange(getUI("ui:interface:npc_web_browser"),"@UI:VARIABLES:CURRENT_SERVER_TICK")
 		end
 		local ucUrl = getDynString(self.NpcWebPage.UrlTextId)
-		local utf8Url = ucUrl
+		local utf8Url = ucUrl:toUtf8()
 
 		if utf8Url:sub(1, 4) == "http" then
 			runAH(nil, "browse", "name=ui:interface:npc_web_browser:content:html|url=release_wk.html|localize=1");
@@ -643,30 +647,30 @@ function game:getPvpEffects()
 				fmt = i18n.get('uiPvPEffect_' .. getRegionByAlias(id) .. '_Bonus');
 				fmt = replacePvpEffectParam(fmt, param);
 				if (textBonus ~= '') then
-					textBonus = concatString(textBonus, '\n\n');
+					textBonus = concatUCString(textBonus, '\n\n');
 				end
-				textBonus = concatString(textBonus, fmt);
+				textBonus = concatUCString(textBonus, fmt);
 			else
 				hasMalus = true;
 				fmt = i18n.get('uiPvPEffect_' .. getRegionByAlias(id) .. '_Malus');
 				fmt = replacePvpEffectParam(fmt, param);
 				if (textMalus ~= '') then
-					textMalus = concatString(textMalus, '\n\n');
+					textMalus = concatUCString(textMalus, '\n\n');
 				end
-				textMalus = concatString(textMalus, fmt);
+				textMalus = concatUCString(textMalus, fmt);
 			end;
 		end
 	end
 
 	if (hasBonus) then
-		uiGroup.pvpEffectsBonusMalusInfo.text_format 	= i18n.get('uiPvpEffectBonus');
-		uiGroup.pvpEffectsBonusMalus.text_format 		= textBonus;
+		uiGroup.pvpEffectsBonusMalusInfo.uc_hardtext_format 	= i18n.get('uiPvpEffectBonus');
+		uiGroup.pvpEffectsBonusMalus.uc_hardtext_format 		= textBonus;
 	elseif (hasMalus) then
-		uiGroup.pvpEffectsBonusMalusInfo.text_format 	= i18n.get('uiPvpEffectMalus');
-		uiGroup.pvpEffectsBonusMalus.text_format 		= textMalus;
+		uiGroup.pvpEffectsBonusMalusInfo.uc_hardtext_format 	= i18n.get('uiPvpEffectMalus');
+		uiGroup.pvpEffectsBonusMalus.uc_hardtext_format 		= textMalus;
 	else
-		uiGroup.pvpEffectsBonusMalusInfo.text_format 	= '';
-		uiGroup.pvpEffectsBonusMalus.text_format 		= '';
+		uiGroup.pvpEffectsBonusMalusInfo.uc_hardtext_format 	= '';
+		uiGroup.pvpEffectsBonusMalus.uc_hardtext_format 		= '';
 	end
 
 end
@@ -709,7 +713,7 @@ function game:getAllegiancePoints()
 		text = findReplaceAll(text, '%faction', self:getFactionName(civ));
 		text = findReplaceAll(text, '%points', tostring(civPoints));
 	end
-	uiGroup.civ_allegiance_pts.text_format = text;
+	uiGroup.civ_allegiance_pts.uc_hardtext_format = text;
 
 	-- cult allegiance
 	if (cult == self.TPVPClan.None or cult == self.TPVPClan.Neutral) then
@@ -719,7 +723,7 @@ function game:getAllegiancePoints()
 		text = findReplaceAll(text, '%faction', self:getFactionName(cult));
 		text = findReplaceAll(text, '%points', tostring(cultPoints));
 	end
-	uiGroup.cult_allegiance_pts.text_format = text;
+	uiGroup.cult_allegiance_pts.uc_hardtext_format = text;
 end
 
 ------------------------------------------------------------------------------------------------------------
@@ -727,7 +731,7 @@ function game:updateAllegiance(path, uiText)
 	local	alleg = getDbProp(path);
 
 	local text = i18n.get('uiFameAllegiance' .. tostring(alleg) );
-	getUICaller()[uiText].text= text;
+	getUICaller()[uiText].uc_hardtext= text;
 end
 
 ------------------------------------------------------------------------------------------------------------
@@ -766,28 +770,28 @@ function game:tooltipDeltaValue(base, max)
 
 	local text;
 	if (val == 0) then
-		text = concatString('@{FFFF}', tostring(max));
+		text = concatUCString('@{FFFF}', tostring(max));
 	else
 		if (val > 0) then
 			-- bonus
-			text = concatString('@{FFFF}', tostring(max));
-			text = concatString(text, ' (');
-			text = concatString(text, tostring(base));
-			text = concatString(text, '@{0F0F}');
-			text = concatString(text, ' + ');
-			text = concatString(text, tostring(val));
-			text = concatString(text, '@{FFFF}');
-			text = concatString(text, ')');
+			text = concatUCString('@{FFFF}', tostring(max));
+			text = concatUCString(text, ' (');
+			text = concatUCString(text, tostring(base));
+			text = concatUCString(text, '@{0F0F}');
+			text = concatUCString(text, ' + ');
+			text = concatUCString(text, tostring(val));
+			text = concatUCString(text, '@{FFFF}');
+			text = concatUCString(text, ')');
 		else
 			-- malus
-			text = concatString('@{FFFF}', tostring(max));
-			text = concatString(text, ' (');
-			text = concatString(text, tostring(base));
-			text = concatString(text, '@{E42F}');
-			text = concatString(text, ' - ');
-			text = concatString(text, tostring(math.abs(val)));
-			text = concatString(text, '@{FFFF}');
-			text = concatString(text, ')');
+			text = concatUCString('@{FFFF}', tostring(max));
+			text = concatUCString(text, ' (');
+			text = concatUCString(text, tostring(base));
+			text = concatUCString(text, '@{E42F}');
+			text = concatUCString(text, ' - ');
+			text = concatUCString(text, tostring(math.abs(val)));
+			text = concatUCString(text, '@{FFFF}');
+			text = concatUCString(text, ')');
 		end
 	end
 
@@ -1016,7 +1020,7 @@ function RingPlayerInfo:updateRRPSLevel(dbVal, tooltip)
 	local	uiText= ui.val;
 
 	-- set the text
-	uiText.text= tostring(val)
+	uiText.uc_hardtext= tostring(val)
 
 	self:tooltipRRPs(dbVal, tooltip)
 end
@@ -1076,13 +1080,13 @@ end
 function game:updateOrganization(path, uiOrgText, uiStatusText, uiPointsText)
 
 	local org = getDbProp(path.."1:VALUE")
-	getUICaller()[uiOrgText].hardtext =  i18n.get('uiOrganization_' .. org)
+	getUICaller()[uiOrgText].uc_hardtext =  i18n.get('uiOrganization_' .. org)
 
 	local status = getDbProp(path.."2:VALUE")
-	getUICaller()[uiStatusText].hardtext= status
+	getUICaller()[uiStatusText].uc_hardtext= status
 
 	local points = getDbProp(path.."3:VALUE")
-	getUICaller()[uiPointsText].hardtext= points
+	getUICaller()[uiPointsText].uc_hardtext= points
 
 end
 
@@ -1184,6 +1188,8 @@ end
 function game:onMissionSelected(index)
 	disableModalWindow()
 	self:updateCurrMissionComboBox()
+	game.WebMissionLastDesc = {}
+	setOnDraw(getMissionWindow(), "game:ensureWebMissionVisibility()")
 end
 
 --------------------------------------------------------------------------------------------------------------
@@ -1205,6 +1211,7 @@ function game:onMissionDBIndexChanged()
 		getUI("ui:interface:info_player_journal:content:mission_list:b_title" .. tostring(missionIndex)).pushed = true
 		getUI("ui:interface:mission_cb_menu:mission_list:b_title" .. tostring(missionIndex)).pushed = true
 	end
+	game:updateMissionWindowLayout()
 end
 
 --------------------------------------------------------------------------------------------------------------
@@ -1284,6 +1291,179 @@ end
 --	end
 --end
 
+function game:parseLangText(text)
+	if text == nil then
+		return ""
+	end
+	local final = ""
+	local work = ""
+	local translated = ""
+	local stext = text:split("[[]")
+	for k, v in pairs(stext) do
+		if string.sub(v, 3, 3) == "]" then
+			if string.sub(v, 1, 2):upper() == getClientCfg("LanguageCode"):upper() then
+				work = ""
+				translated = string.sub(v, 4)
+			elseif string.sub(v, 1, 2):upper() == "WK" and translated == "" then
+				work = string.sub(v, 4)
+			end
+		else
+			if k > 1 then
+				final = final .. "["
+			end
+			final = final .. v
+		end
+	end
+	return final .. work .. translated
+end
+
+function game:updateCapTooltip()
+	--local real_tooltip = "\n\n@{FFFC}Ceci est le @{6F6F}cap@{FFFC} sur lequel vous êtes actuellement fixé.\nCliquez pour obtenir plus d'@{6F6F}informations@{FFFC}.\n\nIl vous également possible de changer de cap en cliquant sur @{6F6F}Mettre le cap sur [...]@{FFFC} à chaque fois que l'option est disponible"
+	local real_tooltip = game:parseLangText(mission_real_tooltip)
+	getUI("ui:interface:info_player_journal:content:cap_group:cap_ctrl").tooltip = getUCtf8("@{FB0F}"..game.CapTitle.."\n@{FFFF}"..game.CapDesc..real_tooltip)
+end
+
+function game:setCapTitle(text)
+	game.CapTitle = game:parseLangText(text)
+	getUI("ui:interface:info_player_journal:content:cap_group:cap_title").uc_hardtext = getUCtf8(game.CapTitle)
+	game:updateCapTooltip()
+end
+
+function game:setCapDesc(text)
+	game.CapDesc = game:parseLangText(text)
+	getUI("ui:interface:info_player_journal:content:cap_group:cap_desc").uc_hardtext = getUCtf8(game.CapDesc)
+	game:updateCapTooltip()
+end
+
+function game:setCapIcon(icon)
+	getUI("ui:interface:info_player_journal:content:cap_group:cap_icon").texture = icon
+end
+
+
+function game:autoHideCapPopup()
+
+	if game.autoHideCapTimer == 0 then
+		alpha = nltime.getLocalTime() - game.autoHideCapStartTime
+		if alpha >= 254*5 then
+			setOnDraw(getUI("ui:interface:cap_popup"), "")
+			getUI("ui:interface:cap_popup").active=false
+		else
+			getUI("ui:interface:cap_popup").alpha=255-math.floor(alpha/5)
+		end
+	else
+		if game.autoHideCapStartTime + game.autoHideCapTimer < nltime.getLocalTime() then
+			game.autoHideCapStartTime = nltime.getLocalTime()
+			game.autoHideCapTimer = 0
+		end
+	end
+end
+
+function game:displayRpMessage(message, icon)
+	if icon == nil then
+		icon = "rpjob_roleplay.tga"
+	end
+
+	local htmlcode = [[
+	<body style="font-style: italic; font-weight: bold; color: white; background-position: center; background-image: url(pretty_notif.tga)">
+	<table width="100%" cellspacing="0" cellpadding="0">
+	<tr>
+		<td id="icon" align="center" width="750" valign="middle" height="30px"><img width="32px" src="]]..icon..[["/></td>
+	</tr><tr>
+	<tr>
+		<td align="center">]]..message..[[</td>
+	</tr>
+	</table>
+	</body>
+	]]
+
+	getUI("ui:interface:cap_popup:html"):renderHtml(htmlcode)
+	setTopWindow(getUI("ui:interface:cap_popup"))
+	getUI("ui:interface:cap_popup").alpha=255
+	getUI("ui:interface:cap_popup").y = getUI("ui:interface").h-170
+	getUI("ui:interface:cap_popup").x = math.floor(getUI("ui:interface").w / 2) - 400
+	getUI("ui:interface:cap_popup").active = true
+	game.autoHideCapStartTime = nltime.getLocalTime()
+	game.autoHideCapTimer = 3000
+	setOnDraw(getUI("ui:interface:cap_popup"), "game:autoHideCapPopup()")
+end
+
+function game:setCapProgress(value, text)
+	if value == nil then
+		getUI("ui:interface:info_player_journal:content:cap_group:cap_progress").active = false
+		getUI("ui:interface:info_player_journal:content:cap_group:cap_infos").x = 4
+	else
+		getUI("ui:interface:info_player_journal:content:cap_group:cap_progress").active = true
+		getUI("ui:interface:info_player_journal:content:cap_group:cap_infos").x = 72
+		if value >= 0 then
+			if value > 100 and game.CapNextUrl ~= "" then
+				getUI("ui:interface:web_transactions"):find("html"):browse(game.CapNextUrl)
+			else
+				setDbProp("UI:TEMP:CAP_PROGRESS", value)
+			end
+		end
+	end
+
+	if text ~= nil then
+		getUI("ui:interface:info_player_journal:content:cap_group:cap_infos").uc_hardtext = getUCtf8(text)
+	end
+end
+
+function game:openInfosUrl()
+	if game.CapInfosUrl == nil then
+		game:openMissionsCatalog()
+	elseif game.CapInfosUrl ~= "" then
+		getUI("ui:interface:web_transactions"):find("html"):browse(game.CapInfosUrl)
+	end
+end
+
+function game:setInfosUrl(url)
+	game.CapInfosUrl = url
+end
+
+function game:setNextUrl(url)
+	game.CapNextUrl = url
+end
+
+function setCap(channel, element, a, b)
+	if element == nil then
+		game.CapChannel = channel
+		game:setInfosUrl(a)
+		game:setNextUrl(b)
+		return
+	end
+
+	if channel ~= game.CapChannel then
+		return
+	end
+
+	if element == "t" then
+		game:setCapTitle(a)
+	elseif element == "d" then
+		game:setCapDesc(a)
+	elseif element == "i" then
+		game:setCapIcon(a)
+	elseif element == "p" then
+		game:setCapProgress(a, b)
+	elseif element == "u" then
+		game:setInfosUrl(a)
+		game:setNextUrl(b)
+	elseif element == "n" then
+		game:setNextUrl(a)
+	elseif element == "o" then
+		game:setInfosUrl(a)
+	elseif element == "r" then
+		game:displayRpMessage(a, b)
+	elseif element == "b" then
+		broadcast(a, b)
+	end
+end
+
+
+function game:openMissionsCatalog()
+	-- Setup this function in webig
+end
+
+
 --------------------------------------------------------------------------------------------------------------
 function game:onMissionFinished(index)
 	self:updateCurrMissionComboBox()
@@ -1306,46 +1486,41 @@ end
 --------------------------------------------------------------------------------------------------------------
 function game:updateMissionWindowLayout()
 	if not isInRingMode() then
-		local missionCB = getUI("ui:interface:info_player_journal:content:mission_combo")
-		local missionList = getUI("ui:interface:info_player_journal:content:mission_list")
-		local fake = getUI("ui:interface:info_player_journal:content:fake")
-		local sepBis = getUI("ui:interface:info_player_journal:content:separator_bis")
-		local desc = getUI("ui:interface:info_player_journal:content:desc")
+		local base = "ui:interface:info_player_journal:content:"
+		local missionCB = getUI(base.."mission_combo")
+		local missionList = getUI(base.."mission_list")
+		local fake = getUI(base.."fake")
+		local desc = getUI(base.."desc")
+		local separator = getUI(base.."separator")
 		local expanded
-		local popMinH
 		local win = getUI("ui:interface:info_player_journal")
 
 		if missionCB.active then
-			sepBis.active = false
 			missionList.active = false
+			separator.active = false
 			fake.sizeref=""
-			fake.y = -32
-			fake.h = 0
+			fake.y = 0
+			fake.h = 70
 			expanded = 0
 			desc.max_sizeref ="wh"
-			desc.max_h= -42
-			win.pop_min_h = 152 - win.content_y_offset
+			desc.max_h = -60
+			win.pop_min_h = 157 - win.content_y_offset
 		else
-			sepBis.active =	true
 			missionList.active = true
-			fake.sizeref="wh5"
+			separator.active = true
+			fake.sizeref = "wh5"
 			fake.y = -8
-			fake.h = -42
+			fake.h = 0
 			expanded = 1
-			desc.max_sizeref ="wh5"
-			desc.max_h=16
-			win.pop_min_h = 152 - win.content_y_offset
+			desc.max_sizeref = "wh5"
+			desc.max_h = -5
+			win.pop_min_h = 157 - win.content_y_offset
 		end
 
-		local fixedEntry = getUI("ui:interface:info_player_journal:content:mission_fixed_entry")
-		fixedEntry:updateCoords()
-		desc.max_h = desc.max_h - fixedEntry.h
-
 		setDbProp("UI:SAVE:EXPAND_MISSION_LIST", expanded)
-		getUI("ui:interface:info_player_journal"):invalidateCoords()
+		win:invalidateCoords()
 	end
 end
-
 --------------------------------------------------------------------------------------------------------------
 function game:onMissionJournalOpened()
 	local missionDesc = getUI("ui:interface:info_player_journal:content:desc")
@@ -1366,9 +1541,6 @@ function game:onMissionJournalOpened()
 	self:updateMissionJournalHeader()
 	self:updateMissionWindowLayout()
 	self:updateMissionJournalFixedEntry()
-
-
-
 end
 
 --------------------------------------------------------------------------------------------------------------
@@ -1378,10 +1550,10 @@ function game:updateMissionJournalHeader()
 	win.header_active = headerActive
 	win.right_button_enabled = headerActive
 	if headerActive then
-		win.title_opened = i18n.get("uiJournalTitle")
+		win.uc_title_opened = i18n.get("uiJournalTitle")
 		win.content_y_offset = 0
 	else
-		win.title_opened = ""
+		win.uc_title_opened = ucstring("")
 		win.content_y_offset = win.header_opened.h_real + 3
 	end
 end
@@ -1390,34 +1562,6 @@ end
 --------------------------------------------------------------------------------------------------------------
 function game:updateMissionJournalFixedEntry()
 	-- update fixed entry text
-
-	local fixedEntryRing = getUI("ui:interface:info_player_journal:no_available_missions:main:mission_fixed_entry")
-	local fixedEntryMain = getUI("ui:interface:info_player_journal:content:mission_fixed_entry")
-
-	fixedEntryRing.active = game.InGameDbInitialized and isInRingMode()
-	fixedEntryMain.active = game.InGameDbInitialized and not isInRingMode()
-
-
-
-	local id = "uiFixedMissionEntry"
-	if isPlayerNewbie() then
-		id = id .."_Newbie"
-		if isInRingMode() then
-			id = id .. "_R2"
-		end
-		if isPlayerFreeTrial() then
-			id = id .. "_Trial"
-		end
-	else
-		if isInRingMode() then
-			id = id .. "_R2"
-		else
-			id = id .. "_Mainland_" .. getUserRace()
-		end
-	end
-	fixedEntryMain.text = i18n.get(id)
-	fixedEntryRing.text = i18n.get(id)
-
 	self:updateMissionWindowLayout()
 end
 
@@ -1491,7 +1635,19 @@ function game:onInGameDbInitialized()
 		self:setCurrentMission(game.PrevSessionMission)
 	end
 
+	game:setInfoPlayerCharacterRace()
+	--
+	game:openChannels()
+
 	runAH(nil, "sort_tribefame", "")
+	local ency = getUI("ui:interface:encyclopedia")
+	setOnDraw(ency, "ArkMissionCatalog:startResize()")
+end
+
+function game:onWebIgReady()
+	-- Call init webig
+	getUI("ui:interface:web_transactions:content:html"):browse("home")
+	getUI("ui:interface:webig:content:html"):browse("home")
 end
 
 --------------------------------------------------------------------------------------------------------------
@@ -1499,6 +1655,12 @@ end
 function game:onFarTpStart()
 	debugInfo("game:onFarTpStart()")
 	--game:deinitWebIgApps()
+	--
+	if getDbProp("UI:SAVE:CHAT:SAVE_CHANNEL") > 0 then
+		game:saveChannel()
+	end
+
+	artefact:onClose()
 end
 
 --------------------------------------------------------------------------------------------------------------
@@ -1513,7 +1675,12 @@ end
 function game:onMainLoopEnd()
 	game.InGameDbInitialized = false
 	game:updateMissionJournalFixedEntry()
+	--
+	if getDbProp("UI:SAVE:CHAT:SAVE_CHANNEL") > 0 then
+		game:saveChannel()
+	end
 
+	artefact:onClose()
 end
 
 --------------------------------------------------------------------------------------------------------------
@@ -1587,6 +1754,7 @@ function game:onNewMissionStepAdded(stepIndex)
 		setOnDraw(missionWnd, "game:ensureLastMissionStepVisibility0()")
 	else
 	end
+	game.WebMissionLastDesc = {}
 end
 
 function game:ensureLastMissionStepVisibility0()
@@ -1617,6 +1785,7 @@ end
 
 function game:ensureLastMissionStepVisibility1()
 	local missionWnd = getMissionWindow()
+	local missionIndex = getDbProp("UI:SAVE:MISSION_SELECTED")
 	local scrollBar = missionWnd:find("sv_desc")
 	--scrollBar.trackPos = 20000 -- move upward
 	--scrollBar:updateCoords()
@@ -1630,7 +1799,7 @@ function game:ensureLastMissionStepVisibility1()
 			topStep = currStep
 		end
 	end
-	-- debugInfo("Found step : " .. topStep.hardtext)
+
 	if topStep == nil then
 		return
 	end
@@ -1645,12 +1814,270 @@ function game:ensureLastMissionStepVisibility1()
 	--descWnd:invalidateCoords()
 	--descWnd:updateCoords()
 
-	setOnDraw(missionWnd, "")
+	game.WebMissionLastDesc = {}
+	setOnDraw(missionWnd, "game:ensureWebMissionVisibility()")
 
 end
 
+function game:ensureWebMissionVisibility()
+	local missionWnd = getMissionWindow()
+	local missionIndex = getDbProp("UI:SAVE:MISSION_SELECTED")
+	local scrollBar = missionWnd:find("sv_desc")
+	local descWnd = missionWnd:find("desc")
+	local maxNumSteps = getDefine("ipj_nb_goal")
+	local topStep
+	local haveWeb = false
+	for  stepIndex = 0, maxNumSteps -1 do
+		local currStep = descWnd["step" .. tostring(stepIndex)]
+		if missionIndex < 15 then
+			dbPath = "SERVER:MISSIONS:" .. tostring(missionIndex) .. ":GOALS:" .. tostring(stepIndex) .. ":TEXT"
+			local stringID = getDbProp(dbPath)
+			local uctext = getDynString(stringID)
+			local text = uctext:toUtf8()
+			if text ~= "" and game.WebMissionLastDesc[stepIndex] ~= text then
+				game.WebMissionLastDesc[stepIndex] = text
+				if string.sub(text, 1, 4) == "@WEB" then
+					text = string.sub(text, 6)
+					haveWeb = true
+					local win = getUI(descWnd.id..":web:html")
+					for web, final_text in string.gmatch(text, "(.*)\n@@@\n(.*)") do
+						win:renderHtml(web)
+						currStep.hardtext = final_text
+						break
+					end
+				else
+					currStep.uc_hardtext = uctext
+				end
+			end
+		end
+
+		if (game.WebMissionLastDesc[stepIndex] ~= nil) and (string.sub(game.WebMissionLastDesc[stepIndex], 1, 4) == "@WEB") then
+			haveWeb = true
+		end
+	end
+
+	if haveWeb then
+		getUI(descWnd.id..":web").h = 56
+	else
+		getUI(descWnd.id..":web").h = 0
+	end
+
+	local base = "ui:interface:info_player_journal:content:"
+	local fake = getUI(base.."fake")
+	local missionCB = getUI(base.."mission_combo")
+	local missionL = getUI(base.."mission_list")
+	local desc = getUI(base.."desc")
+	local win = getUI("ui:interface:info_player_journal")
+
+	if missionCB.active then
+		fake.sizeref=""
+		fake.h = 70
+	else
+		if win.h > 200 then
+			desc.max_sizeref ="wh"
+			desc.max_h = -missionL.h + missionL.y
+			if win.h > 2*(missionL.h - missionL.y) then
+				fake.sizeref=""
+				fake.h = missionL.h - missionL.y - 7
+			else
+				fake.sizeref = "wh5"
+				fake.h = 0
+			end
+		else
+			fake.sizeref = "wh5"
+			fake.h = 0
+			desc.max_sizeref = "wh5"
+			desc.max_h = -5
+		end
+	end
+end
+
 --------------------------------------------------------------------------------------------------------------
 -- This handler is triggered when a new mission has been added. In this case, we select the mission automatically
 function game:onNewMissionAdded(missionIndex)
+	setOnDraw(missionWnd, "game:ensureWebMissionVisibility()")
 	debugInfo("Mission " .. missionIndex .. " has been added")
+	game.WebMissionLastDesc = {}
 end
+
+--------------------------------------------------------------------------------------------------------------
+-- RPJOBS
+
+function game:addRpJob(jobtype, id, value, rpjobs)
+	local base_path = "ui:interface:info_player_skills:content:rpjobs:rpjob_"..jobtype.."_"..id..":rpjob_"..jobtype.."_infos_"..id
+
+	local group = getUI("ui:interface:info_player_skills:content:rpjobs:rpjob_"..jobtype.."_"..id)
+
+	if (value == nil) then
+		group.active = false
+	else
+		local name = "rpjob_" .. string.format("%03d", value)
+		local sitem = name..".sitem"
+		if (rpjobs[sitem] == nil) then
+			group.active = false
+		else
+			group.active = true
+
+			local echelon_value = rpjobs[sitem][1]
+			local quantity = rpjobs[sitem][2]
+
+			local maxlevel = (echelon_value*6)-30
+
+			if (quantity > maxlevel) then
+				quantity = maxlevel
+			end
+
+			local base = getUI(base_path..":t")
+			base.hardtext = i18n.get(name):toUtf8()
+			local ui = getUI(base_path..":icon")
+			ui.texture = name..".tga"
+			local echelon = getUI(base_path..":echelon_value")
+			echelon.hardtext = tostring(echelon_value/10)
+			local bar = getUI(base_path..":bar3d:level")
+			local t = getUI(base_path..":bar3d:t")
+			if (echelon_value >= 60) then
+				bar.color = "255 0 0 255"
+				bar.w = "368"
+				t.hardtext = i18n.get("uiRpjobMaxLevel"):toUtf8()
+				t.color = "255 255 0 255"
+			else
+				bar.color = tostring(math.floor((105*quantity)/maxlevel)).." "..tostring(100+math.floor((155*quantity)/maxlevel)).." "..tostring(math.floor((105*quantity)/maxlevel)).." 255"
+				bar.w = tostring((368*quantity)/maxlevel)
+				t.hardtext = tostring(quantity).." / "..tostring(maxlevel)
+				t.color = tostring(255*math.floor(3*(maxlevel-quantity)/maxlevel)).." "..tostring(255*math.floor(3*(maxlevel-quantity)/maxlevel)).." "..tostring(255*math.floor(3*(maxlevel-quantity)/maxlevel)).." 255"
+			end
+		end
+	end
+end
+
+
+function game:getRPJobs()
+	rpjobs_advanced = {}
+	rpjobs_elementary = {}
+	rpjobs_roleplay = {}
+	rpjobs = {}
+
+	for i = 0, 499, 1 do
+		local sheet =  getDbProp("SERVER:INVENTORY:BAG:"..tostring(i)..":SHEET")
+		if (sheet ~= 0) then
+			local name = getSheetName(sheet)
+			if (string.sub(name, 0, 6) == "rpjob_") then
+				local quality =  getDbProp("SERVER:INVENTORY:BAG:"..tostring(i)..":QUALITY")
+				local quantity =  getDbProp("SERVER:INVENTORY:BAG:"..tostring(i)..":QUANTITY")
+
+				if (name == "rpjob_advanced.sitem") then
+					table.insert(rpjobs_advanced, quality)
+				else
+					if (name == "rpjob_elementary.sitem") then
+						table.insert(rpjobs_elementary, quality)
+					else
+						if (name == "rpjob_roleplay.sitem") then
+							table.insert(rpjobs_roleplay, quality)
+						else
+							if rpjobs[name] == nil then
+								rpjobs[name] = {quality, quantity}
+							else
+								if rpjobs[name][1] < quality then
+									rpjobs[name] = {quality, quantity}
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+
+	for id=1,2,1 do
+		game:addRpJob("advanced", id, rpjobs_advanced[id], rpjobs)
+	end
+
+	for id=1,3,1 do
+		game:addRpJob("elementary", id, rpjobs_elementary[id], rpjobs)
+	end
+
+
+end
+
+--------------------------------------------------------------------------------------------------------------
+function game:setInfoPlayerCharacterRace()
+	getUI("ui:interface:info_player_skills:content:basics_skills:character_race_name").uc_hardtext = i18n.get("io"..getUserRace())
+end
+
+function game:arkTitlesAddClassics()
+	runAH(nil, "title_init_combobox", "")
+	local cb = getUI("ui:interface:info_player_skills:content:webinfos:title:player_title")
+	local ui = getUI("ui:interface:encyclopedia:content:htmlC")
+	local html = [[<body style="background-color: #0009">]]
+
+	local titles = {}
+	for i=0,cb:getNumTexts()-1 do
+		table.insert(titles, tostring(cb:getText(i)))
+	end
+	table.sort(titles)
+	for i,title in ipairs(titles) do
+		html = html .. [[<div class="ryzom-ui-grouptemplate" id="div_ark_title" style="template:title_template;id:div_ark_title:display_title;icon:ico_amber_ball.tga;text:]]
+		html = html .. title .. [[;titleid:]] .. title
+		html = html .. [[;color:255 255 255 255;enable:50;tooltip:"></div>]]
+	end
+	html = html .. [[<br/><br/><br/></body>]]
+	ui:renderHtml(html)
+end
+
+
+
+-- --------------------------------------------------------------------------------------------------------------
+-- game.preInitTimer = 0
+-- function game:preInitWebIgAppsLoop()
+	-- if game.preInitTimer == nil then game.preInitTimer = 0 end
+
+	-- game.preInitTimer = game.preInitTimer - 1
+	-- if (not game.preWebIgAppsInitialized) and game.preInitTimer < 0 then
+		-- debugInfo("initWebIgAppsLoop(): calling app_ig_preinit.php")
+		-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_preinit.php")
+		-- game.preInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
+	-- end
+
+	-- if game.preWebIgAppsInitialized then
+		-- debugInfo("preInitWebIgAppsLoop(): Calling removeOnDbChange()")
+		-- removeOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
+	-- end
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:preInitWebIgApps()
+	-- debugInfo("game:preInitWebIgApps()")
+	-- addOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:preInitWebIgAppsLoop()")
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- game.postInitTimer = 0
+-- function game:postInitWebIgAppsLoop()
+	-- if game.postInitTimer == nil then game.postInitTimer = 0 end
+
+	-- game.postInitTimer = game.postInitTimer - 1
+	-- if game.postInitTimer < 0 then
+		-- debugInfo("initWebIgAppsLoop(): calling app_ig_postinit.php")
+		-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_postinit.php")
+		-- game.postInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
+	-- end
+
+	-- if game.postWebIgAppsInitialized then
+		-- debugInfo("postInitWebIgAppsLoop(): Calling removeOnDbChange()")
+		-- removeOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
+	-- end
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:postInitWebIgApps()
+	-- debugInfo("game:postInitWebIgApps()")
+	-- addOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:postInitWebIgAppsLoop()")
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:deinitWebIgApps()
+	-- debugInfo("game:deinitWebIgApps()")
+	-- game.preWebIgAppsInitialized = nil
+	-- game.postWebIgAppsInitialized = nil
+	-- titleSetted = nil
+-- end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/info_player.xml b/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
index 27c542450..35df84f21 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
@@ -5,7 +5,7 @@
     <variable entry="UI:VARIABLES:TOTAL_MALUS_EQUIP" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:TOTAL_MAGIC_ABSORB" type="sint32" value="0" />
     <!-- <variable entry="UI:VARIABLES:CDB_INIT_IN_PROGRESS"        type="bool"   value="1" /> -->
-    <!-- Link to compute the Total_Magic absorb, in local, according to 
+    <!-- Link to compute the Total_Magic absorb, in local, according to
         - jewels weared  (=> EQUIP and BAG)
         - absorb factor
         - max baseskilllevel of the player
@@ -26,7 +26,7 @@
             <ctrl type="tooltip" id="tt" sizeref="wh" on_tooltip="lua:game:tooltipScore('#baseval', '#maxval','#tooltip')" />
         </group>
     </template>
-    <!-- Esquive and Parade specific -->
+    <!-- Dodge and Parry specific -->
     <template name="tipc_scoreEP" posparent="parent" x="0" y="0" h="16" posref="TL TL" id="" sizeref="w" w="0" text="" val="" maxval="" baseval="" level="" mod="" tooltip="">
         <group id="#id" posparent="#posparent" posref="#posref" w="#w" h="#h" x="#x" y="#y" sizeref="#sizeref">
             <view type="text" id="t" posref="TL TL" y="0" color="255 255 255 255" fontsize="12" shadow="true" hardtext="#text" />
@@ -95,7 +95,7 @@
                 <view type="bitmap" id="jauge_graph" posref="TL TL" texture="jauge.tga" color="#color" global_color="false" />
             </group>
             <view type="text" id="t" posref="TL TL" x="16" y="2" color="255 255 255 255" global_color="false" fontsize="10" shadow="true" hardtext="#text" />
-            <!--  
+            <!--
          <view type="text_number" id="max" posref="MR MR" x="-12" y="-2" color="255 255 255 255" shadow="true" global_color="false" fontsize="10" value="#maxval" positive="true" />
          <view type="text" id="sep" posparent="max" posref="TL TR" x="-1" color="255 255 255 255" shadow="true" global_color="false" fontsize="10" hardtext="/" />
          <view type="text_number" id="val" posparent="max" posref="TL TR" x="-10" color="255 255 255 255" shadow="true" global_color="false" fontsize="10" value="#val" positive="true" />
@@ -244,9 +244,6 @@
                     </group>
                     <instance template="inner_thin_border" posparent="black" inherit_gc_alpha="true" />
                 </group>
-                <!--
-                        <instance template="faction_points_widget" id="fp" posref="TL TL" x="0" y="-555" />
-                        -->
             </group>
             <group id="ring_skills" sizeref="wh" w="0" y="0" h="0" posref="TL TL">
                 <instance template="ecosystem_points_widget" id="ep" posref="TL TL" x="0" y="-10" />
@@ -320,12 +317,12 @@
             <view type="bitmap" id="p2" texture="blank.tga" posref="BL BL" scale="true" x="0" w="10" h="16" y="4" global_color="false" />
             <view type="bitmap" id="p3" texture="blank.tga" posref="BL BL" scale="true" x="0" w="10" h="16" y="4" global_color="false" />
             <view type="bitmap" id="p4" texture="blank.tga" posref="BL BL" scale="true" x="0" w="10" h="16" y="4" global_color="false" />
-            <!-- beautifull 3D bar look -->
+            <!-- beautiful 3D bar look -->
             <group id="bar3d" posref="BL BL" x="0" y="4" w="0" h="16">
                 <view type="bitmap" id="bar" texture="fame_bar_3d.tga" scale="true" sizeref="w" x="0" w="0" h="16" global_color="false" />
             </group>
             <!-- Tooltips above the Bars -->
-            <!-- For now, the KOS system does not work, so pust instead no trade
+            <!-- For now, the KOS system does not work, so put instead no trade
                 <ctrl type="tooltip" id="ttp0" posref="BL BL" x="0" y="4" h="16" w="10" tooltip="uittFameKOS" />
                 -->
             <ctrl type="tooltip" id="ttp0" posref="BL BL" x="0" y="4" h="16" w="10" tooltip="uittFameNoTrade" />
@@ -533,7 +530,7 @@
         <action handler="add_link" params="id=mission_wake_active|expr=and(eq(@UI:TEMP:MISSION_WAKE_BUTTON,1),ne(@UI:SAVE:MISSION_SELECTED,-1),or(eq(@SERVER:MISSIONS:@0:SLEEP,1)))|target=ui:interface:info_player_journal:content:desc:wake:active" />
         <action handler="remove_link" params="id=mission_timer_link" />
         <action handler="remove_link" params="id=mission_time2_link" />
-        <action handler="add_link" params="id=mission_timer_link|expr=secondsToTimeString(div(sub(@SERVER:MISSIONS:@0:END_DATE,@UI:VARIABLES:CURRENT_SERVER_TICK),10))|target=ui:interface:info_player_journal:content:desc:timer:t:hardtext" />
+        <action handler="add_link" params="id=mission_timer_link|expr=secondsToTimeString(div(sub(@SERVER:MISSIONS:@0:END_DATE,@UI:VARIABLES:CURRENT_SERVER_TICK),10))|target=ui:interface:info_player_journal:content:desc:timer:t:uc_hardtext" />
         <action handler="add_link" params="id=mission_time2_link|expr=ne(@SERVER:MISSIONS:@0:END_DATE,0)|target=ui:interface:info_player_journal:content:desc:timer:active" />
         <vector template="t_mission_proc_title_histo" _size="%ipj_nb_histo" nb="$i" />
         <vector template="t_mission_proc_title_step" _size="%ipj_nb_goal" nb="$i" />
@@ -583,7 +580,7 @@
         <action handler="add_link" params="id=mission_wake_active|expr=and(eq(@UI:TEMP:MISSION_WAKE_BUTTON,1),ne(@UI:SAVE:MISSION_SELECTED,-1),or(eq(@SERVER:GROUP:MISSIONS:@0:SLEEP,1)))|target=ui:interface:info_player_journal:content:desc:wake:active" />
         <action handler="remove_link" params="id=mission_timer_link" />
         <action handler="remove_link" params="id=mission_time2_link" />
-        <action handler="add_link" params="id=mission_timer_link|expr=secondsToTimeString(div(sub(@SERVER:GROUP:MISSIONS:@0:END_DATE,@UI:VARIABLES:CURRENT_SERVER_TICK),10))|target=ui:interface:info_player_journal:content:desc:timer:t:hardtext" />
+        <action handler="add_link" params="id=mission_timer_link|expr=secondsToTimeString(div(sub(@SERVER:GROUP:MISSIONS:@0:END_DATE,@UI:VARIABLES:CURRENT_SERVER_TICK),10))|target=ui:interface:info_player_journal:content:desc:timer:t:uc_hardtext" />
         <action handler="add_link" params="id=mission_time2_link|expr=ne(@SERVER:GROUP:MISSIONS:@0:END_DATE,0)|target=ui:interface:info_player_journal:content:desc:timer:active" />
         <vector template="t_group_mission_proc_title_histo" _size="%ipj_nb_histo" nb="$i" />
         <vector template="t_group_mission_proc_title_step" _size="%ipj_nb_goal" nb="$i" />
@@ -617,7 +614,7 @@
             <vector template="t_group_mission_title" posparent="%ipj_last_title" _size="%ipj_nb_group_mission" _firstpos="BL TL" _nextpos="BL TL" _xfirst="0" id="group_title$i" stepindex="$i" />
         </group>
         <!--
-        <ctrl style="skin_scroll" id="sv" posref="TL TL" x="4" y="-8" target="mission_list"/>   
+        <ctrl style="skin_scroll" id="sv" posref="TL TL" x="4" y="-8" target="mission_list"/>
         -->
     </group>
     <!-- bind lua observers to know when :
@@ -672,7 +669,7 @@
                 <view type="text" id="no_selected_mission" active="false" x="4" y="0" posref="ML ML" fontsize="10" hardtext="uiClickToSelectAMission" />
                 <view type="text" id="no_available_mission" active="true" x="4" y="0" posref="ML ML" fontsize="10" hardtext="uiNoAvailableMission" />
             </group>
-            <group id="mission_list" w="-32" active="false" posref="TL TL" x="12" y="-8" sizeref="w" child_resize_h="true" child_resize_hmargin="2" max_sizeref="wh5" max_w="-12" max_h="-42">
+            <group id="mission_list" w="-32" active="false" posref="TL TL" x="6" y="-52" sizeref="w" child_resize_h="true" child_resize_hmargin="2" max_sizeref="wh5" max_w="-12" max_h="-42">
                 <vector template="t_mission_title" _size="%ipj_nb_mission" _firstpos="TL TL" _nextpos="BL TL" _xfirst="0" id="title$i" stepindex="$i" tooltip="uittMissionJournal" />
                 <vector template="t_group_mission_title" posparent="%ipj_last_title" _size="%ipj_nb_group_mission" _firstpos="BL TL" _nextpos="BL TL" _xfirst="0" id="group_title$i" stepindex="$i" tooltip="uittMissionJournal" />
                 <view type="text" id="no_selected_mission" active="false" x="4" y="0" posref="ML ML" fontsize="10" hardtext="uiClickToSelectAMission" />
@@ -681,10 +678,6 @@
             <ctrl style="skin_scroll" id="sv" posref="TL TL" x="0" y="-52" target="mission_list" target_stepy="18" />
             <ctrl type="button" active="true" button_type="push_button" id="expand_mission_list" w="20" h="20" x="-1" y="-52" scale="true" color="192 192 192 255" tx_normal="Switch_Ratio.tga" col_over="255 255 255 225" tx_over="Switch_Ratio.tga" col_pushed="192 192 192 255" tx_pushed="Switch_Ratio.tga" posref="TR TR" tooltip="uittExpandMissionList" onclick_l="lua:game:expandMissionList()" />
             <group id="fake" posref="TL TL" x="0" y="-40" sizeref="" w="0" h="42"></group>
-            <!--
-                <group id="fake" posref="TL TL" x="0" y="-4" h="0">
-                </group>
-                -->
             <group id="separator" posref="BL TL" posparent="fake" sizeparent="parent" sizeref="w" w="0" h="8" x="0" y="-5">
                 <view type="bitmap" id="sep_lef" posref="TL TL" texture="Skin_Sep_L.tga" inherit_gc_alpha="false" />
                 <view type="bitmap" id="sep_mid" posref="MM MM" scale="true" sizeref="w" w="-16" h="4" texture="Skin_Sep_M.tga" inherit_gc_alpha="false" />
@@ -704,9 +697,9 @@
                     <view type="bar" id="b" ultra_mini="true" posref="TL TL" color="255 255 255 255" value="UI:VARIABLES:CURRENT_SERVER_TICK" range="SERVER:MISSIONS:0:END_DATE" reference="SERVER:MISSIONS:0:BEGIN_DATE" />
                     <view type="text" id="t" posparent="b" posref="TR TL" x="4" color="255 255 255 255" fontsize="8" shadow="true" hardtext="" />
                 </group>
-                <view type="bitmap" id="bottom_sizer" posparent="web" posref="BL TL" x="5" y="-22" texture="blank.tga" color="0 0 0 0" scale="false" global_color="false" />
+                <view type="bitmap" id="bottom_sizer" x="5" posparent="web" posref="BL TL" y="-22" texture="blank.tga" color="0 0 0 0" scale="false" global_color="false" />
                 <view type="bitmap" id="mid_sep" posref="BL BL" y="4" posparent="bottom_sizer" sizeparent="parent" scale="true" sizeref="w" w="0" h="2" texture="W_line_hor.tga" />
-                <!-- old to recent -->
+                <!--zd old to recent -->
                 <!--
                         <vector template="t_mission_histo" posparent="bottom_sizer" _size="%ipj_nb_histo" _firstpos="BL TL" _nextpos="BL TL" _xfirst="0" id="histo$i" stepindex="$i" />
                         <vector template="t_mission_step" posparent="%ipj_last_histo" _size="%ipj_nb_goal" _firstpos="BL TL" _nextpos="BL TL" _xfirst="0" id="step$i" stepindex="$i" />
@@ -737,6 +730,7 @@
     <!-- update ui when one goes from start island to mainland -->
     <link expr="depends(@SERVER:USER:IS_NEWBIE)" action="lua:game:onMissionJournalOpened()" />
     <link expr="depends(@SERVER:USER:IS_TRIAL)" action="lua:game:onMissionJournalOpened()" />
+    <!--<link expr="depends(@LOCAL:INVENTORY:BAG)" action="lua:game:getRPJobs()" />-->
     <!--***********************-->
     <!--*   POPUP  MESSAGES   *-->
     <!--***********************-->
@@ -772,10 +766,10 @@
             <!-- Delta -->
             <view type="text" id="delta" posparent="max" posref="TR TL" x="30" global_color="false" fontsize="10" shadow="true" color="255 0 0 255" />
         </group>
+        <!--***********************-->
+        <!--*    RPJOB TEMPLATES  *-->
+        <!--***********************-->
     </template>
-    <!--***********************-->
-    <!--*    RPJOB TEMPLATES  *-->
-    <!--***********************-->
     <template h="48" id="" name="rpjob_title" posparent="parent" posref="TL TL" sizeref="w" suffix="" text="" tooltip="" val="" w="0" x="0" y="0">
         <group h="#h" id="#id" posparent="#posparent" posref="#posref" sizeref="#sizeref" w="#w" x="#margin_x" y="#y">
             <view global_color="false" id="icon" posref="TL TL" texture="#rpjob_icon" type="bitmap" x="4" y="-4" />
@@ -800,7 +794,7 @@
     <!--***********************-->
     <!--*     NPC WEB PAGE    *-->
     <!--***********************-->
-    <group type="container" id="npc_web_browser" w="480" h="400" title="???" global_color="false" header_color="UI:SAVE:WIN:COLORS:HELP" resizer="true" pop_min_w="220" pop_min_h="96" pop_max_w="2000" pop_max_h="1600" title_bar_open="false" open_button="false" force_open_out="true" lockable="true" openable="true" opened="true" movable="true" active="false" on_active="proc" on_active_params="npc_web_browser_proc_active" on_deactive="proc" on_deactive_params="npc_web_browser_proc_deactive" localize="false" active_savable="false">
+    <group type="container" id="npc_web_browser" w="480" h="400" title="???" global_color="false" open_button="false" force_open_out="true" header_color="UI:SAVE:WIN:COLORS:HELP" resizer="true" pop_min_w="220" pop_min_h="96" pop_max_w="2000" pop_max_h="1600" title_bar_open="false" lockable="true" openable="true" opened="true" movable="true" active="false" on_active="proc" on_active_params="npc_web_browser_proc_active" on_deactive="proc" on_deactive_params="npc_web_browser_proc_deactive" localize="false" active_savable="false">
         <group id="header_closed" x="0" y="0" h="12" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color" on_active="lua" on_active_params="game:closeNpcWebBrowserHeader()"></group>
         <group id="header_opened" x="0" y="0" w="480" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color" on_active="lua" on_active_params="game:openNpcWebBrowserHeader()">
             <!-- must be frozen by default cause no undo/redo at start -->
@@ -820,18 +814,19 @@
         </group>
     </group>
     <tree node="npc_web_browser" />
-    <template name="ark_mission" w="45" keep="true" icon="blank.tga" tooltip="" text1="" text2="" text3="" text1_color="255 255 255 255" text2_color="255 255 255 255" text3_color="255 255 255 255" color="0 0 0 0" color_over="255 255 255 50" shadow="true" bg="w_slot_item.tga" params_l="" params_r="" x="0" y="0">
-        <group id="#id" posref="MM MM" w="0" h="45" x="0" y="0" sizeref="w">
-            <view type="bitmap" id="icon" posref="ML ML" x="2" y="0" texture="#icon" global_color="false" />
-            <view type="text" id="text1" x="48" y="-2" w="0" sizeref="w" posref="TL TL" color="#text1_color" shadow="#shadow" fontsize="10" hardtext="#text1" global_color="false" multi_line="true" />
-            <view type="text" id="text2" x="0" y="-2" w="0" sizeref="w" posparent="text1" color="#text2_color" posref="BL TL" shadow="#shadow" fontsize="10" hardtext="#text2" global_color="false" multi_line="false" />
-            <view type="text" id="text3" x="0" y="-2" w="0" sizeref="w" posparent="text2" color="#text3_color" posref="BL TL" shadow="#shadow" fontsize="10" hardtext="#text3" global_color="false" multi_line="false" />
-            <ctrl type="button" id="ctrl" button_type="push_button" global_color_normal="false" posref="ML ML" w="-1" x="1" y="0" tx_normal="blank.tga" tx_pushed="blank.tga" tx_over="blank.tga" scale="true" sizeref="w" h="44" tooltip="#tooltip" color="#color" col_over="#color_over" col_pushed="255 255 255 0" onclick_l="lua" params_l="#params_l" onclick_r="lua" params_r="#params_r" />
+    <template name="ark_mission" w="45" h="45" keep="true" icon="blank.tga" tooltip="" text1="" text2="" text3="" text1_color="255 255 255 255" text2_color="255 255 255 255" text3_color="255 255 255 255" color="255 255 255 255" color_over="255 255 255 50" shadow="true" bg="w_slot_item.tga" params_l="" params_r="" tx_over="blank.tga" icon_x="0" icon_y="0" text_x="4" text_y="0">
+        <group id="#id" posref="MM MM" w="0" h="#h" x="0" y="0" sizeref="w">
+            <view type="bitmap" id="back" posref="ML ML" x="0" y="0" h="#h" w="#w" scale="true" texture="#bg" color="#color" global_color="false" />
+            <view type="bitmap" id="icon" posref="ML ML" w="40" h="40" scale="true" x="4" y="0" render_layer="3" posparent="back" texture="#icon" global_color="false" />
+            <view type="text" id="text1" x="#text_x" y="#text_y" w="0" sizeref="#w" posparent="icon" posref="TR TL" color="#text1_color" shadow="#shadow" fontsize="10" hardtext="#text1" global_color="false" multi_line="true" />
+            <view type="text" id="text2" x="0" y="0" w="0" sizeref="w" posparent="text1" color="#text2_color" posref="BL TL" shadow="#shadow" fontsize="10" hardtext="#text2" global_color="false" multi_line="false" />
+            <view type="text" id="text3" x="0" y="0" w="0" sizeref="w" posparent="text2" color="#text3_color" posref="BL TL" shadow="#shadow" fontsize="10" hardtext="#text3" global_color="false" multi_line="false" />
+            <ctrl type="button" id="ctrl" button_type="push_button" global_color_normal="false" posref="ML ML" w="-6" x="1" y="0" tx_normal="#tx_over" tx_pushed="#bg" tx_over="#tx_over" scale="true" sizeref="w" h="44" tooltip="#tooltip" color="0 0 0 0" col_over="#color_over" col_pushed="255 255 255 0" onclick_l="lua" params_l="#params_l" onclick_r="lua" params_r="#params_r" />
         </group>
     </template>
     <group type="container" id="ark_mission_catalog" active="false" w="950" h="700" pop_max_w="950" pop_max_h="700" pop_min_w="950" pop_min_h="700" header_color="UI:SAVE:WIN:COLORS:COM" posref="TL TL" title="Mission Catalog" global_color="true" global_color_over="true" right_button="true" movable="true" lockable="true" openable="true" opened="true" resizer="true" active_savable="false">
-        <group id="header_closed" x="0" y="0" w="120" h="16" posref="TL TL" on_active="lua" on_active_params="WebBrowser:saveWindowPop()" />
-        <group id="header_opened" x="0" y="0" w="950" h="16" posref="TL TL" on_active="lua" on_active_params="WebBrowser:restoreWindowPop()" />
+        <group id="header_closed" x="0" y="0" w="120" h="16" posref="TL TL" on_active="lua" on_active_params="WebBrowser:saveWindowPop()"></group>
+        <group id="header_opened" x="0" y="0" w="950" h="16" posref="TL TL" on_active="lua" on_active_params="WebBrowser:restoreWindowPop()"></group>
         <group id="content" x="0" y="0" w="0" h="0" posref="TL TL">
             <group id="htmlA" type="html" posref="ML ML" url="http://app.ryzom.com" title_prefix="" sizeref="h" x="-16" y="10" w="220" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline">
                 <group id="black" posref="BR BR" sizeref="hw" w="-16" h="-12" inherit_gc_alpha="true" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/interaction.lua b/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
index f0e07d484..21f5ef617 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
@@ -3,8 +3,8 @@
 
 ------------------------------------------------------------------------------------------------------------
 -- create the game namespace without reseting if already created in an other file.
-if (game==nil) then
-	game= {};
+if (game == nil) then
+	game={}
 end
 
 if (game.ui_props == nil) then
@@ -34,30 +34,30 @@ end
 -- called when server send an invitaion we receive a text id containing the string to display (invitor name)
 function game:onTeamInvation(textID)
 
-	local ui = getUI('ui:interface:join_team_proposal');
-	ui.content.inside.invitor_name.textid = textID;
-	ui.active = true;
-	setTopWindow(ui);
-	ui:center();
-	ui:blink(2);
+	local ui = getUI('ui:interface:join_team_proposal')
+	ui.content.inside.invitor_name.textid = textID
+	ui.active = true
+	setTopWindow(ui)
+	ui:center()
+	ui:blink(2)
 end
 
 ------------------------------------------------------------------------------------------------------------
 --
 function game:teamInvitationAccept()
 
-	local ui = getUI('ui:interface:join_team_proposal');
-	ui.active = false;
-	sendMsgToServer('TEAM:JOIN');
+	local ui = getUI('ui:interface:join_team_proposal')
+	ui.active = false
+	sendMsgToServer('TEAM:JOIN')
 end
 
 ------------------------------------------------------------------------------------------------------------
 --
 function game:teamInvitationRefuse()
 
-	local ui = getUI('ui:interface:join_team_proposal');
-	ui.active = false;
-	sendMsgToServer('TEAM:JOIN_PROPOSAL_DECLINE');
+	local ui = getUI('ui:interface:join_team_proposal')
+	ui.active = false
+	sendMsgToServer('TEAM:JOIN_PROPOSAL_DECLINE')
 end
 
 ------------------------------------------------------------------------------------------------------------
@@ -105,13 +105,13 @@ end
 ------------------------------------------------------------------------------------------------------------
 --
 function game:switchChatTab(dbEntry)
-	local	db= 'UI:SAVE:ISENABLED:' .. dbEntry;
-	local	val= getDbProp(db);
+	local	db= 'UI:SAVE:ISENABLED:' .. dbEntry
+	local	val= getDbProp(db)
 	-- switch value
 	if(val==0)	then
-		setDbProp(db, 1);
+		setDbProp(db, 1)
 	else
-		setDbProp(db, 0);
+		setDbProp(db, 0)
 	end
 end
 
@@ -125,12 +125,12 @@ function game:updateEmoteMenu(prop, tooltip, tooltip_pushed, name, param)
 
 		if (key ~= nil and key  ~= '') then
 			key = ' @{T25}@{2F2F}(' .. key .. ')';
-			text = concatString(text, key);
+			text = concatUCString(text, key);
 		end
 
 		-- if we don't do the full getUI, it doesn't work (don't understand why)
 		local	uiQC= getUI("ui:interface:user_chat_emote_menu:quick_chat:" .. "qc" .. i);
-		uiQC.text_format= text;
+		uiQC.uc_hardtext_format= text;
 	end
 
 end
@@ -423,7 +423,7 @@ function game:updateTargetConsiderUI()
 	end
 
 	if impossible then
-		wgToolTip.tooltip = concatString(wgToolTip.tooltip, "\n", i18n.get("uittConsiderUnknownLevel"))
+		wgToolTip.tooltip = concatUCString(wgToolTip.tooltip, ucstring("\n"), i18n.get("uittConsiderUnknownLevel"))
 	end
 end
 
@@ -593,16 +593,16 @@ end
 ------------------------------------------------------------------------------------------------------------
 --
 function game:closeWebIGBrowserHeader()
-	local ui = getUI('ui:interface:webig');
+	local ui = getUI('ui:interface:webig')
 
 	-- save size
-	ui_webig_browser_h = ui.h;
-	ui_webig_browser_w = ui.w;
+	ui_webig_browser_h = ui.h
+	ui_webig_browser_w = ui.w
 
 	-- reduce window size
-	ui.pop_min_h = 32;
-	ui.h = 0;
-	ui.w = 150;
+	ui.pop_min_h = 32
+	ui.h = 0
+	ui.w = 150
 end
 
 ------------------------------------------------------------------------------------------------------------
@@ -685,7 +685,7 @@ end
 local SavedUrl = "";
 function game:chatUrl(url)
 	SavedUrl = url
-	runAH(nil, "active_menu", "menu=ui:interface:chat_uri_action_menu");
+	runAH(nil, "active_menu", "menu=ui:interface:chat_uri_action_menu")
 end
 function game:chatUrlCopy()
 	runAH(nil, "copy_to_clipboard", SavedUrl)
diff --git a/ryzom/client/data/gamedev/interfaces_v3/interaction.xml b/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
index a2bad73f4..1af20d1ea 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
@@ -28,7 +28,7 @@
     <define id="force_level_8" value="consider_7.tga" />
     <proc id="proc_target_changed">
         <!-- Name -->
-        <action handler="set_target_name" params="slot=@@UI:VARIABLES:TARGET:SLOT|target=ui:interface:target:title| title=ui:interface:target:header_opened:target_title:hardtext" />
+        <action handler="set_target_name" params="slot=@@UI:VARIABLES:TARGET:SLOT|target=ui:interface:target:uc_title| title=ui:interface:target:header_opened:target_title:uc_hardtext" />
         <!-- Region force & Force level of the creature/player -->
         <!-- old consider system -->
         <!--
@@ -140,12 +140,12 @@
     </template>
     <group type="modal" id="add_contact" exit_click_out="true" posref="MM MR" w="212" child_resize_h="true" child_resize_hmargin="14" options="skin_modal" on_active="set_keyboard_focus" on_active_params="target=ui:interface:add_contact:add_contact_eb:eb|select_all=false">
         <view type="text" id="text" posref="TL TL" x="8" y="-8" color="255 255 255 255" global_color="false" fontsize="12" shadow="true" hardtext="uiPeopleAddContact" />
-        <instance template="edit_box_widget" id="add_contact_eb" posref="TL TL" x="6" y="-24" child_resize_h="true" w="200" onenter="add_contact" max_num_bytes="255" entry_type="playername" />
+        <instance template="edit_box_widget" id="add_contact_eb" posref="TL TL" x="6" y="-24" child_resize_h="true" w="200" onenter="add_contact" max_num_chars="255" entry_type="playername" />
         <instance template="button_ok_cancel" posparent="add_contact_eb" posref="BR TR" x="0" y="0" onclick_ok="add_contact" onclick_ok_param="" onclick_cancel="leave_modal" onclick_cancel_param="" />
     </group>
     <group type="modal" id="change_contact_group" exit_click_out="true" posref="MM MR" w="212" child_resize_h="true" child_resize_hmargin="14" options="skin_modal" on_active="set_keyboard_focus" on_active_params="target=ui:interface:change_contact_group:change_contact_group_eb:eb|select_all=false">
         <view type="text" id="text" posref="TL TL" x="8" y="-8" color="255 255 255 255" global_color="false" fontsize="12" shadow="true" hardtext="uiPeopleChangeContactGroup" />
-        <instance template="edit_box_widget" id="change_contact_group_eb" posref="TL TL" x="6" y="-24" child_resize_h="true" w="200" onenter="change_contact_group" max_num_bytes="255" entry_type="text" />
+        <instance template="edit_box_widget" id="change_contact_group_eb" posref="TL TL" x="6" y="-24" child_resize_h="true" w="200" onenter="change_contact_group" max_num_chars="255" entry_type="text" />
         <instance template="button_ok_cancel" posparent="change_contact_group_eb" posref="BR TR" x="0" y="0" onclick_ok="change_contact_group" onclick_ok_param="" onclick_cancel="leave_modal" onclick_cancel_param="" />
     </group>
     <!-- ***************** -->
@@ -300,6 +300,7 @@
             <group id="content" x="0" y="0" h="100" posref="TL TL">
                 <group id="cb" posref="TL TL" sizeref="wh" y="-4" w="0" h="-32">
                     <instance template="chat_box_mainchat" id="around" posref="TL TL" sizeref="wh" y="0" w="0" h="0" />
+                    <ctrl style="text_button_16" id="clear_arround_info" posref="TR TR" active="false" posparent="around" x="-6" y="-9" wmargin="0" color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255" onclick_l="lua" params_l="runCommand('clear', getUICaller().id)" hardtext="clear around" />
                     <instance template="chat_box_mainchat" id="region" posref="TL TL" sizeref="wh" y="0" w="0" h="0" />
                     <instance template="chat_box_mainchat" id="team" posref="TL TL" sizeref="wh" y="0" w="0" h="0" />
                     <instance template="chat_box_mainchat" id="guild" posref="TL TL" sizeref="wh" y="0" w="0" h="0" />
@@ -360,10 +361,13 @@
     <proc id="universe_chat_proc_close">
         <action handler="set" params="dblink=UI:SAVE:ISDETACHED:UNIVERSE_CHAT|value=0" />
     </proc>
-    <!-- When the universe chat is activated, we must display a warning the first time 
+    <!-- When the universe chat is activated, we must display a warning the first time
         Must do it on the variable manipulation, not when the window is shown (because it is always shown/hid at start of game)
-        <link expr="@UI:SAVE:ISDETACHED:UNIVERSE_CHAT" cond="eq(@UI:SAVE:ISDETACHED:UNIVERSE_CHAT,1)" action="set" params="dblink=UI:VARIABLES:UNIVERSE_CHANEL_WARNING_WANTED|value=1" />
--->
+
+  <link expr="@UI:SAVE:ISDETACHED:UNIVERSE_CHAT"
+        cond="eq(@UI:SAVE:ISDETACHED:UNIVERSE_CHAT,1)"
+        action="set"
+        params="dblink=UI:VARIABLES:UNIVERSE_CHANEL_WARNING_WANTED|value=1" /> -->
     <!-- *************** -->
     <!-- * SYSTEM INFO * -->
     <!-- *************** -->
@@ -430,32 +434,35 @@
                 <link expr="eq(@SERVER:GROUP:LEADER_INDEX, #team_mate_index)" target="ttlead:active" />
                 <link expr="eq(@SERVER:GROUP:SUCCESSOR_INDEX, #team_mate_index)" target="ttsucc:active" />
             </group>
-            <!--            
-                <group id="header_opened" x="0" y="0" w="160" child_resize_h="true" child_resize_hmargin="4" posref="TL TL">
-                        <view type="bar3" id="jauges" posref="TR TR" y="0" mini="true" x="-16" color1="%sta_color" value1="UI:VARIABLES:BARS:TEAM:#team_mate_index:STA" range1="UI:CONST:127" color2="%sap_color" value2="UI:VARIABLES:BARS:TEAM:#team_mate_index:SAP" range2="UI:CONST:127" color3="%hp_color" color3_negative="%hp_color_neg" value3="UI:VARIABLES:BARS:TEAM:#team_mate_index:HP" range3="UI:CONST:127" />
+            <!--
+                <group id="header_opened" x="0" y="0" w="160" child_resize_h="true" child_resize_hmargin="4" posref="TL TL" >
+                        <view type="bar3" id="jauges" posref="TR TR" y="0" mini="true" x="-16"
+                                                                color1="%sta_color" value1="UI:VARIABLES:BARS:TEAM:#team_mate_index:STA"        range1="UI:CONST:127"
+                                                                color2="%sap_color"     value2="UI:VARIABLES:BARS:TEAM:#team_mate_index:SAP"            range2="UI:CONST:127"
+                                                                color3="%hp_color" color3_negative="%hp_color_neg" value3="UI:VARIABLES:BARS:TEAM:#team_mate_index:HP"  range3="UI:CONST:127" />
                         <view type="bitmap" id="lead" posparent="jauges" posref="ML MR" x="-4" y="1" texture="w_leader.tga" global_color="false" />
                         <view type="bitmap" id="successor" posparent="jauges" posref="ML MR" x="-4" y="1" texture="w_leader.tga" global_color="false" color="255 255 255 128" active="false"/>
-                        
+
                         <ctrl type="tooltip" id="ttlead" tooltip="uittLead" instant_help="true" posparent="lead" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0" />
                         <ctrl type="tooltip" id="ttsucc" tooltip="uittSuccessor" instant_help="true" posparent="successor" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0" />
-                                                
+
                         <! - chat box - >
                         <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-8" w="0" h="64" min_height="64" max_height="1600"/>
                         <instance template="edit_box_widget" id="ebw" posref="BR TR" y="0" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="contact_entry" backup_father_container_pos="true"/>
-                                                
+
                         <! - links to display lead or successor - >
                         <link expr="eq(@SERVER:GROUP:LEADER_INDEX, #team_mate_index)" target="lead:active"/>
                         <link expr="eq(@SERVER:GROUP:SUCCESSOR_INDEX, #team_mate_index)" target="successor:active"/>
-                        
+
                         <link expr="eq(@SERVER:GROUP:LEADER_INDEX, #team_mate_index)" target="ttlead:active"/>
                         <link expr="eq(@SERVER:GROUP:SUCCESSOR_INDEX, #team_mate_index)" target="ttsucc:active"/>
-                        
-                </group>                                        
+
+                </group>
                 -->
             <!-- link to display the group when the team member is present -->
             <link expr="ne(@SERVER:GROUP:#team_mate_index:NAME, 0)" target="active" />
             <!-- links to display the name of the team mate -->
-            <link expr="depends(@SERVER:GROUP:#team_mate_index:NAME)" action="set_server_id" params="value=@SERVER:GROUP:#team_mate_index:NAME|target=title|remove_title=1" />
+            <link expr="depends(@SERVER:GROUP:#team_mate_index:NAME)" action="set_server_id" params="value=@SERVER:GROUP:#team_mate_index:NAME|target=uc_title|remove_title=1" />
             <!-- links to change the name color if it is the target -->
             <link expr="ifthenelse(eq(@SERVER:GROUP:#team_mate_index:UID,@UI:VARIABLES:TARGET:UID), '255 0 0 255', '255 255 255 255')" target="title_color" />
             <!-- links to Open a Quick Help when a new team member comes. Only if the team_list window is not opeded -->
@@ -480,6 +487,7 @@
                 <view type="bitmap" id="online" posref="MR MR" x="-4" texture="w_online.tga" global_color="false" />
                 <ctrl type="tooltip" id="tt_online" posparent="online" posref="MR MR" x="0" y="0" sizeref="wh" w="0" h="0" tooltip="uittFriendsOnline" tooltip_parent="win" />
                 <ctrl type="button" id="profile_button" button_type="push_button" posref="MR MR" x="-20" tx_normal="profile.tga" tx_pushed="profile.tga" tx_over="profile.tga" global_color_normal="false" global_color_over="false" global_color_pushed="false" onclick_l="open_title_help" params_l="from=contact" tooltip="uittContactInfo" tooltip_parent="win" />
+                <!-- add team invite button -->
                 <ctrl type="button" id="invite_button" button_type="push_button" posref="MR MR" x="-36" tx_normal="team_invite.tga" tx_pushed="team_invite.tga" tx_over="W_button_14_over.tga" global_color_normal="false" global_color_over="false" global_color_pushed="false" onclick_l="lua" params_l="game:teamInvite('#id')" tooltip="uimGcmInvit" tooltip_parent="win" />
                 <ctrl type="button" id="chat_button" button_type="push_button" posref="MR MR" x="-52" tx_normal="contact_chat.tga" tx_pushed="contact_chat.tga" tx_over="W_button_14_over.tga" global_color_normal="false" global_color_over="true" global_color_pushed="false" onclick_l="contact_direct_chat" tooltip="uittTell" tooltip_parent="win" />
                 <view type="bitmap" id="blocked" posref="MR MR" x="-64" texture="w_answer_16_cancel.tga" global_color="false" active="false" />
@@ -489,8 +497,8 @@
     <!-- group header in friend list -->
     <template name="people_list_group_header" keep="true" active="true" movable="false" opened="true" id="system">
         <group type="container" id="#id" w="252" active="#active" movable="#movable" opened="#opened" header_color="UI:SAVE:WIN:COLORS:COM" global_color="false" global_color_over="true">
-            <group id="header_closed" x="0" y="0" h="16" posref="TL TL" />
-            <group id="header_opened" x="0" y="0" h="16" posref="TL TL" />
+            <group id="header_closed" x="0" y="0" h="16" posref="TL TL"></group>
+            <group id="header_opened" x="0" y="0" h="16" posref="TL TL"></group>
         </group>
     </template>
     <!-- when you want to directly chat with a friend -->
@@ -586,21 +594,21 @@
         <action id="leader" name="uimSetTeamLeader" handler="set_team_leader" params="" icon="r2_toolbar_group_small.tga" />
         <action id="successor" name="uimSetSuccesor" handler="set_successor" params="" icon="r2_player_admin.tga" />
         <!--            <action id="emote" name="uimEmotes" hanlder="" params="">
-                        <action id="emote1" name="uimEmote1" handler="emote" params="emote_id=0"/>     
-                        <action id="emote2" name="uimEmote2" handler="emote" params="emote_id=1"/>     
-                        <action id="emote3" name="uimEmote3" handler="emote" params="emote_id=2"/>     
-                        <action id="emote4" name="uimEmote4" handler="emote" params="emote_id=3"/>     
-                        <action id="emote5" name="uimEmote5" handler="emote" params="emote_id=4"/>
-                        <action id="emote6" name="uimEmote6" handler="emote" params="emote_id=5"/>
-                        <action id="emote7" name="uimEmote7" handler="emote" params="emote_id=6"/>
+                        <action id="emote1"  name="uimEmote1" handler="emote" params="emote_id=0"/>
+                        <action id="emote2"  name="uimEmote2" handler="emote" params="emote_id=1"/>
+                        <action id="emote3"  name="uimEmote3" handler="emote" params="emote_id=2"/>
+                        <action id="emote4"  name="uimEmote4" handler="emote" params="emote_id=3"/>
+                        <action id="emote5"  name="uimEmote5" handler="emote" params="emote_id=4"/>
+                        <action id="emote6"  name="uimEmote6" handler="emote" params="emote_id=5"/>
+                        <action id="emote7"  name="uimEmote7" handler="emote" params="emote_id=6"/>
                 </action>-->
         <!--            <action id="commands" name="uimCommands" hanlder="" params="">
-                        <action id="command1" name="uimCommand1" handler="" params=""/>        
-                        <action id="command2" name="uimCommand2" handler="" params=""/>        
-                        <action id="command3" name="uimCommand3" handler="" params=""/>        
-                        <action id="command4" name="uimCommand4" handler="" params=""/>        
-                        <action id="command5" name="uimCommand5" handler="" params=""/>
-                        <action id="command6" name="uimCommand6" handler="" params=""/>                        
+                        <action id="command1"  name="uimCommand1" handler="" params=""/>
+                        <action id="command2"  name="uimCommand2" handler="" params=""/>
+                        <action id="command3"  name="uimCommand3" handler="" params=""/>
+                        <action id="command4"  name="uimCommand4" handler="" params=""/>
+                        <action id="command5"  name="uimCommand5" handler="" params=""/>
+                        <action id="command6"  name="uimCommand6" handler="" params=""/>
                 </action>-->
         <action id="target" name="uimTarget" handler="team_target" params="" icon="ico_aim.tga" />
         <action id="compass" name="uimTeamCompass" handler="set_team_compas" params="compass=ui:interface:compass" icon="lm_user_pushed.tga" />
@@ -630,26 +638,26 @@
         <separator />
     </group>
     <group type="menu" id="friend_list_menu_offline_unblocked" extends="friend_list_menu">
-        <!-- <action id="block" name="uimBlock" handler="block_contact" params=""/> -->
+        <!-- <action id="block"   name="uimBlock"        handler="block_contact" params=""/> -->
     </group>
     <group type="menu" id="friend_list_menu_online_unblocked" extends="friend_list_menu">
         <action id="remove" name="uimTell" handler="menu_tell_contact" params="" />
-        <!-- <action id="block" name="uimBlock" handler="block_contact" params=""/> -->
+        <!-- <action id="block"   name="uimBlock"        handler="block_contact" params=""/> -->
     </group>
     <group type="menu" id="friend_list_menu_online_abroad_unblocked" extends="friend_list_menu">
         <action id="remove" name="uimTell" handler="menu_tell_contact" params="" />
-        <!-- <action id="block" name="uimBlock" handler="block_contact" params=""/> -->
+        <!-- <action id="block"   name="uimBlock"        handler="block_contact" params=""/> -->
     </group>
     <group type="menu" id="friend_list_menu_offline_blocked" extends="friend_list_menu">
-        <!-- <action id="block" name="uimUnBlock" handler="block_contact" params=""/> -->
+        <!-- <action id="block"   name="uimUnBlock"      handler="block_contact" params=""/> -->
     </group>
     <group type="menu" id="friend_list_menu_online_blocked" extends="friend_list_menu">
         <action id="remove" name="uimTell" handler="tell_contact" params="" />
-        <!-- <action id="block" name="uimUnBlock" handler="block_contact" params=""/> -->
+        <!-- <action id="block"   name="uimUnBlock"      handler="block_contact" params=""/> -->
     </group>
     <group type="menu" id="friend_list_menu_online_abroad_blocked" extends="friend_list_menu">
         <action id="remove" name="uimTell" handler="tell_contact" params="" />
-        <!-- <action id="block" name="uimUnBlock" handler="block_contact" params=""/> -->
+        <!-- <action id="block"   name="uimUnBlock"      handler="block_contact" params=""/> -->
     </group>
     <group type="menu" id="ignore_list_menu" extends="base_menu_with_color">
         <action id="remove" name="uimRemove" handler="remove_contact" params="" />
@@ -839,20 +847,20 @@
     <!-- *  SYSTEM INFOS   * -->
     <!-- ******************* -->
     <!--
-<group type="container" id="system_info" x="0" y="0" w="176" posref="TL TL" title="" title_opened="uiSystemInfoTitle"> 
+<group type="container" id="system_info" x="0" y="0" w="176" posref="TL TL" title="" title_opened="uiSystemInfoTitle" >
 
-        <group id="header_closed" x="0" y="0" w="176" h="16" posref="TL TL">
-                <group id="pipo" posref="MR MR" sizeref="w" w="-24" h="16">
+        <group id="header_closed" x="0" y="0" w="176" h="16" posref="TL TL" >
+                <group id="pipo" posref="MR MR"  sizeref="w" w="-24" h="16" >
                         <instance template="chat_box" id="cb" posref="BR BR" sizeref="w" w="12" h="28" min_height="28" max_height="28"/>
                 </group>
                 <view type="bitmap" id="logo" posparent="pipo" posref="TL TR" x="-2" texture="W_user_info.tga" />
         </group>
-        
-        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8">
+
+        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
                 <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-4" w="-8" h="64" min_height="64" max_height="256"/>
         </group>
-        
-        <group id="content" x="0" y="0" w="168" h="0" posref="TL TL">
+
+        <group id="content" x="0" y="0" w="168" h="0" posref="TL TL"  >
         </group>
 
 </group>
@@ -861,17 +869,17 @@
     <!-- * GUILD * -->
     <!-- ********* -->
     <!--
-<group type="container" id="guild" x="" y="" w="176" posref="TR TR" title="uiGuildChat" title_opened="uiGuildChat">
+<group type="container" id="guild" x="" y="" w="176" posref="TR TR" title="uiGuildChat" title_opened="uiGuildChat" >
 
-        <group id="header_closed" x="0" y="0" h="16" posref="TL TL">
+        <group id="header_closed" x="0" y="0" h="16" posref="TL TL" >
         </group>
-        
-        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8">
+
+        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
                 <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-4" w="-8" h="64" min_height="64" max_height="256"/>
                 <instance template="edit_box_widget" id="ebw" posref="BR TR" y="-4" posparent="cb" child_resize_h="true" sizeref="w" w="-12" onenter="chat_box_entry" backup_father_container_pos="true"/>
         </group>
 
-        <group id="content" x="0" y="0" h="0" posref="TL TL">
+        <group id="content" x="0" y="0" h="0" posref="TL TL" >
         </group>
 
 </group>
@@ -880,19 +888,19 @@
     <!-- * TEAM * -->
     <!-- ******** -->
     <!--
-<group type="container" id="team" x="" y="" w="176" posref="TR TR" title="uiTeamChatTitle" title_opened="uiTeamChatTitle">
+<group type="container" id="team" x="" y="" w="176" posref="TR TR" title="uiTeamChatTitle" title_opened="uiTeamChatTitle" >
 
-        <group id="header_closed" x="0" y="0" h="16" posref="TL TL">
+        <group id="header_closed" x="0" y="0" h="16" posref="TL TL" >
                 <view type="bitmap" id="lead" posref="TL TL" x="48" texture="w_leader.tga" global_color="false" />
         </group>
-        
-        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8">
+
+        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
                 <view type="bitmap" id="lead" posref="TL TL" x="48" texture="w_leader.tga" global_color="false" />
                 <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-4" w="-8" h="64" min_height="64" max_height="256"/>
                 <instance template="edit_box_widget" id="ebw" posref="BR TR" y="-4" posparent="cb" child_resize_h="true" sizeref="w" w="-12" onenter="chat_box_entry" backup_father_container_pos="true"/>
         </group>
 
-        <group id="content" x="0" y="0" h="0" posref="TL TL">
+        <group id="content" x="0" y="0" h="0" posref="TL TL" >
         </group>
 
 </group>
@@ -901,17 +909,17 @@
     <!-- * PARTY CHAT * -->
     <!-- ************** -->
     <!--
-<group type="container" id="party" x="" y="" w="176" posref="TR TR" title="PARTY CHAT" title_opened="PARTY CHAT">
+<group type="container" id="party" x="" y="" w="176" posref="TR TR" title="PARTY CHAT" title_opened="PARTY CHAT" >
 
-        <group id="header_closed" x="0" y="0" h="16" posref="TL TL">
+        <group id="header_closed" x="0" y="0" h="16" posref="TL TL" >
         </group>
-        
-        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8">
+
+        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
                 <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-4" w="-8" h="64" min_height="64" max_height="256"/>
                 <instance template="edit_box_widget" id="ebw" posref="BR TR" y="-4" posparent="cb" child_resize_h="true" sizeref="w" w="-12" onenter="chat_box_entry" backup_father_container_pos="true"/>
         </group>
 
-        <group id="content" x="0" y="0" h="0" posref="TL TL">
+        <group id="content" x="0" y="0" h="0" posref="TL TL" >
         </group>
 
 </group>
@@ -920,16 +928,16 @@
     <!-- * AROUND ME * -->
     <!-- ************* -->
     <!--
-<group type="container" id="around" x="" y="" w="176" posref="TR TR" title="uiAroundMeTitle" title_opened="uiAroundMeTitle">
+<group type="container" id="around" x="" y="" w="176" posref="TR TR" title="uiAroundMeTitle" title_opened="uiAroundMeTitle" >
 
-        <group id="header_closed" x="0" y="0" h="16" posref="TL TL">
+        <group id="header_closed" x="0" y="0" h="16" posref="TL TL" >
         </group>
-        
-        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8">
+
+        <group id="header_opened" x="0" y="0" w="176" h="64" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
                 <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-4" w="-8" h="64" min_height="64" max_height="256"/>
         </group>
 
-        <group id="content" x="0" y="0" h="0" posref="TL TL">
+        <group id="content" x="0" y="0" h="0" posref="TL TL" >
         </group>
 
 </group>
@@ -950,15 +958,15 @@
     <!-- * IGNORE LIST * -->
     <!-- *************** -->
     <!--
-<group type="container" id="ignore" x="" y="" w="176" posref="TR TR" title="uiIgnoreList" title_opened="uiIgnoreList">
+<group type="container" id="ignore" x="" y="" w="176" posref="TR TR" title="uiIgnoreList" title_opened="uiIgnoreList" >
 
-        <group id="header_closed" x="0" y="0" h="16" posref="TL TL">
+        <group id="header_closed" x="0" y="0" h="16" posref="TL TL" >
         </group>
-        
-        <group id="header_opened" x="0" y="0" w="176" h="20" posref="TL TL" child_resize_h="true" child_resize_hmargin="8">
+
+        <group id="header_opened" x="0" y="0" w="176" h="20" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
         </group>
 
-        <group id="content" x="0" y="0" h="0" posref="TL TL">
+        <group id="content" x="0" y="0" h="0" posref="TL TL" >
         </group>
 
 </group>
@@ -988,18 +996,20 @@
     <!-- * DEBUG CONSOLE * -->
     <!-- ***************** -->
     <!--
-<group type="container" id="debug_console" w="320" title="uiDebugConsole" global_color="false" open_button="false" force_open_out="true" header_color="UI:SAVE:WIN:COLORS:HELP" title_bar_open="false" min_w="216" min_h="64" max_w="2000" max_h="1600" pop_max_w="2000" pop_max_h="1600" lockable="true" openable="false" opened="true" movable="true" resizer="true" active="true">
-        <group id="header_closed" x="0" y="0" h="12" posref="TL TL">
+<group type="container" id="debug_console" w="320" title="uiDebugConsole" global_color="false" open_button="false" force_open_out="true" header_color="UI:SAVE:WIN:COLORS:HELP"
+ title_bar_open="false" min_w="216" min_h="64" max_w="2000"
+ max_h="1600" pop_max_w="2000" pop_max_h="1600" lockable="true" openable="false" opened="true" movable="true" resizer="true" active="true">
+        <group id="header_closed" x="0" y="0" h="12" posref="TL TL" >
         </group>
 
-        <group id="header_opened" x="0" y="0" w="160" h="13" posref="TL TL" child_resize_h="true" child_resize_hmargin="8">
+        <group id="header_opened" x="0" y="0" w="160" h="13" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
                 <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-8" w="0" h="64" min_height="64" max_height="1600"/>
                 <instance template="edit_box_widget" id="ebw" posref="BR TR" y="0" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="debug_console_entry" backup_father_container_pos="true"/>
         </group>
 
-        <group id="content" x="0" y="0" h="0" posref="TL TL">
+        <group id="content" x="0" y="0" h="0" posref="TL TL" >
         </group>
-</group>        
+</group>
 
 <tree node="debug_console">
 </tree>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/inventory.xml b/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
index f87a01e43..8c3f3af1a 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
@@ -89,30 +89,30 @@
             </group>
             <view type="text" id="armTitle" posref="TL BL" posparent="armors" hardtext="uiArmorTitle" fontsize="10" y="2" shadow="true" />
             <!--
-                <group id="hands" posparent="armors" x="8" y="0" w="86" h="42" posref="TR TL">
+                <group id="hands" posparent="armors" x="8" y="0" w="86" h="42" posref="TR TL" >
 
-                <ctrl type="sheet" id="handr" posref="TR TR" x="0" tx_noitem="hand_right.tga" selection_group="inventory_selection"
-                                                                onclick_l="proc" params_l="inv_left_click_on_slot" tooltip="uittHandR"
-                                                                menu_r="%self_item_modal_menu"
+                <ctrl type="sheet" id="handr" posref="TR TR" x="0" tx_noitem="hand_right.tga" selection_group="inventory_selection" 
+                                                                onclick_l="proc" params_l="inv_left_click_on_slot" tooltip="uittHandR" 
+                                                                menu_r="%self_item_modal_menu" 
                                                                 dragable="true"
                                                                 ondrag="inv_drag" params_drag="from_slot" oncannotdrop="inv_cannot_drop"
                                                                 oncandrop="inv_can_drop" ondrop="inv_drop"
                                                                 item_slot="RIGHT_HAND" value="%hand_r" other_hand_slot="handl" auto_grayed="false" />
-  
-                        <ctrl type="sheet" id="handl" posref="TL TL" x="0" tx_noitem="hand_left.tga" selection_group="inventory_selection"
-                                                                onclick_l="proc" params_l="inv_left_click_on_slot" tooltip="uittHandL"
-                                                                menu_r="%self_item_modal_menu"
+        
+                        <ctrl type="sheet" id="handl" posref="TL TL" x="0" tx_noitem="hand_left.tga" selection_group="inventory_selection" 
+                                                                onclick_l="proc" params_l="inv_left_click_on_slot" tooltip="uittHandL" 
+                                                                menu_r="%self_item_modal_menu" 
                                                                 dragable="true"
                                                                 ondrag="inv_drag" params_drag="from_slot" oncannotdrop="inv_cannot_drop"
                                                                 oncandrop="inv_can_drop" ondrop="inv_drop"
                                                                 item_slot="LEFT_HAND" value="%hand_l" other_hand_slot="handr" auto_grayed="false" />
-  
+        
                         <! - Must update some things when the item equipped change - >
                         <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)" action="phrase_update_from_hand" />
                         <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)" action="phrase_update_from_hand" />
                         <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:ENCHANT)" action="phrase_update_from_hand" />
 
-  </group>
+        </group>
                 <view type="text" id="handTitle" posref="TL BL" posparent="hands" hardtext="uiHandsTitle" fontsize="10" shadow="true" />
 -->
         </group>
@@ -225,6 +225,7 @@
                     <view type="text" id="autopact_vt" posref="BR MR" x="-23" y="10" hardtext="" />
                 </group>
                 <instance template="tinv_nbslots_bulk_weight" id="ibw" x="0" inv_branch="%bag" inv_bulk_max="%bag_bulk_max" />
+                <!-- y="-18" (because of webig buttons) messes filter icon placement (y should be "-16") -->
                 <instance template="tinv_item_list" id="iil" inv_branch_nb="%max_bag_invslot" y="-18" sizeref="wh" h="-16" inv_branch="%bag" inv_type="INV_BAG" />
                 <instance template="argent" id="money" posref="BL BL" x="4" y="2" value="%money" />
             </group>
@@ -260,11 +261,11 @@
     </group>
     <tree node="inventory" />
     <!--
-<anim id="anim_inventory_char_rotate" duration="30" disable_buttons="false" on_finish="proc" on_finish_params="inventory_char_rotate">
-  <track type="linear" target="inventory:content:char3d:char:rotz">
+<anim id="anim_inventory_char_rotate" duration="30"  disable_buttons="false" on_finish="proc" on_finish_params="inventory_char_rotate" >
+        <track type="linear" target="inventory:content:char3d:char:rotz">
                 <key time="0.0" value="0" />
                 <key time="30.0" value="360" />
-  </track>
+        </track>
 </anim>
 -->
     <!-- *********************** -->
@@ -275,7 +276,7 @@
         <action handler="context_help_html" params="inventory" />
     </proc>
     <!-- Make the temp inventory modal parent on faber execution, so the faber can not be done if temp inventory opened 
-  Same For Missions selection or Mission selection validation
+        Same For Missions selection or Mission selection validation
 -->
     <group id="temp_inventory" type="container" posref="MM MM" w="242" h="136" openable="false" opened="true" resizer="true" savable="true" right_button="false" movable="true" pop_min_w="243" pop_min_h="136" pop_max_w="242" pop_max_h="418" win_priority="%win_priority_high" on_active="proc" on_active_params="temp_inventory_activated" on_deactive="proc" on_deactive_params="restore_inventory_state" modal_parent="phrase_faber_execution|bot_chat_missions|bot_chat_accept_mission">
         <group id="header_closed" x="0" y="0" h="12" posref="TL TL"></group>
@@ -683,7 +684,7 @@
     </group>
     <tree node="defense" />
     <!-- ********************************************************************* -->
-    <!-- ** CUSTOM TEXT EDITION AND DISPLAY                                           ** -->
+    <!-- ** CUSTOM TEXT EDITION AND DISPLAY                                      ** -->
     <!-- ********************************************************************* -->
     <!-- :NOTE: ids are groupName+"_suffix", change them with group name -->
     <!-- element/type -->
@@ -712,7 +713,7 @@
         <action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:PHRASE_EDIT_CUSTOM|value=0" />
         <action handler="on_close_edit_custom" />
     </proc>
-    <group type="container" id="edit_custom" w="432" h="400" title="uiItemTextEdition" global_color="false" line_at_bottom="false" movable="true" active="false" opened="true" openable="false" resizer="true" savable="false" eader_color="UI:SAVE:WIN:COLORS:INFOS" on_active="proc" on_active_params="proc_phrase_edit_custom_opened" on_deactive="proc" on_deactive_params="proc_phrase_edit_custom_closed" pop_min_w="432" pop_min_h="128" pop_max_w="800" pop_max_h="600">
+    <group type="container" id="edit_custom" w="432" h="400" title="uiItemTextEdition" global_color="false" line_at_bottom="false" movable="true" active="false" opened="true" openable="false" resizer="true" savable="false" header_color="UI:SAVE:WIN:COLORS:INFOS" on_active="proc" on_active_params="proc_phrase_edit_custom_opened" on_deactive="proc" on_deactive_params="proc_phrase_edit_custom_closed" pop_min_w="432" pop_min_h="128" pop_max_w="800" pop_max_h="600">
         <group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL" />
         <group id="header_opened" x="0" y="0" child_resize_w="true" h="16" posref="TL TL" />
         <group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL">
@@ -721,8 +722,8 @@
             <group id="scroll_text" posparent="crop" posref="TM TM" x="0" y="-4" sizeref="w" child_resize_h="true" child_resize_hmargin="4" w="-4" max_sizeparent="crop" max_sizeref="h" max_h="-4" active="true">
                 <view type="bitmap" id="background" posref="TL TL" sizeref="w" x="0" y="-8" txtwidth="300" txtheight="360" texture="" global_color="false" render_layer="0" />
                 <view type="text" id="display" posref="TL TL" sizeref="w" color="255 255 255 160" x="2" y="-4" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" />
-                <instance template="edit_box_widget_multiline" max_num_chars="1023" max_num_bytes="1023" max_num_return="50" id="edit_large" posref="TL TL" x="4" y="-8" sizeref="w" sizeref_eb="w" child_resize_h="true" w="-8" h="-30" text_x="0" text_y="0" text_ref="TL TL" fontsize="12" multi_line="true" enter_loose_focus="true" enter_recover_focus="false" prompt="" reset_focus_on_hide="true" want_return="true" active="false" render_layer="1" scale="false" />
-                <instance template="edit_box_widget_multiline" max_num_chars="255" max_num_bytes="255" max_num_return="16" id="edit_short" posref="TL TL" x="4" y="-8" sizeref="w" sizeref_eb="w" child_resize_h="true" w="-8" h="-30" text_x="0" text_y="0" text_ref="TL TL" fontsize="12" multi_line="true" enter_loose_focus="true" enter_recover_focus="false" prompt="" reset_focus_on_hide="true" want_return="true" active="false" render_layer="1" scale="false" />
+                <instance template="edit_box_widget_multiline" max_num_chars="1024" max_num_return="50" id="edit_large" posref="TL TL" x="4" y="-8" sizeref="w" sizeref_eb="w" child_resize_h="true" w="-8" h="-30" text_x="0" text_y="0" text_ref="TL TL" fontsize="12" multi_line="true" enter_loose_focus="true" enter_recover_focus="false" prompt="" reset_focus_on_hide="true" want_return="true" active="false" render_layer="1" scale="false" />
+                <instance template="edit_box_widget_multiline" max_num_chars="256" max_num_return="16" id="edit_short" posref="TL TL" x="4" y="-8" sizeref="w" sizeref_eb="w" child_resize_h="true" w="-8" h="-30" text_x="0" text_y="0" text_ref="TL TL" fontsize="12" multi_line="true" enter_loose_focus="true" enter_recover_focus="false" prompt="" reset_focus_on_hide="true" want_return="true" active="false" render_layer="1" scale="false" />
             </group>
             <ctrl style="skin_scroll" id="scroll_bar_theme" align="T" target="scroll_text" posparent="crop" posref="TL TR" x="-8" y="0" />
             <view type="bitmap" id="sep" x="0" y="-2" posparent="crop" posref="BR TR" scale="true" h="2" sizeparent="parent" sizeref="w" texture="W_line_hor.tga" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/keys.xml b/ryzom/client/data/gamedev/interfaces_v3/keys.xml
index 31fcf12a3..3b76c887b 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/keys.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/keys.xml
@@ -1,15 +1,15 @@
-<!--  *************************** 
+<!--  ***************************
   -->
-<!--  Ingame keyboard assignation 
+<!--  Ingame keyboard assignation
   -->
-<!--  *************************** 
+<!--  ***************************
   -->
 <interface_config>
     <!-- keys.xml are loaded after user key defs. don't replace its key/action defs -->
     <define id="key_def_no_replace" value="1" />
     <!-- every action bound here must be kept in the Keys interface, even if the key is unbound -->
     <define id="key_def_force_display" value="1" />
-    <!--  Move 
+    <!--  Move
   -->
     <key name="KeyUP" action="forward" />
     <key name="KeyDOWN" action="backward" />
@@ -26,7 +26,7 @@
     <key name="KeyNEXT" ctrl="1" action="camera_down" />
     <key name="KeyPRIOR" shift="1" action="camera_foreward" />
     <key name="KeyNEXT" shift="1" action="camera_backward" />
-    <!--  View 
+    <!--  View
   -->
     <key name="KeyV" action="toggle_camera" />
     <key name="KeyNUMPAD0" action="rear_view" />
@@ -34,7 +34,7 @@
     <key name="KeyNUMPAD2" action="camera_turn_right" />
     <key name="KeyDECIMAL" action="camera_turn_center" />
     <key name="KeyF5" shift="1" action="toggle_chat" />
-    <!--  Target 
+    <!--  Target
   -->
     <key name="KeyF12" ctrl="0" action="no_target" />
     <key name="KeyF10" ctrl="0" action="self_target" />
@@ -49,7 +49,7 @@
     <key name="KeyF6" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=6" />
     <key name="KeyF7" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=7" />
     <key name="KeyF8" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=8" />
-    <!--  Desktop 
+    <!--  Desktop
   -->
     <key name="KeyF1" action="set_desktop" params="0" />
     <key name="KeyF2" action="set_desktop" params="1" />
@@ -59,7 +59,7 @@
     <key name="KeyF2" ctrl="1" shift="1" action="copy_to_desktop" params="1" />
     <key name="KeyF3" ctrl="1" shift="1" action="copy_to_desktop" params="2" />
     <key name="KeyF4" ctrl="1" shift="1" action="copy_to_desktop" params="3" />
-    <!--  Shortcuts 
+    <!--  Shortcuts
   -->
     <key name="Key1" action="run_shortcut" params="00" />
     <key name="Key2" action="run_shortcut" params="01" />
@@ -134,7 +134,7 @@
     <key name="Key8" menu="1" shift="1" action="talk_message" params="17" />
     <key name="Key9" menu="1" shift="1" action="talk_message" params="18" />
     <key name="Key0" menu="1" shift="1" action="talk_message" params="19" />
-    <!--  Misc 
+    <!--  Misc
   -->
     <key name="KeyF7" shift="0" action="mount_unmount" />
     <key name="KeyF10" shift="1" action="screen_shot" />
@@ -148,17 +148,17 @@
     <key name="KeyR" ctrl="1" action="reply_teller" />
     <key name="KeyD" shift="1" action="toggle_dodge_parry" />
     <!-- <key name="KeyO" shift="0" action="toggle_names" />  -->
-    <!--  Movie recorder 
+    <!--  Movie recorder
   -->
     <key name="KeyF10" ctrl="1" shift="1" menu="1" action="toggle_camera_recorder" />
     <key name="KeyF11" ctrl="1" shift="1" menu="1" action="camera_recorder_playback" />
     <key name="KeyF12" ctrl="1" shift="1" menu="1" action="save_camera_record" />
-    <!--  Camera recorder 
+    <!--  Camera recorder
   -->
     <key name="KeyF3" ctrl="1" action="toggle_movie_recorder" />
     <key name="KeyF4" ctrl="1" shift="1" menu="1" action="replay_movie" />
     <key name="KeyF5" ctrl="1" shift="1" menu="1" action="save_movie" />
-    <!--  Debug actions 
+    <!--  Debug actions
   -->
     <key name="Key1" ctrl="1" menu="1" shift="1" action="command" params="mode 0 3" />
     <key name="Key2" ctrl="1" menu="1" shift="1" action="command" params="mode 0 1" />
@@ -195,7 +195,7 @@
     <key name="Key8" ctrl="1" menu="1" action="toggle_3d_filter" params="7" />
     <key name="Key9" ctrl="1" menu="1" action="toggle_3d_filter" params="8" />
     <key name="Key0" ctrl="1" menu="1" action="toggle_3d_filter" params="9" />
-    <!--  Weather debug 
+    <!--  Weather debug
   -->
     <key name="KeyADD" ctrl="1" menu="1" action="inc_time" />
     <key name="KeySUBTRACT" ctrl="1" menu="1" action="dec_time" />
@@ -217,12 +217,12 @@
     <key name="KeyA" ctrl="1" shift="1" action="debug_ui_prev_element_under_mouse" />
     <key name="KeyQ" ctrl="1" shift="1" action="debug_ui_inspect_element_under_mouse" />
     <key name="KeyW" ctrl="1" shift="1" action="debug_ui_next_element_under_mouse" />
-    <!--  Sound debug 
+    <!--  Sound debug
   -->
     <key name="KeyNUMPAD0" ctrl="1" menu="1" action="draw_sound" />
     <key name="KeyPRIOR" ctrl="1" menu="1" action="inc_camera_height" />
     <key name="KeyNEXT" ctrl="1" menu="1" action="dec_camera_height" />
-    <!--  Text edit 
+    <!--  Text edit
   -->
     <key name="KeyLEFT" shift="1" action="edit_previous_char" context="edit" />
     <key name="KeyLEFT" shift="1" menu="1" action="edit_select_previous_char" context="edit" />
@@ -255,10 +255,10 @@
     <key name="KeyTAB" action="edit_expand_or_cycle_tell" context="edit" />
     <key name="KeyTAB" action="cycle_tell" />
     <key name="KeyBACK" action="edit_back" context="edit" />
-    <!--  Interface 
+    <!--  Interface
   -->
     <key name="KeyESCAPE" shift="1" action="close_help" />
-    <!--  Status 
+    <!--  Status
   -->
     <key name="N/A" action="show_hide" params="player" />
     <key name="N/A" action="show_hide" params="bonus_malus" />
@@ -267,7 +267,7 @@
     <key name="KeyG" action="show_hide" params="guild" />
     <key name="KeyF" shift="1" action="show_hide" params="fame" />
     <key name="KeyE" shift="1" action="show_hide" params="encyclopedia" />
-    <!--  Inventory 
+    <!--  Inventory
   -->
     <key name="KeyI" action="show_hide" params="inventory" />
     <key name="KeyB" action="show_hide" params="phrase_book" />
@@ -279,7 +279,8 @@
     <key name="N/A" action="show_hide" params="compass" />
     <key name="KeyR" action="show_hide" params="radar" />
     <key name="KeyM" action="show_hide" params="map" />
-    <!--  Communication 
+    <key name="KeyM" ctrl="1" action="fullmap" params="" />
+    <!--  Communication
   -->
     <key name="N/A" action="show_hide" params="target" />
     <key name="KeyF" action="show_hide" params="contact_list" />
@@ -296,7 +297,7 @@
     <!--
         <key name="KeyS" shift="1" action="show_hide" params="r2ed_scenario_scores" />
         -->
-    <!--  Options 
+    <!--  Options
   -->
     <key name="KeyK" shift="0" action="show_hide" params="keys" />
     <key name="N/A" action="show_hide" params="macros" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wasd.xml b/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wasd.xml
index ccffaac09..82486aef0 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wasd.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wasd.xml
@@ -1,15 +1,15 @@
-<!--  *************************** 
+<!--  ***************************
   -->
-<!--  Ingame keyboard assignation 
+<!--  Ingame keyboard assignation
   -->
-<!--  *************************** 
+<!--  ***************************
   -->
 <interface_config>
     <!-- keys.xml are loaded after user key defs. don't replace its key/action defs -->
     <define id="key_def_no_replace" value="1" />
     <!-- every action bound here must be kept in the Keys interface, even if the key is unbound -->
     <define id="key_def_force_display" value="1" />
-    <!--  Move 
+    <!--  Move
   -->
     <key name="KeyW" action="forward" />
     <key name="KeyS" action="backward" />
@@ -24,7 +24,7 @@
     <key name="KeyDELETE" action="toggle_run_walk" />
     <key name="KeyPRIOR" ctrl="1" action="camera_up" />
     <key name="KeyNEXT" ctrl="1" action="camera_down" />
-    <!--  View 
+    <!--  View
   -->
     <key name="KeyV" action="toggle_camera" />
     <key name="KeyNUMPAD0" action="rear_view" />
@@ -32,7 +32,7 @@
     <key name="KeyNUMPAD2" action="camera_turn_right" />
     <key name="KeyDECIMAL" action="camera_turn_center" />
     <key name="KeyF5" shift="1" action="toggle_chat" />
-    <!--  Target 
+    <!--  Target
   -->
     <key name="KeyF12" ctrl="0" action="no_target" />
     <key name="KeyF10" ctrl="0" action="self_target" />
@@ -47,7 +47,7 @@
     <key name="KeyF6" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=6" />
     <key name="KeyF7" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=7" />
     <key name="KeyF8" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=8" />
-    <!--  Desktop 
+    <!--  Desktop
   -->
     <key name="KeyF1" action="set_desktop" params="0" />
     <key name="KeyF2" action="set_desktop" params="1" />
@@ -57,7 +57,7 @@
     <key name="KeyF2" ctrl="1" shift="1" action="copy_to_desktop" params="1" />
     <key name="KeyF3" ctrl="1" shift="1" action="copy_to_desktop" params="2" />
     <key name="KeyF4" ctrl="1" shift="1" action="copy_to_desktop" params="3" />
-    <!--  Shortcuts 
+    <!--  Shortcuts
   -->
     <key name="Key1" action="run_shortcut" params="00" />
     <key name="Key2" action="run_shortcut" params="01" />
@@ -112,7 +112,7 @@
     <key name="Key8" menu="1" shift="1" action="talk_message" params="17" />
     <key name="Key9" menu="1" shift="1" action="talk_message" params="18" />
     <key name="Key0" menu="1" shift="1" action="talk_message" params="19" />
-    <!--  Misc 
+    <!--  Misc
   -->
     <key name="KeyF7" shift="0" action="mount_unmount" />
     <key name="KeyF10" shift="1" action="screen_shot" />
@@ -126,17 +126,17 @@
     <key name="KeyR" ctrl="1" action="reply_teller" />
     <key name="KeyD" shift="1" action="toggle_dodge_parry" />
     <!-- <key name="KeyO" shift="0" action="toggle_names" />  -->
-    <!--  Movie recorder 
+    <!--  Movie recorder
   -->
     <key name="KeyF10" ctrl="1" shift="1" menu="1" action="toggle_camera_recorder" />
     <key name="KeyF11" ctrl="1" shift="1" menu="1" action="camera_recorder_playback" />
     <key name="KeyF12" ctrl="1" shift="1" menu="1" action="save_camera_record" />
-    <!--  Camera recorder 
+    <!--  Camera recorder
   -->
     <key name="KeyF3" ctrl="1" action="toggle_movie_recorder" />
     <key name="KeyF4" ctrl="1" shift="1" menu="1" action="replay_movie" />
     <key name="KeyF5" ctrl="1" shift="1" menu="1" action="save_movie" />
-    <!--  Debug actions 
+    <!--  Debug actions
   -->
     <key name="Key1" ctrl="1" menu="1" shift="1" action="command" params="mode 0 3" />
     <key name="Key2" ctrl="1" menu="1" shift="1" action="command" params="mode 0 1" />
@@ -173,7 +173,7 @@
     <key name="Key8" ctrl="1" menu="1" action="toggle_3d_filter" params="7" />
     <key name="Key9" ctrl="1" menu="1" action="toggle_3d_filter" params="8" />
     <key name="Key0" ctrl="1" menu="1" action="toggle_3d_filter" params="9" />
-    <!--  Weather debug 
+    <!--  Weather debug
   -->
     <key name="KeyADD" ctrl="1" menu="1" action="inc_time" />
     <key name="KeySUBTRACT" ctrl="1" menu="1" action="dec_time" />
@@ -195,12 +195,12 @@
     <key name="KeyA" ctrl="1" shift="1" action="debug_ui_prev_element_under_mouse" />
     <key name="KeyQ" ctrl="1" shift="1" action="debug_ui_inspect_element_under_mouse" />
     <key name="KeyW" ctrl="1" shift="1" action="debug_ui_next_element_under_mouse" />
-    <!--  Sound debug 
+    <!--  Sound debug
   -->
     <key name="KeyNUMPAD0" ctrl="1" menu="1" action="draw_sound" />
     <key name="KeyPRIOR" ctrl="1" menu="1" action="inc_camera_height" />
     <key name="KeyNEXT" ctrl="1" menu="1" action="dec_camera_height" />
-    <!--  Text edit 
+    <!--  Text edit
   -->
     <key name="KeyLEFT" shift="1" action="edit_previous_char" context="edit" />
     <key name="KeyLEFT" shift="1" menu="1" action="edit_select_previous_char" context="edit" />
@@ -233,10 +233,10 @@
     <key name="KeyTAB" action="edit_expand_or_cycle_tell" context="edit" />
     <key name="KeyTAB" action="cycle_tell" />
     <key name="KeyBACK" action="edit_back" context="edit" />
-    <!--  Interface 
+    <!--  Interface
   -->
     <key name="KeyESCAPE" shift="1" action="close_help" />
-    <!--  Status 
+    <!--  Status
   -->
     <key name="N/A" action="show_hide" params="player" />
     <key name="N/A" action="show_hide" params="bonus_malus" />
@@ -245,7 +245,7 @@
     <key name="KeyG" action="show_hide" params="guild" />
     <key name="KeyF" shift="1" action="show_hide" params="fame" />
     <key name="KeyE" shift="1" action="show_hide" params="encyclopedia" />
-    <!--  Inventory 
+    <!--  Inventory
   -->
     <key name="KeyI" action="show_hide" params="inventory" />
     <key name="KeyB" action="show_hide" params="phrase_book" />
@@ -256,7 +256,8 @@
     <key name="N/A" action="show_hide" params="compass" />
     <key name="KeyR" action="show_hide" params="radar" />
     <key name="KeyM" action="show_hide" params="map" />
-    <!--  Communication 
+    <key name="KeyM" ctrl="1" action="fullmap" params="" />
+    <!--  Communication
   -->
     <key name="N/A" action="show_hide" params="target" />
     <key name="KeyF" action="show_hide" params="contact_list" />
@@ -272,7 +273,7 @@
     <!--
         <key name="KeyS" shift="1" action="show_hide" params="r2ed_scenario_scores" />
         -->
-    <!--  Options 
+    <!--  Options
   -->
     <key name="N/A" action="show_hide" params="keys" />
     <key name="N/A" action="show_hide" params="macros" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wow_alike.xml b/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wow_alike.xml
index e75b43c89..576c7b72c 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wow_alike.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wow_alike.xml
@@ -100,6 +100,7 @@
     <key name="KeyL" shift="1" action="toggle_light" />
     <key name="KeyL" ctrl="1" menu="1" action="dec_hour" />
     <key name="KeyM" action="show_hide" params="map" />
+    <key name="KeyM" ctrl="1" action="fullmap" params="" />
     <key name="KeyM" shift="1" action="show_hide" params="mailbox" />
     <key name="KeyM" ctrl="1" menu="1" action="weather_stats" />
     <key name="KeyN" shift="1" action="show_hide" params="connection" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/keys_bi.zqsd.xml b/ryzom/client/data/gamedev/interfaces_v3/keys_bi.zqsd.xml
index a15a9f770..4e853d3e8 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/keys_bi.zqsd.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/keys_bi.zqsd.xml
@@ -1,15 +1,15 @@
-<!--  *************************** 
+<!--  ***************************
   -->
-<!--  Ingame keyboard assignation 
+<!--  Ingame keyboard assignation
   -->
-<!--  *************************** 
+<!--  ***************************
   -->
 <interface_config>
     <!-- keys.xml are loaded after user key defs. don't replace its key/action defs -->
     <define id="key_def_no_replace" value="1" />
     <!-- every action bound here must be kept in the Keys interface, even if the key is unbound -->
     <define id="key_def_force_display" value="1" />
-    <!--  Move 
+    <!--  Move
   -->
     <key name="KeyZ" action="forward" />
     <key name="KeyS" action="backward" />
@@ -24,7 +24,7 @@
     <key name="KeyDELETE" action="toggle_run_walk" />
     <key name="KeyPRIOR" ctrl="1" action="camera_up" />
     <key name="KeyNEXT" ctrl="1" action="camera_down" />
-    <!--  View 
+    <!--  View
   -->
     <key name="KeyV" action="toggle_camera" />
     <key name="KeyNUMPAD0" action="rear_view" />
@@ -32,7 +32,7 @@
     <key name="KeyNUMPAD2" action="camera_turn_right" />
     <key name="KeyDECIMAL" action="camera_turn_center" />
     <key name="KeyF5" shift="1" action="toggle_chat" />
-    <!--  Target 
+    <!--  Target
   -->
     <key name="KeyF12" ctrl="0" action="no_target" />
     <key name="KeyF10" ctrl="0" action="self_target" />
@@ -47,7 +47,7 @@
     <key name="KeyF6" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=6" />
     <key name="KeyF7" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=7" />
     <key name="KeyF8" ctrl="1" action="target_teammate_shortcut" params="indexInTeam=8" />
-    <!--  Desktop 
+    <!--  Desktop
   -->
     <key name="KeyF1" action="set_desktop" params="0" />
     <key name="KeyF2" action="set_desktop" params="1" />
@@ -57,7 +57,7 @@
     <key name="KeyF2" ctrl="1" shift="1" action="copy_to_desktop" params="1" />
     <key name="KeyF3" ctrl="1" shift="1" action="copy_to_desktop" params="2" />
     <key name="KeyF4" ctrl="1" shift="1" action="copy_to_desktop" params="3" />
-    <!--  Shortcuts 
+    <!--  Shortcuts
   -->
     <key name="Key1" action="run_shortcut" params="00" />
     <key name="Key2" action="run_shortcut" params="01" />
@@ -112,7 +112,7 @@
     <key name="Key8" menu="1" shift="1" action="talk_message" params="17" />
     <key name="Key9" menu="1" shift="1" action="talk_message" params="18" />
     <key name="Key0" menu="1" shift="1" action="talk_message" params="19" />
-    <!--  Misc 
+    <!--  Misc
   -->
     <key name="KeyF7" shift="0" action="mount_unmount" />
     <key name="KeyF10" shift="1" action="screen_shot" />
@@ -126,17 +126,17 @@
     <key name="KeyR" ctrl="1" action="reply_teller" />
     <key name="KeyD" shift="1" action="toggle_dodge_parry" />
     <!-- <key name="KeyO" shift="0" action="toggle_names" />  -->
-    <!--  Movie recorder 
+    <!--  Movie recorder
   -->
     <key name="KeyF10" ctrl="1" shift="1" menu="1" action="toggle_camera_recorder" />
     <key name="KeyF11" ctrl="1" shift="1" menu="1" action="camera_recorder_playback" />
     <key name="KeyF12" ctrl="1" shift="1" menu="1" action="save_camera_record" />
-    <!--  Camera recorder 
+    <!--  Camera recorder
   -->
     <key name="KeyF3" ctrl="1" action="toggle_movie_recorder" />
     <key name="KeyF4" ctrl="1" shift="1" menu="1" action="replay_movie" />
     <key name="KeyF5" ctrl="1" shift="1" menu="1" action="save_movie" />
-    <!--  Debug actions 
+    <!--  Debug actions
   -->
     <key name="Key1" ctrl="1" menu="1" shift="1" action="command" params="mode 0 3" />
     <key name="Key2" ctrl="1" menu="1" shift="1" action="command" params="mode 0 1" />
@@ -173,7 +173,7 @@
     <key name="Key8" ctrl="1" menu="1" action="toggle_3d_filter" params="7" />
     <key name="Key9" ctrl="1" menu="1" action="toggle_3d_filter" params="8" />
     <key name="Key0" ctrl="1" menu="1" action="toggle_3d_filter" params="9" />
-    <!--  Weather debug 
+    <!--  Weather debug
   -->
     <key name="KeyADD" ctrl="1" menu="1" action="inc_time" />
     <key name="KeySUBTRACT" ctrl="1" menu="1" action="dec_time" />
@@ -195,12 +195,12 @@
     <key name="KeyA" ctrl="1" shift="1" action="debug_ui_prev_element_under_mouse" />
     <key name="KeyQ" ctrl="1" shift="1" action="debug_ui_inspect_element_under_mouse" />
     <key name="KeyW" ctrl="1" shift="1" action="debug_ui_next_element_under_mouse" />
-    <!--  Sound debug 
+    <!--  Sound debug
   -->
     <key name="KeyNUMPAD0" ctrl="1" menu="1" action="draw_sound" />
     <key name="KeyPRIOR" ctrl="1" menu="1" action="inc_camera_height" />
     <key name="KeyNEXT" ctrl="1" menu="1" action="dec_camera_height" />
-    <!--  Text edit 
+    <!--  Text edit
   -->
     <key name="KeyLEFT" shift="1" action="edit_previous_char" context="edit" />
     <key name="KeyLEFT" shift="1" menu="1" action="edit_select_previous_char" context="edit" />
@@ -233,10 +233,10 @@
     <key name="KeyTAB" action="edit_expand_or_cycle_tell" context="edit" />
     <key name="KeyTAB" action="cycle_tell" />
     <key name="KeyBACK" action="edit_back" context="edit" />
-    <!--  Interface 
+    <!--  Interface
   -->
     <key name="KeyESCAPE" shift="1" action="close_help" />
-    <!--  Status 
+    <!--  Status
   -->
     <key name="N/A" action="show_hide" params="player" />
     <key name="N/A" action="show_hide" params="bonus_malus" />
@@ -245,7 +245,7 @@
     <key name="KeyG" action="show_hide" params="guild" />
     <key name="KeyF" shift="1" action="show_hide" params="fame" />
     <key name="KeyE" shift="1" action="show_hide" params="encyclopedia" />
-    <!--  Inventory 
+    <!--  Inventory
   -->
     <key name="KeyI" action="show_hide" params="inventory" />
     <key name="KeyB" action="show_hide" params="phrase_book" />
@@ -256,7 +256,8 @@
     <key name="N/A" action="show_hide" params="compass" />
     <key name="KeyR" action="show_hide" params="radar" />
     <key name="KeyM" action="show_hide" params="map" />
-    <!--  Communication 
+    <key name="KeyM" ctrl="1" action="fullmap" params="" />
+    <!--  Communication
   -->
     <key name="N/A" action="show_hide" params="target" />
     <key name="KeyF" action="show_hide" params="contact_list" />
@@ -272,7 +273,7 @@
     <!--
         <key name="KeyS" shift="1" action="show_hide" params="r2ed_scenario_scores" />
         -->
-    <!--  Options 
+    <!--  Options
   -->
     <key name="N/A" action="show_hide" params="keys" />
     <key name="N/A" action="show_hide" params="macros" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/local_database.xml b/ryzom/client/data/gamedev/interfaces_v3/local_database.xml
index 580629829..7d5dc1cba 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/local_database.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/local_database.xml
@@ -162,6 +162,7 @@
                 <leaf name="RM_CLASS_TYPE" type="I3" />
                 <leaf name="RM_FABER_STAT_TYPE" type="I5" />
                 <leaf name="PREREQUISIT_VALID" type="I1" />
+                <leaf name="RESALE_FLAG" type="I2" />
             </branch>
         </branch>
         <leaf name="MONEY" type="I64" />
@@ -179,7 +180,8 @@
         <leaf name="ACCEPTED" type="I1" />
         <leaf name="MONEY" type="I64" />
         <branch name="GIVE">
-            <branch name="" count="8">
+            <branch name="" count="10">
+                <!-- Change in database.xml, player_trade.lua and NbExchangeSlots on server-->
                 <!-- Common Item Data -->
                 <leaf name="SHEET" type="I32" />
                 <leaf name="QUALITY" type="I10" />
@@ -187,7 +189,7 @@
                 <leaf name="CREATE_TIME" type="I32" />
                 <leaf name="SERIAL" type="I32" />
                 <leaf name="USER_COLOR" type="I3" />
-                <!-- <leaf name="LOCKED" type="I10"/> No longer needed -->
+                <!-- <leaf name="LOCKED"                        type="I10"/> No longer needed -->
                 <leaf name="WEIGHT" type="I16" />
                 <!-- weight. see DB_WEIGHT_SCALE-->
                 <leaf name="NAMEID" type="I32" />
@@ -200,7 +202,8 @@
             </branch>
         </branch>
         <branch name="RECEIVE">
-            <branch name="" count="8">
+            <branch name="" count="10">
+                <!-- Change in database.xml, player_trade.lua and NbExchangeSlots on server-->
                 <!-- Common Item Data -->
                 <leaf name="SHEET" type="I32" />
                 <leaf name="QUALITY" type="I10" />
@@ -208,7 +211,7 @@
                 <leaf name="CREATE_TIME" type="I32" />
                 <leaf name="SERIAL" type="I32" />
                 <leaf name="USER_COLOR" type="I3" />
-                <!-- <leaf name="LOCKED" type="I10"/> No longer needed -->
+                <!-- <leaf name="LOCKED"                        type="I10"/> No longer needed -->
                 <leaf name="WEIGHT" type="I16" />
                 <!-- weight. see DB_WEIGHT_SCALE-->
                 <leaf name="NAMEID" type="I32" />
@@ -268,22 +271,22 @@
     </branch>
     <!-- NB this is not a copy of the server db, but the concatenation of all items pages -->
     <!--
-          <branch name="ITEMS_FOR_MISSIONS">
-                    <branch name="" count="512">
-                                -->
-    <!--<leaf name="SHEET" type="I32"/>
-                                <leaf name="QUALITY" type="I16"/>
-                                <leaf name="WEIGHT" type="I16"/>
-                                <leaf name="NAMEID" type="I32"/>
-                                <leaf name="INFO_VERSION" type="I8"/>
-                                -->
+        <branch name="ITEMS_FOR_MISSIONS">
+                <branch name="" count="512">
+                        -->
+    <!--<leaf name="SHEET"                  type="I32"/>
+                        <leaf name="QUALITY"            type="I16"/>
+                        <leaf name="WEIGHT"                     type="I16"/>
+                        <leaf name="NAMEID"                     type="I32"/>
+                        <leaf name="INFO_VERSION"       type="I8"/>
+                        -->
     <!-- the same than for TRADING:x:SLOT_type -->
     <!--
-                                <leaf name="SLOT_TYPE" type="I2"/>
-                                <leaf name="LOGIC_TEXT_ID" type="I32"/>
-                                <leaf name="DESC_TEXT_ID" type="I32"/>
-                    </branch>
-          </branch>-->
+                        <leaf name="SLOT_TYPE"                  type="I2"/>
+                        <leaf name="LOGIC_TEXT_ID"      type="I32"/>
+                        <leaf name="DESC_TEXT_ID"      type="I32"/>
+                </branch>
+        </branch>-->
     <!-- NB this is not a copy of the server db, but the concatenation of all mission -->
     <branch name="CHOOSE_MISSIONS">
         <branch name="" count="512">
diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_config.xml b/ryzom/client/data/gamedev/interfaces_v3/login_config.xml
index a2eaa2fb2..d9fc5ad9b 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/login_config.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/login_config.xml
@@ -428,6 +428,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
         <param name="ctrl_sheet_gray_color" value="255 255 255 100" />
         <param name="ctrl_sheet_redify_color" value="255 100 100 100" />
         <param name="ctrl_text_redify_color" value="255 32 32 160" />
+        <!--    <param name="font"
+           value="basic.ttf" /> -->
         <param name="font" value="ryzom.ttf" />
         <param name="monospace_font" value="ryzom_monospace.ttf" />
         <param name="add_coef_font" value="3" />
@@ -486,12 +488,12 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <sheet_selection name="teleport_selection" texture="item_selection.tga" color="255 255 255 255" global_color="true" />
     <sheet_selection name="mission_selection" texture="item_selection.tga" color="255 255 255 255" global_color="true" />
     <!-- ****************************** -->
-    <!-- *     CODE FILTERS     * -->
+    <!-- *     CODE FILTERS           * -->
     <!-- ****************************** -->
     <!-- dummy for sheets not linked -->
     <variable entry="UI:EMPTY:SHEET" type="sint64" value="0" />
     <!-- ****************************** -->
-    <!-- *        MISC          * -->
+    <!-- *             MISC           * -->
     <!-- ****************************** -->
     <!-- set to true if the current header that called a menu was a popup container -->
     <variable entry="UI:VARIABLES:GC_POPUP" type="sint64" value="0" />
@@ -520,7 +522,7 @@ This MUST follow the Enum MISSION_DESC::TIconId
     <variable entry="UI:SAVE:NIGHT_COLOR" type="rgba" value="255 255 255 255" />
     <variable entry="UI:VARIABLES:FPS" type="sint64" value="30" />
     <!-- ***************************** -->
-    <!-- *  STRING CASE OPTION      * -->
+    <!-- *  STRING CASE OPTION       * -->
     <!-- ***************************** -->
     <define id="case_normal" value="0" />
     <define id="case_lower" value="1" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_main.xml b/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
index 71d493084..3590d364d 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
@@ -19,9 +19,6 @@
             <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-1" />
             <instance template="log_box" id="window" y="-8" posref="MM MM" w="1024" h="768" color="0 0 0 0" />
             <!--
-    <view type="bitmap" posref="MM MM" id="log" texture="launcher_log.tga" global_color="false" render_layer="-1" />
-    -->
-            <!--
     <view type="bitmap" id="jena" posparent="window" posref="MR MR" x="-64" texture="log_jena.tga" global_color="false" render_layer="-1" />
     -->
             <!-- Login Edit_Boxes -->
@@ -29,32 +26,7 @@
             <view type="text" id="txt_pas" posparent="txt_log" posref="TM TM" hardtext="uiPassword" fontsize="10" y="-48" color="255 255 255 255" />
             <instance template="edit_box_log" id="eb_login" posparent="txt_log" posref="BM TM" w="240" h="26" fontsize="12" x="0" y="-4" text_ref="BM BM" text_y="0" reset_focus_on_hide="false" max_historic="0" onenter="set_keyboard_focus" params="target=ui:login:checkpass:content:submit_gr:eb_password:eb|select_all=false" prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="20" color="135 243 28 255" />
             <instance template="edit_box_log" id="eb_password" posparent="txt_pas" posref="BM TM" w="240" h="26" fontsize="12" x="0" y="-4" text_ref="BM BM" text_y="0" reset_focus_on_hide="false" max_historic="0" entry_type="password" onenter="on_login" params="" prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="60" color="135 243 28 255" />
-            <!--
-    <view type="text" id="tit_login" posparent="log" posref="TL BL" hardtext="uiLogin" fontsize="24" x="62" y="-166" color="208 212 182 255" />
-
-    <instance template="edit_box_widget_2" id="eb_login" posparent="log" posref="TM BM" w="292" h="48" fontsize="26" x="-4" y="-229"
-    text_ref="BM BM" text_y="0"
-    reset_focus_on_hide="false"  max_historic="0"
-    onenter="set_keyboard_focus" params="target=ui:login:checkpass:content:submit_gr:eb_password:eb|select_all=false"
-    prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="12" color="135 243 28 255" />
-
-    <view type="text" id="tit_password" posref="TL BL" posparent="log" hardtext="uiPassword" fontsize="24" x="62" y="-293" color="208 212 182 255" />
-
-    <instance template="edit_box_widget_2" id="eb_password" posparent="log" posref="TM BM" w="292" h="48"  fontsize="26" x="0" y="-356" 
-    text_ref="BM BM" text_y="0"
-    reset_focus_on_hide="false"  max_historic="0" entry_type="password"
-    onenter="on_login" params=""
-    prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="20" color="135 243 28 255" />
-    -->
             <ctrl style="log_std_but" id="but_log" posparent="eb_password" posref="TM TM" y="-32" onclick_l="on_login" hardtext="uiOnConnect" />
-            <!--
-    <ctrl type="button" button_type="push_button" id="but_log" posref="BR BR" x="-304" y="157"
-                                                                tx_normal="log_over.tga" tx_over="log_over.tga" tx_pushed="log_over.tga"
-                                                                color="255 255 255 0" col_over="255 255 255 255" col_pushed="255 255 255 0"
-                                                                onclick_l="on_login" render_layer="-1" />
-                                                                
-    <view type="text" id="txt_log" posparent="but_log" posref="MM MM" hardtext="uiOnLogin" shadow="true" fontsize="16" y="0" color="208 212 182 255" />
-    -->
             <!-- Boxes Web Shortcuts
     <instance template="server_box" id="web_win" posparent="eb_login" posref="BL TL" w="568" h="202" y="-24" /> -->
             <!-- Create Account -->
@@ -94,12 +66,6 @@
             <!--    <ctrl style="log_std_but" id="but_game_configuration" posparent="lod_win" posref="TR TL" x="26"    onclick_l="on_game_configuration" hardtext="uiGameConfiguration" /> -->
             <!-- EXIT BUTTON -->
             <ctrl style="log_button" id="but_exit" posparent="windows" posref="BR BR" y="6" onclick_l="login_quit" hardtext="uiExitLogin" />
-            <!--
-    <ctrl type="button" button_type="push_button" id="but_quit" posref="TR TR" x="-30" y="-30"
-                                                                tx_normal="quit_over.tga" tx_over="quit_over.tga" tx_pushed="quit_over.tga"
-                                                                color="255 255 255 0" col_over="255 255 255 255" col_pushed="255 255 255 0"
-                                                                onclick_l="login_quit" />
-    -->
             <!-- Textes -->
             <view type="text" id="title_res" posparent="res_win" posref="TL BL" y="2" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiLOGResolution" />
             <view type="text" id="title_lod" posparent="lod_win" posref="TL BL" y="2" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiLOGLod" />
@@ -433,7 +399,7 @@
 -->
     <!-- BACKGROUND -->
     <!--
-    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
 
         <instance template="html_text_button" id="back_to_login" text="BACK TO LOGIN" posparent="parent" posref="TL TL" y="-15"
diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
index 36bc0fb8a..0cc846cbf 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
@@ -51,7 +51,7 @@
         <view type="bitmap" id="r" texture="log_mod_r.tga" posref="MR MR" scale="true" sizeref="h" h="-16" w="8" render_layer="-1" />
     </group>
 </template>
-<template name="edit_box_log" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" multi_line="false" x="0" y="0" w="0" h="0" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" on_focus="" on_focus_params="" enter_loose_focus="true" prompt="&gt;" enter_recover_focus="true" max_num_chars="255" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="0" fontsize="10" shadow="true" shadow_x="1" shadow_y="1" shadow_color="0 0 0 255" shadow_outline="false" backup_father_container_pos="false" want_return="false" color="255 255 255 255">
+<template name="edit_box_log" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" multi_line="false" x="0" y="0" w="0" h="0" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" on_focus="" on_focus_params="" enter_loose_focus="true" prompt="&gt;" enter_recover_focus="true" max_num_chars="256" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="0" fontsize="10" shadow="true" shadow_x="1" shadow_y="1" shadow_color="0 0 0 255" shadow_outline="false" backup_father_container_pos="false" want_return="false" color="255 255 255 255">
     <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" w="#w" h="#h">
         <!-- frame -->
         <view type="bitmap" id="bg" posref="MM MM" scale="true" sizeref="hw" w="-16" h="-16" texture="log_eb_m.tga" />
@@ -197,7 +197,7 @@
 <!-- ********************* -->
 <!-- *  EDIT BOX WIDGET  * -->
 <!-- ********************* -->
-<template name="edit_box_widget" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" enter_loose_focus="true" prompt="&gt;" enter_recover_focus="true" max_num_chars="255" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="40" fontsize="10" shadow="true" shadow_x="1" shadow_y="1" shadow_color="0 0 0 255" shadow_outline="false" backup_father_container_pos="false" want_return="false" color="255 255 255 255" render_layer="0" sizeref_eb="w">
+<template name="edit_box_widget" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" enter_loose_focus="true" prompt="&gt;" enter_recover_focus="true" max_num_chars="256" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="40" fontsize="10" shadow="true" shadow_x="1" shadow_y="1" shadow_color="0 0 0 255" shadow_outline="false" backup_father_container_pos="false" want_return="false" color="255 255 255 255" render_layer="0" sizeref_eb="w">
     <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="#child_resize_h" sizeref="#sizeref" w="#w" h="#h" render_layer="#render_layer">
         <group type="edit_box" sizeref="#sizeref_eb" w="-16" id="eb" posref="TL TL" x="8" y="-8" child_resize_h="#child_resize_h" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" max_num_chars="#max_num_chars" prompt="#prompt" enter_loose_focus="#enter_loose_focus" enter_recover_focus="#enter_recover_focus" entry_type="#entry_type" reset_focus_on_hide="#reset_focus_on_hide" menu_r="#menu_r" max_historic="#max_historic" want_return="#want_return" backup_father_container_pos="#backup_father_container_pos" render_layer="#render_layer">
             <view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="log_eb_m.tga" inherit_gc_alpha="false" render_layer="#render_layer" />
@@ -215,7 +215,7 @@
     </group>
 </template>
 <!-- alternate look for edit box -->
-<template name="edit_box_widget_2" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" enter_loose_focus="true" prompt="&gt;" enter_recover_focus="true" max_num_chars="255" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="40" fontsize="10" shadow="true" shadow_x="1" shadow_y="1" shadow_color="0 0 0 255" shadow_outline="false" backup_father_container_pos="false" want_return="false" color="255 255 255 255">
+<template name="edit_box_widget_2" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" enter_loose_focus="true" prompt="&gt;" enter_recover_focus="true" max_num_chars="256" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="40" fontsize="10" shadow="true" shadow_x="1" shadow_y="1" shadow_color="0 0 0 255" shadow_outline="false" backup_father_container_pos="false" want_return="false" color="255 255 255 255">
     <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="#child_resize_h" sizeref="#sizeref" w="#w" h="#h">
         <group type="edit_box" sizeref="w" w="-8" id="eb" posref="TL TL" x="4" y="-4" child_resize_h="true" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" max_num_chars="#max_num_chars" prompt="#prompt" enter_loose_focus="#enter_loose_focus" enter_recover_focus="#enter_recover_focus" entry_type="#entry_type" reset_focus_on_hide="#reset_focus_on_hide" menu_r="#menu_r" max_historic="#max_historic" want_return="#want_return" backup_father_container_pos="#backup_father_container_pos">
             <view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="blank.tga" color="255 255 255 0" />
@@ -439,7 +439,7 @@
 <variable entry="UI:glob_var:help:$i:QUALITY" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
 <variable entry="UI:glob_var:help:$i:QUANTITY" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
 <variable entry="UI:glob_var:help:$i:SLOT_TYPE" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
-<variable entry="UI:glob_var:help:$i:USER_COLOR" type="sint32" value="1" size="%MAX_HELP_WINDOW" />
+<variable entry="UI:glob_var:help:$i:USER_COLOR" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
 <variable entry="UI:glob_var:help:$i:ENCHANT" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
 <variable entry="UI:glob_var:help:$i:RM_CLASS_TYPE" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
 <variable entry="UI:glob_var:help:$i:RM_FABER_STAT_TYPE" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/map.lua b/ryzom/client/data/gamedev/interfaces_v3/map.lua
index 7542ee070..659af6447 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/map.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/map.lua
@@ -115,6 +115,32 @@ function game:onLoadMap(map)
 
 end
 
+function game:openFullMap()
+	local ui = getUI("ui:interface:map")
+	if ui.active == false then
+		ui.active = true
+	end
+
+	if game.saveMapFull then
+		game.saveMapFull = false
+		ui.x = game.saveMapX
+		ui.y = game.saveMapY
+		ui.w = game.saveMapW
+		ui.h = game.saveMapH
+	else
+		game.saveMapFull = true
+		game.saveMapX = ui.x
+		game.saveMapY = ui.y
+		game.saveMapW = ui.w
+		game.saveMapH = ui.h
+		ui.x = 0
+		ui.y = 0
+		ui.w = getUI("ui:interface").w
+		ui.h = getUI("ui:interface").h
+		setTopWindow(ui)
+	end
+end
+
 
 -- register map overrride
 -- game:setAltMap("fyros_map.tga", "fyros_map_sp.tga")
diff --git a/ryzom/client/data/gamedev/interfaces_v3/map.xml b/ryzom/client/data/gamedev/interfaces_v3/map.xml
index 4963d2ff8..332107cc6 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/map.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/map.xml
@@ -260,8 +260,8 @@
     <link expr="@UI:VARIABLES:OPEN_RESPAWN" target="ui:interface:respawn_map:active" />
     <!-- Set the Open Flag when the delay has expired -->
     <link expr="and(@UI:VARIABLES:OPEN_RESPAWN_AT_TIME, le(@UI:VARIABLES:OPEN_RESPAWN_AT_TIME, @UI:VARIABLES:CURRENT_TIME))" target="@UI:VARIABLES:OPEN_RESPAWN" />
-    <!-- 
-        Verify player mode. because at init, mode == 0, => the window won't be opened by default 
+    <!--
+        Verify player mode. because at init, mode == 0, => the window won't be opened by default
         If Dead, then start The Timing counter, else reset.
         NB: must not test player Life Percent, because inc each time => counter started when the user is in "coma mode"
 -->
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
index 605a5be18..43727200a 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
@@ -353,7 +353,7 @@ end
 --	local text = self:getProgressGroup():find("text")
 --	local ellipsisTxt = self:getProgressGroup():find("ellipsis")
 --	text.color = color
---	text.text = ucstr
+--	text.uc_hardtext = ucstr
 --	if ellipsis then
 --		ellipsisTxt.hardtext = ellipsis
 --	else
@@ -378,7 +378,7 @@ end
 --	local progressDate = nltime.getLocalTime() / 500
 --	local colValue = math.floor(230 + 24 * math.sin(progressDate))
 --	local color = string.format("%d %d 	%d %d", colValue, colValue, colValue, 255)
---	self:setProgressText(concatString(i18n.get("uiBGD_Progress"), progressPercentText), color, progress, progressSymbol[progressPostfix + 1])
+--	self:setProgressText(concatUCString(i18n.get("uiBGD_Progress"), ucstring(progressPercentText)), color, progress, progressSymbol[progressPostfix + 1])
 --end
 --
 --function outgame:setPatchSuccess()
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
index 4f91fc70a..9dd03b8c4 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
@@ -313,10 +313,6 @@
         <action handler="set" params="dblink=UI:TEMP:PANOPLYCOLOR|value=add(@UI:TEMP:PANOPLYCOLOR,1)" />
         <action handler="proc" params="proc_change_armor_color" />
     </proc>
-    <proc id="anim_perso_armor">
-        <action handler="set" params="dblink=UI:TEMP:PANOPLY|value=add(@UI:TEMP:PANOPLY,1)" />
-        <action handler="proc" params="proc_change_armor" />
-    </proc>
     <!-- Test & Loop Cam Rotate -->
     <proc id="CP_cam_rotate">
         <action handler="anim_start" cond="eq(@UI:TEMP:ANIM,1)" params="anim=anim_CP_cam_rotate" />
@@ -753,11 +749,10 @@
         <action handler="set" params="target_property=ui:outgame:appear:3d_menu_5:char1:anim|value=4" />
         <action handler="anim_start" params="anim=anim_refresh" />
         <!-- Music playing -->
-        <!-- Play character creation music -->
-        <action handler="play_music_outgame" cond="eq(@UI:TEMP:CHAR3D:PEOPLE,0)" params="name=character creation fyros.ogg|async=1" />
-        <action handler="play_music_outgame" cond="eq(@UI:TEMP:CHAR3D:PEOPLE,1)" params="name=character creation matis.ogg|async=1" />
-        <action handler="play_music_outgame" cond="eq(@UI:TEMP:CHAR3D:PEOPLE,2)" params="name=character creation trykers.ogg|async=1" />
-        <action handler="play_music_outgame" cond="eq(@UI:TEMP:CHAR3D:PEOPLE,3)" params="name=character creation zorai.ogg|async=1" />
+        <action handler="play_music_outgame" cond="eq(@UI:TEMP:CHAR3D:PEOPLE,0)" params="name=Character Creation Fyros.ogg|async=1" />
+        <action handler="play_music_outgame" cond="eq(@UI:TEMP:CHAR3D:PEOPLE,1)" params="name=Character Creation Matis.ogg|async=1" />
+        <action handler="play_music_outgame" cond="eq(@UI:TEMP:CHAR3D:PEOPLE,2)" params="name=Character Creation Trykers.ogg|async=1" />
+        <action handler="play_music_outgame" cond="eq(@UI:TEMP:CHAR3D:PEOPLE,3)" params="name=Character Creation Zorai.ogg|async=1" />
     </proc>
     <!-- SELECT SEX -->
     <proc id="proc_select_sex">
@@ -1047,7 +1042,7 @@
     <proc id="proc_appear_name_enter">
         <action handler="reset_keyboard_focus" />
         <action handler="play_sound" params="name=summary_enter_name" />
-        <action handler="ask_valid_name" params="target=ui:outgame:appear_name:eb:input_string|dblink=UI:TEMP:NAME_VALID" />
+        <action handler="ask_valid_name" params="target=ui:outgame:appear_name:eb:uc_input_string|dblink=UI:TEMP:NAME_VALID" />
     </proc>
     <proc id="proc_appear_name_cancel">
         <action handler="leave_modal" />
@@ -1587,12 +1582,6 @@
                                 onover="play_sound" params_over="name=specie_but_over"
                                 onclick_l="proc" params_l="anim_perso_color"/>
         -->
-        <!--
-        <ctrl style="valid_txt_button" id="panoply_armor" posparent="play_anim" posref="TL TR" x="8" y="0"
-                                 hardtext="uiCP_Armor"
-                                onover="play_sound" params_over="name=specie_but_over"
-                                onclick_l="proc" params_l="anim_perso_armor"/>
-        -->
         <ctrl style="valid_txt_button" id="finish_but" posref="BR BM" x="-112" y="36" hardtext="uiCP_Finish" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_finish" />
         <ctrl style="valid_txt_button" id="abort_but" posparent="finish_but" posref="TM BM" y="4" hardtext="uiCP_Abort" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_abort" />
         <!-- SKIN -->
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml
index da4870786..fb8fb54b6 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml
@@ -11,6 +11,8 @@
         <param name="ctrl_sheet_gray_color" value="255 255 255 128" />
         <param name="ctrl_sheet_redify_color" value="255 100 100 128" />
         <param name="ctrl_text_redify_color" value="255 32 32 160" />
+        <!--    <param name="font"
+           value="basic.ttf" /> -->
         <param name="font" value="ryzom.ttf" />
         <param name="monospace_font" value="ryzom_monospace.ttf" />
         <param name="add_coef_font" value="0" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_location.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_location.xml
index cdca657b8..8fd943e97 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_location.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_location.xml
@@ -460,8 +460,7 @@
         <!-- Continue or Restart Default Outgame Music
                 MUST PLAY IT NOT ASYNCLY, else it don't works well during loading 
         -->
-        <!-- Play character selection music -->
-        <!-- <action handler="play_music_outgame"  params="async=0" /> -->
+        <action handler="play_music_outgame" params="async=0" />
     </proc>
     <proc id="proc_location_finish2">
         <action handler="copy" params="dbdst=UI:TEMP:CHAR3D:DEST|dbsrc=UI:TEMP:LOCCLICKDEST" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
index e6dc715b8..72e746ad3 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
@@ -1,9 +1,7 @@
 <interface_config>
     <root id="outgame" x="0" y="0" w="800" h="600" active="false" />
     <lua file="out_v2_select.lua" />
-    <!--
-<lua file="bg_downloader.lua" />
--->
+    <!-- <lua file="bg_downloader.lua" /> -->
     <!-- *********************** -->
     <!-- * CHARACTER SELECTION * -->
     <!-- *********************** -->
@@ -57,8 +55,7 @@
         <!-- Continue or Restart Default Outgame Music
                 MUST PLAY IT NOT ASYNCLY, else it don't works well during loading 
         -->
-        <!-- Play character selection music -->
-        <!-- <action handler="play_music_outgame"  params="async=0" /> -->
+        <action handler="play_music_outgame" params="async=0" />
     </proc>
     <proc id="charsel_disable_buttons">
         <action handler="set" params="target_property=ui:outgame:charsel:but_slot0:active|value=0" />
@@ -109,7 +106,7 @@
         <action handler="set" params="target_property=ui:outgame:charsel:slot@0:cam:fov | value=switch(@UI:TEMP:CHARSLOT@0:PEOPLE, 21, 22, 20, 23)" />
         <action handler="set" params="target_property=ui:outgame:charsel:slot@0:cam:posz|value=add(0.06,getprop('ui:outgame:charsel:slot@0:char:headz'))" />
         <action handler="set" params="target_property=ui:outgame:charsel:slot@0:cam:tgtz|value=add(0.06,getprop('ui:outgame:charsel:slot@0:char:headz'))" />
-        <action handler="get_slot" cond="not(isCharSelSlotEmpty(@0))" params="prop=name|target=ui:outgame:charsel:but_slot@0:hardtext|slot=@0" />
+        <action handler="get_slot" cond="not(isCharSelSlotEmpty(@0))" params="prop=name|target=ui:outgame:charsel:but_slot@0:uc_hardtext|slot=@0" />
     </proc>
     <proc id="proc_charsel_initslot_empty">
         <action handler="set" params="target_property=ui:outgame:charsel:slot@0:active|value=0" />
@@ -139,12 +136,6 @@
         <action handler="set" params="target_property=ui:outgame:charsel:char3d:env:name | value=switch(@UI:TEMP:CHAR3D:PEOPLE, 'outgame_fyros.ig', 'outgame_matis.ig', 'outgame_tryker.ig', 'outgame_zorai.ig')" />
         <action handler="set" params="target_property=ui:outgame:charsel:char3d:cam:fov | value=switch(@UI:TEMP:CHAR3D:PEOPLE, 60, 60, 60, 60)" />
         <action handler="set" params="target_property=ui:outgame:charsel:3d_select:y | value=switch(@0, 0, -153, -306, -459, -612)" />
-        <!-- Play character selection music -->
-        <action handler="play_music_outgame" cond="and(eq(@UI:TEMP:CHAR3D:PEOPLE,0),not(isCharSelSlotEmpty(@0)))" params="name=character creation fyros.ogg|async=1" />
-        <action handler="play_music_outgame" cond="and(eq(@UI:TEMP:CHAR3D:PEOPLE,1),not(isCharSelSlotEmpty(@0)))" params="name=character creation matis.ogg|async=1" />
-        <action handler="play_music_outgame" cond="and(eq(@UI:TEMP:CHAR3D:PEOPLE,2),not(isCharSelSlotEmpty(@0)))" params="name=character creation trykers.ogg|async=1" />
-        <action handler="play_music_outgame" cond="and(eq(@UI:TEMP:CHAR3D:PEOPLE,3),not(isCharSelSlotEmpty(@0)))" params="name=character creation zorai.ogg|async=1" />
-        <action handler="play_music_outgame" cond="isCharSelSlotEmpty(@0)" params="async=1" />
         <action handler="proc" params="proc_charsel_infos2" />
     </proc>
     <proc id="proc_charsel_play">
@@ -343,10 +334,9 @@
         <ctrl style="menu_button" id="but_slot2" posref="BL TL" posparent="but_slot1" y="-3" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_clickslot|2" />
         <ctrl style="menu_button" id="but_slot3" posref="BL TL" posparent="but_slot2" y="-3" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_clickslot|3" />
         <ctrl style="menu_button" id="but_slot4" posref="BL TL" posparent="but_slot3" y="-3" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_clickslot|4" />
-        <!-- UI 'commented out' for future purpose -->
         <!--
-        <group id="bgd_progress" posref="BM BM" w="430" h="75" x="85" y="65" active="true">             
-                <instance template="outgame_black_back" id="border"/>           
+        <group id="bgd_progress" posref="BM BM" w="430" h="75" x="85" y="65" active="true">
+                <instance template="outgame_black_back" id="border"/>
                 <view type="text" id="text"     active="true" y="-10" posref="TM TM"    hardtext="" fontsize="13" color="255 255 255 255"/>
                 <view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR"/>
                 <view type="text" id="ellipsis" active="true" y="0" posref="BR BL"      posparent="text" hardtext="" fontsize="13" color="255 255 255 255"/>
@@ -354,17 +344,16 @@
 
                 <group type="combo_box" id="prio" sizeref="w" w="64" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" 
                  posparent="progress"
-                 posref="BM TM"          
+                 posref="BM TM" 
                  on_change="lua:bgdownloader:onChangePriority()" on_change_params=""
                  tooltip="uiBGD_PriorityTooltip"
                  global_color="false"
-                >               
-                        <instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>                                           
+                >
+                        <instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
                         <combo_text name="uiBGD_Paused" />
                         <combo_text name="uiBGD_LowPriority" />
-                        <combo_text name="uiBGD_NormalPriority" />                      
+                        <combo_text name="uiBGD_NormalPriority" />
                 </group>
-
         </group>
 -->
         <!--***************-->
@@ -388,11 +377,6 @@
                                         onclick_l="proc" params_l="proc_charsel_play"/>
         -->
         <ctrl style="valid_txt_button" id="play_but" posref="BR BM" x="-112" y="56" hardtext="uiCharSel_Play" onover="play_sound" params_over="name=specie_but_over" onclick_l="lua" params_l="outgame:launchGame()" />
-        <!--
-        <ctrl style="valid_txt_button" id="edit_session_but" posref="BR BM" x="-112" y="36" hardtext="uiLaunchEditor"
-                                        onover="play_sound" params_over="name=specie_but_over"
-                                        onclick_l="proc" params_l="proc_charsel_edit_menu"/>
-        -->
         <ctrl style="valid_txt_button" id="del_but" posref="BR BL" x="-794" y="56" hardtext="uiCharSel_Del" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_del" />
         <link expr="and(not(isCharSelSlotInRingSession(@UI:TEMP:CHARSELSLOT)), not(isCharSelSlotEmpty(@UI:TEMP:CHARSELSLOT)))" target="play_but:active,edit_session_but:active,del_but:active" />
         <ctrl style="valid_txt_button" id="create_new_but" posref="BR BM" x="-112" y="56" hardtext="uiCharSel_CreateNew" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_create_new" />
@@ -463,17 +447,17 @@
         <ctrl style="valid_txt_button" id="cancel" posref="TM BM" posparent="submit" x="0" y="4" hardtext="uiCP_Delete_no" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_new_scenario_warning_cancel" />
     </group>
     <options name="menu_back">
-        <param name="tx_tl" value="w_modal_tl.tga" />
-        <param name="tx_t" value="w_modal_t.tga" />
-        <param name="tx_tr" value="w_modal_tr.tga" />
-        <param name="tx_l" value="w_modal_l.tga" />
-        <param name="tx_r" value="w_modal_r.tga" />
-        <param name="tx_blank" value="w_modal_blank.tga" />
-        <param name="tx_bl" value="w_modal_bl.tga" />
-        <param name="tx_b" value="w_modal_b.tga" />
-        <param name="tx_br" value="w_modal_br.tga" />
+        <param name="tx_tl" value="CM_TL.tga" />
+        <param name="tx_t" value="CM_T.tga" />
+        <param name="tx_tr" value="CM_TR.tga" />
+        <param name="tx_l" value="CM_L.tga" />
+        <param name="tx_r" value="CM_R.tga" />
+        <param name="tx_blank" value="CM_M.tga" />
+        <param name="tx_bl" value="CM_BL.tga" />
+        <param name="tx_b" value="CM_B.tga" />
+        <param name="tx_br" value="CM_BR.tga" />
     </options>
-    <group type="menu" id="r2ed_editor_menu" options="menu_back" space="0" color="255 255 255 255" fontsize="16" shadow="true" shadow_color="0 0 0 255" shadow_color_over="0 0 0 255" color_over="0 0 0 255" color_grayed="255 255 255 128" shadow_color_grayed="0 0 0 255" highlight_over="255 255 255 128" mouse_pos="false">
+    <group type="menu" id="r2ed_editor_menu" options="menu_back" text_y="0" color="255 255 255 255" fontsize="16" shadow="true" shadow_color="0 0 0 255" shadow_color_over="0 0 0 255" color_over="0 0 0 255" color_grayed="255 255 255 128" shadow_color_grayed="0 0 0 255" highlight_over="255 255 255 128" mouse_pos="false">
         <action id="new_scenario" name="uiR2EDNewScenario" handler="proc" params="proc_charsel_new_scenario_warning" />
         <action id="new_scenario" name="uiR2EDEditScenario" handler="proc" params="proc_charsel_edit_scenario" />
     </group>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml
index 0859fb675..52f436c25 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml
@@ -11,6 +11,8 @@
         <param name="ctrl_sheet_gray_color" value="255 255 255 128" />
         <param name="ctrl_sheet_redify_color" value="255 100 100 128" />
         <param name="ctrl_text_redify_color" value="255 32 32 160" />
+        <!--    <param name="font"
+           value="outgame.ttf" /> -->
         <param name="font" value="ryzom.ttf" />
         <param name="monospace_font" value="ryzom_monospace.ttf" />
         <param name="add_coef_font" value="3" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_select.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_select.xml
index c79def7be..e6a3bb1d7 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outgame_select.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_select.xml
@@ -84,11 +84,11 @@
         <action handler="set" params="dblink=UI:SELECTED_SLOT|@0" />
     </proc>
     <proc id="proc_select_init_right_screen">
-        <action handler="get_slot" params="prop=title |target=ui:outgame:character_selection:titles:title_txt:hardtext|slot=@UI:NEW_SELECTED_SLOT" />
-        <!--    <action handler="get_slot"      params="prop=job        |target=ui:outgame:character_selection:titles:job_txt:hardtext|slot=@UI:NEW_SELECTED_SLOT" /> 
-        <action handler="get_slot"      params="prop=level      |target=ui:outgame:character_selection:titles:level_txt:hardtext|slot=@UI:NEW_SELECTED_SLOT" />-->
+        <action handler="get_slot" params="prop=title |target=ui:outgame:character_selection:titles:title_txt:uc_hardtext|slot=@UI:NEW_SELECTED_SLOT" />
+        <!--    <action handler="get_slot"      params="prop=job        |target=ui:outgame:character_selection:titles:job_txt:uc_hardtext|slot=@UI:NEW_SELECTED_SLOT" /> 
+        <action handler="get_slot"      params="prop=level      |target=ui:outgame:character_selection:titles:level_txt:uc_hardtext|slot=@UI:NEW_SELECTED_SLOT" />-->
         <action handler="get_slot" params="prop=pos |target=ui:outgame:character_selection:titles:pos_txt:textid|slot=@UI:NEW_SELECTED_SLOT" />
-        <action handler="get_slot" params="prop=name |target=ui:outgame:character_selection:titles:name_txt:hardtext|slot=@UI:NEW_SELECTED_SLOT" />
+        <action handler="get_slot" params="prop=name |target=ui:outgame:character_selection:titles:name_txt:uc_hardtext|slot=@UI:NEW_SELECTED_SLOT" />
         <action handler="reset_camera" params="target=ui:outgame:character_selection:char3d:cam" />
         <action handler="set_db_from_slot" params="dblink=UI:TEMP:CHAR3D|slot=@UI:NEW_SELECTED_SLOT" />
         <action handler="proc" params="proc_charsel_init3d" />
@@ -121,11 +121,11 @@
         used to change at the end of full_to_full_1 anim the 3D view of the character and launch the second part
         -->
     <proc id="proc_click_slot2">
-        <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=title |target=ui:outgame:character_selection:titles:title_txt:hardtext|dbslot=UI:NEW_SELECTED_SLOT" />
-        <!--    <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=job       |target=ui:outgame:character_selection:titles:job_txt:hardtext|dbslot=UI:NEW_SELECTED_SLOT" />
-        <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=level     |target=ui:outgame:character_selection:titles:level_txt:hardtext|dbslot=UI:NEW_SELECTED_SLOT" />-->
+        <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=title |target=ui:outgame:character_selection:titles:title_txt:uc_hardtext|dbslot=UI:NEW_SELECTED_SLOT" />
+        <!--    <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=job       |target=ui:outgame:character_selection:titles:job_txt:uc_hardtext|dbslot=UI:NEW_SELECTED_SLOT" />
+        <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=level     |target=ui:outgame:character_selection:titles:level_txt:uc_hardtext|dbslot=UI:NEW_SELECTED_SLOT" />-->
         <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=pos |target=ui:outgame:character_selection:titles:pos_txt:textid|dbslot=UI:NEW_SELECTED_SLOT" />
-        <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=name |target=ui:outgame:character_selection:titles:name_txt:hardtext|dbslot=UI:NEW_SELECTED_SLOT" />
+        <action handler="get_slot" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="prop=name |target=ui:outgame:character_selection:titles:name_txt:uc_hardtext|dbslot=UI:NEW_SELECTED_SLOT" />
         <action handler="reset_camera" cond="not(isCharSelSlotEmpty(@UI:NEW_SELECTED_SLOT))" params="target=ui:outgame:character_selection:char3d:cam" />
         <action handler="set_db_from_slot" params="dblink=UI:TEMP:CHAR3D|slot=@UI:SELECTED_SLOT" />
         <action handler="proc" params="proc_charsel_init3d" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_summary.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_summary.xml
index 6c5016f16..66c8cf65a 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outgame_summary.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_summary.xml
@@ -130,11 +130,11 @@
     <proc id="proc_sum_enter_name">
         <action handler="reset_keyboard_focus" />
         <action handler="play_sound" params="name=summary_enter_name" />
-        <action handler="ask_valid_name" params="target=ui:outgame:summary:eb:input_string|dblink=UI:TEMP:VALID" />
+        <action handler="ask_valid_name" params="target=ui:outgame:summary:eb:uc_input_string|dblink=UI:TEMP:VALID" />
     </proc>
     <!-- proc_sum_enter_name2 is called after the server reception of VALID look at SERVER_RECEIVED_VALID -->
     <proc id="proc_sum_enter_name2">
-        <action handler="set" params="target_property=ui:outgame:summary:input_txt:hardtext|value=getprop('ui:outgame:summary:eb:input_string')" />
+        <action handler="set" params="target_property=ui:outgame:summary:input_txt:uc_hardtext|value=getprop('ui:outgame:summary:eb:uc_input_string')" />
         <action handler="disp_info" params="str='isPeopleActive(@UI:TEMP:CHAR3D:PEOPLE) = '|val=isPeopleActive(@UI:TEMP:CHAR3D:PEOPLE)" />
         <action handler="disp_info" params="str='isCareerActive(@UI:TEMP:CHAR3D:CAREER) = '|val=isCareerActive(@UI:TEMP:CHAR3D:CAREER)" />
         <action handler="disp_info" params="str='@UI:TEMP:CHAR3D:CAREER = '|val=@UI:TEMP:CHAR3D:CAREER" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_widgets.xml
index 3ae857847..0d858aac7 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outgame_widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_widgets.xml
@@ -63,9 +63,9 @@
     <!-- ********************* -->
     <!-- *  EDIT BOX WIDGET  * -->
     <!-- ********************* -->
-    <template name="edit_box_widget" posref="TL TL" text_x="0" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" enter_loose_focus="true" prompt="&gt;" max_num_chars="255" max_num_bytes="0" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="40" fontsize="12">
+    <template name="edit_box_widget" posref="TL TL" text_x="0" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" enter_loose_focus="true" prompt="&gt;" max_num_chars="256" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="40" fontsize="12">
         <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="#child_resize_h" sizeref="#sizeref" w="#w" h="#h">
-            <group type="edit_box" sizeref="w" w="-8" id="eb" posref="TL TL" x="4" y="-4" child_resize_h="true" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" max_num_chars="#max_num_chars" max_num_bytes="#max_num_bytes" prompt="#prompt" enter_loose_focus="#enter_loose_focus" entry_type="#entry_type" reset_focus_on_hide="#reset_focus_on_hide" menu_r="#menu_r" max_historic="#max_historic">
+            <group type="edit_box" sizeref="w" w="-8" id="eb" posref="TL TL" x="4" y="-4" child_resize_h="true" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" max_num_chars="#max_num_chars" prompt="#prompt" enter_loose_focus="#enter_loose_focus" entry_type="#entry_type" reset_focus_on_hide="#reset_focus_on_hide" menu_r="#menu_r" max_historic="#max_historic">
                 <view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="W_box_blank.tga" />
                 <view id="edit_text" type="text" x="#text_x" posref="#text_ref" multi_line="#multi_line" fontsize="#fontsize" shadow="true" hardtext="" global_color="false" />
             </group>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outpost.lua b/ryzom/client/data/gamedev/interfaces_v3/outpost.lua
index 3c884a680..77f1b1125 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outpost.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/outpost.lua
@@ -45,7 +45,7 @@ end
 function game:outpostDisplayTimeZone(uiLocal)
 	local tz= getDbProp('UI:SAVE:OUTPOST:TIME_ZONE');
 	local uiGroup= getUICaller();
-	uiGroup[uiLocal].text= 'GMT ' .. string.format('%+d', tz);
+	uiGroup[uiLocal].uc_hardtext= 'GMT ' .. string.format('%+d', tz);
 end
 
 ------------------------------------------------------------------------------------------------------------
@@ -57,7 +57,7 @@ function game:outpostAdjustHour(uiLocal, prop)
 	
 	-- add time zone and clamp hour
 	h = math.fmod(h + tz + 24, 24);
-	uiGroup[uiLocal].text = string.format('%02d:00', h);
+	uiGroup[uiLocal].uc_hardtext = string.format('%02d:00', h);
 end
 
 ------------------------------------------------------------------------------------------------------------
@@ -220,9 +220,9 @@ function game:outpostInfoOnDraw()
 
 	-- readable form
 	if (status == self.OutpostEnums.Peace) then
-		uiGroup.Env.Timer.text= '';
+		uiGroup.Env.Timer.uc_hardtext= '';
 	else
-		uiGroup.Env.Timer.text= '(' .. runFct('secondsToTimeString', timeSec) .. ')';
+		uiGroup.Env.Timer.uc_hardtext= '(' .. runFct('secondsToTimeString', timeSec) .. ')';
 	end
 end
 
@@ -448,7 +448,7 @@ end
 function game:outpostDisplayStatusInfo(statusExpr, id)
 	local uiGroup = getUICaller();
 	local text = self:outpostGetStatusInfo(statusExpr, -1, 'no');
-	uiGroup[id].text_format = text;
+	uiGroup[id].uc_hardtext_format = text;
 end
 
 ------------------------------------------------------------------------------------------------------------
@@ -487,7 +487,7 @@ function game:outpostChangeRoundLvlThreshold()
 	local val= getDbProp(path .. ':ROUND_LVL_THRESHOLD');
 
 	-- setup text
-	uiGroup.outpost_lvl_thre.text= tostring(val);
+	uiGroup.outpost_lvl_thre.uc_hardtext= tostring(val);
 end
 
 
@@ -504,9 +504,9 @@ function game:outpostChangeRoundLvlMaxAtt()
 
 	-- setup text (only relevant when attack period has begun)
 	if(status>=self.OutpostEnums.AttackRound) then
-		uiGroup.outpost_lvl_max_att.text= tostring(val);
+		uiGroup.outpost_lvl_max_att.uc_hardtext= tostring(val);
 	else
-		uiGroup.outpost_lvl_max_att.text= '- ';
+		uiGroup.outpost_lvl_max_att.uc_hardtext= '- ';
 	end
 end
 
@@ -524,9 +524,9 @@ function game:outpostChangeRoundLvlMaxDef()
 
 	-- setup text (only relevant in War)
 	if(status>=self.OutpostEnums.DefenseRound) then
-		uiGroup.outpost_lvl_max_def.text= tostring(val);
+		uiGroup.outpost_lvl_max_def.uc_hardtext= tostring(val);
 	else
-		uiGroup.outpost_lvl_max_def.text= '- ';
+		uiGroup.outpost_lvl_max_def.uc_hardtext= '- ';
 	end
 end
 
@@ -546,9 +546,9 @@ function game:outpostChangeRoundLvlCur()
 
 	-- setup text (only in a Attack/Defense Round)
 	if(self:outpostIsStatusWarRound(status)) then
-		uiGroup.outpost_lvl_cur.text= tostring(val);
+		uiGroup.outpost_lvl_cur.uc_hardtext= tostring(val);
 	else
-		uiGroup.outpost_lvl_cur.text= '- ';
+		uiGroup.outpost_lvl_cur.uc_hardtext= '- ';
 	end
 end
 
@@ -569,9 +569,9 @@ function game:outpostChangeRoundId()
 
 	-- setup text (only in a Attack/Defense Round)
 	if(self:outpostIsStatusWarRound(status)) then
-		uiGroup.outpost_round_cur.text= tostring(val) .. ' / ' .. tostring(maxRound);
+		uiGroup.outpost_round_cur.uc_hardtext= tostring(val) .. ' / ' .. tostring(maxRound);
 	else
-		uiGroup.outpost_round_cur.text= '- ';
+		uiGroup.outpost_round_cur.uc_hardtext= '- ';
 	end
 end
 
@@ -607,7 +607,7 @@ function game:outpostPvpJoinTimerOnDraw()
 	-- replace in str
 	local	text= i18n.get('uiOutpostJoinPVPTimer');
 	text= findReplaceAll(text, "%time", tostring(timeSec));
-	uiGroup.Env.Timer.text_format= text;
+	uiGroup.Env.Timer.uc_hardtext_format= text;
 
 end
 
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outpost.xml b/ryzom/client/data/gamedev/interfaces_v3/outpost.xml
index 0497a3dbf..ed52f3c65 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outpost.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outpost.xml
@@ -103,7 +103,7 @@
         <!-- active the line if the outpost slot is here, and if for the correct list -->
         <link expr="and(ne(@SERVER:GUILD:OUTPOST:O#index:SHEET,0), eq(@SERVER:GUILD:OUTPOST:O#index:OWNED,#owned))" target="#id:active" />
         <!-- name of the outpost -->
-        <link expr="getOutpostName(@SERVER:GUILD:OUTPOST:O#index:SHEET)" target="#id:name:hardtext" />
+        <link expr="getOutpostName(@SERVER:GUILD:OUTPOST:O#index:SHEET)" target="#id:name:uc_hardtext" />
         <!-- if the player has the rights to modify outposts let him destroy an outpost -->
         <!-- the outpost must also be owned by the guild, and the guild must be able to delete the oupost -->
         <link expr="and( ne(@SERVER:USER:OUTPOST_ADMIN,0), ne(@SERVER:GUILD:OUTPOST:CANDEL,0), ne(#owned,0) )" target="#id:del:active" />
@@ -258,12 +258,12 @@
             <group id="global_state" sizeref="w" w="0" child_resize_h="true" posparent="sep_gs" posref="BL TL" x="0" y="-10">
                 <!-- NAME -->
                 <view type="text" id="outpost_name" posref="TM TM" x="0" y="0" global_color="false" fontsize="12" shadow="true" />
-                <link expr="getOutpostName(@#outpost_db:SHEET)" target="outpost_name:hardtext" />
+                <link expr="getOutpostName(@#outpost_db:SHEET)" target="outpost_name:uc_hardtext" />
                 <!-- LEVEL -->
                 <view style="outpost_title" id="title_level" posparent="parent" posref="TL TL" x="0" y="-20" hardtext="uiOutpostLevel" />
                 <instance template="text_tt" posparent="title_level" tooltip="uittOutpostLevel" />
                 <view style="outpost_value_R" id="outpost_level" posparent="title_level" />
-                <link expr="@#outpost_db:LEVEL" target="outpost_level:hardtext" />
+                <link expr="@#outpost_db:LEVEL" target="outpost_level:uc_hardtext" />
                 <!-- OWNER: GUILD/TRIBE -->
                 <view style="outpost_title" id="title_owner" posparent="title_level" hardtext="uiOutpostOwner" />
                 <instance template="text_tt" posparent="title_owner" tooltip="uittOutpostOwner" />
@@ -340,12 +340,12 @@
                 <view style="outpost_title" id="title_att_period" posparent="title_def_hour" hardtext="uiOutpostAttPeriod" case_mode="%case_normal" />
                 <instance template="text_tt" posparent="title_att_period" tooltip="uittOutpostAttPeriod" />
                 <view style="outpost_value_RC2" id="outpost_att_period" posparent="title_att_period" />
-                <link expr="getOutpostPeriod(@#outpost_db:TIME_RANGE_ATT, @#outpost_db:TIME_RANGE_LENGTH, @UI:SAVE:OUTPOST:TIME_ZONE, @#outpost_db:STATUS, 1)" target="outpost_att_period:hardtext" />
+                <link expr="getOutpostPeriod(@#outpost_db:TIME_RANGE_ATT, @#outpost_db:TIME_RANGE_LENGTH, @UI:SAVE:OUTPOST:TIME_ZONE, @#outpost_db:STATUS, 1)" target="outpost_att_period:uc_hardtext" />
                 <!-- ACTUAL DEFENDER PERIOD -->
                 <view style="outpost_title" id="title_def_period" posparent="title_att_period" hardtext="uiOutpostDefPeriod" case_mode="%case_normal" />
                 <instance template="text_tt" posparent="title_def_period" tooltip="uittOutpostDefPeriod" />
                 <view style="outpost_value_RC2" id="outpost_def_period" posparent="title_def_period" />
-                <link expr="getOutpostPeriod(@#outpost_db:TIME_RANGE_DEF, @#outpost_db:TIME_RANGE_LENGTH, @UI:SAVE:OUTPOST:TIME_ZONE, @#outpost_db:STATUS, 0)" target="outpost_def_period:hardtext" />
+                <link expr="getOutpostPeriod(@#outpost_db:TIME_RANGE_DEF, @#outpost_db:TIME_RANGE_LENGTH, @UI:SAVE:OUTPOST:TIME_ZONE, @#outpost_db:STATUS, 0)" target="outpost_def_period:uc_hardtext" />
                 <!-- TIME ZONE SELECTION -->
                 <instance template="t_outpost_time_zone_selector" id="time_zone_selector" posparent="title_def_period" />
             </group>
@@ -382,9 +382,9 @@
         <!-- active the line if the squad slot is here -->
         <link expr="ne(@%outpost_selected:SQUADS:SP#index:SHEET, 0)" target="#id:active" />
         <!-- name of the squad -->
-        <link expr="getSquadName(@%outpost_selected:SQUADS:SP#index:SHEET)" target="#id:name:hardtext" />
+        <link expr="getSquadName(@%outpost_selected:SQUADS:SP#index:SHEET)" target="#id:name:uc_hardtext" />
         <!-- squad cost -->
-        <link expr="getSquadCost(@%outpost_selected:SQUADS:SP#index:SHEET)" target="#id:cost:hardtext" />
+        <link expr="getSquadCost(@%outpost_selected:SQUADS:SP#index:SHEET)" target="#id:cost:uc_hardtext" />
     </template>
     <!-- a training squad of the outpost -->
     <template name="t_training_squad_line" id="" index="" posref="BL TL" posparent="parent" x="0">
@@ -400,14 +400,14 @@
         <!-- active the line if the squad slot is here -->
         <link expr="ne(@%outpost_selected:SQUADS:T#index:SHEET, 0)" target="#id:active" />
         <!-- name of the squad -->
-        <link expr="getSquadName(@%outpost_selected:SQUADS:T#index:SHEET)" target="#id:name:hardtext" />
+        <link expr="getSquadName(@%outpost_selected:SQUADS:T#index:SHEET)" target="#id:name:uc_hardtext" />
         <!-- squad cost -->
-        <link expr="getSquadCost(@%outpost_selected:SQUADS:T#index:SHEET)" target="#id:cost:hardtext" />
+        <link expr="getSquadCost(@%outpost_selected:SQUADS:T#index:SHEET)" target="#id:cost:uc_hardtext" />
         <!-- clickable only if allowed rights -->
         <link expr="ne(@SERVER:USER:OUTPOST_ADMIN,0)" target="#id:select:active" />
         <link expr="eq(@SERVER:USER:OUTPOST_ADMIN,0)" target="#id:spawn:frozen" />
         <!-- spawn pos button -->
-        <link expr="add(@%outpost_selected:SQUADS:T#index:SPAWN,1)" target="#id:spawn:hardtext" />
+        <link expr="add(@%outpost_selected:SQUADS:T#index:SPAWN,1)" target="#id:spawn:uc_hardtext" />
     </template>
     <!-- A list of Spawned Squads -->
     <template name="t_squad_list" id="" x="0" y="0" posparent="parent" posref="TL TL" squad_template="" firstindex="0" header="" tooltip="">
@@ -436,8 +436,8 @@
             <ctrl type="sheet" id="building_sheet" nature="outpost_building" posref="TL TL" x="18" y="-5" value="UI:DUMMY" onclick_r="open_help_auto" />
             <view type="text" id="building_name" posparent="building_sheet" posref="TR TL" x="5" y="-4" color="255 255 255 255" fontsize="10" shadow="true" hardtext="" multi_line="true" multi_line_space="0" />
             <view type="text" id="building_desc" posparent="building_name" posref="BL TL" x="0" y="-4" color="255 255 255 255" fontsize="10" shadow="true" hardtext="" multi_line="true" multi_line_space="0" />
-            <link expr="getOutpostBuildingName(@%outpost_selected:BUILDINGS:#index:SHEET)" target="building_name:hardtext" />
-            <link expr="getOutpostBuildingDesc(@%outpost_selected:BUILDINGS:#index:SHEET)" target="building_desc:hardtext" />
+            <link expr="getOutpostBuildingName(@%outpost_selected:BUILDINGS:#index:SHEET)" target="building_name:uc_hardtext" />
+            <link expr="getOutpostBuildingDesc(@%outpost_selected:BUILDINGS:#index:SHEET)" target="building_desc:uc_hardtext" />
             <link expr="@UI:TEMP:OUTPOST:SELECTION" action="lua:game:outpostUpdateBuildingSheet(#index)" />
         </group>
     </template>
@@ -473,7 +473,7 @@
                 <view type="bitmap" id="sep_doc" posref="TL TL" scale="true" sizeref="w" w="0" h="2" x="0" y="0" texture="W_line_hor.tga" />
                 <view type="text" id="explain_edit" posparent="sep_doc" posref="BL TL" x="0" y="-10" global_color="true" shadow="true" hardtext="" fontsize="10" multi_line="true" multi_line_space="0" />
                 <!-- Different Doc wether attacking or defending -->
-                <link expr="localize(ifthenelse(@%outpost_selected:OWNED, 'uiOutpostSquadEditDef', 'uiOutpostSquadEditAtt'))" target="explain_edit:hardtext_format" />
+                <link expr="localize(ifthenelse(@%outpost_selected:OWNED, 'uiOutpostSquadEditDef', 'uiOutpostSquadEditAtt'))" target="explain_edit:uc_hardtext_format" />
                 <!-- Current Round -->
                 <view type="bitmap" id="sep_cur" posparent="explain_edit" posref="BL TL" scale="true" sizeref="w" w="0" h="2" x="0" y="-8" texture="W_line_hor.tga" sizeparent="parent" />
                 <view type="text" id="cur_round" posparent="sep_cur" posref="BL TL" x="0" y="-10" global_color="false" shadow="true" hardtext="uiOutpostSSquad" case_mode="%case_upper" />
@@ -493,7 +493,7 @@
                 <group id="capital_selector" posparent="capital" posref="BL TL" x="0" y="-4" sizeref="w" sizeparent="parent" child_resize_h="true" w="0" h="0" child_resize_hmargin="2">
                     <view style="outpost_title" id="cap_text" posparent="parent" posref="TL TL" x="0" y="-2" hardtext="uiOutpostCapitalHeader" case_mode="%case_normal" />
                     <ctrl style="text_button_16" id="cap_but" posparent="cap_text" posref="MR ML" x="8" y="1" hardtext="0" onclick_l="lua:game:outpostSelectSquadCapitalOpen()" text_color_normal="255 255 255 255" text_color_over="255 255 255 255" text_color_pushed="255 255 255 255" />
-                    <link expr="@%outpost_selected:SQUAD_CAPITAL" target="cap_but:hardtext" />
+                    <link expr="@%outpost_selected:SQUAD_CAPITAL" target="cap_but:uc_hardtext" />
                     <link expr="eq(@SERVER:USER:OUTPOST_ADMIN,0)" target="cap_but:frozen" />
                     <link expr="ifthenelse(eq(@SERVER:USER:OUTPOST_ADMIN,0), localize('uiOutpostCapitalEditKO'), localize('uiOutpostCapitalEditOK'))" target="cap_but:tooltip" />
                 </group>
@@ -502,13 +502,13 @@
             <group id="buildings" x="0" y="-36" h="0" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="0" posref="TL TL">
                 <view type="bitmap" id="sep_building" posref="TL TL" scale="true" sizeref="w" w="0" h="2" x="0" y="0" texture="W_line_hor.tga" />
                 <view type="text" id="outpost_name" posref="TM TM" x="0" y="-12" global_color="false" fontsize="12" shadow="true" />
-                <link expr="getOutpostName(@%outpost_selected:SHEET)" target="outpost_name:hardtext" />
+                <link expr="getOutpostName(@%outpost_selected:SHEET)" target="outpost_name:uc_hardtext" />
                 <view type="text" id="building_info" posparent="parent" posref="TL TL" x="0" y="-50" global_color="false" fontsize="12" shadow="true" hardtext="uiOutpostBuildingInfoNotOwned" />
                 <instance template="t_outpost_building" id="building1" index="0" posparent="parent" posref="TL TL" y="-64" />
                 <instance template="t_outpost_building" id="building2" index="1" posparent="building1" posref="BL TL" />
                 <instance template="t_outpost_building" id="building3" index="2" posparent="building2" posref="BL TL" />
                 <instance template="t_outpost_building" id="building4" index="3" posparent="building3" posref="BL TL" />
-                <link expr="ifthenelse(eq(@%outpost_selected:OWNED,0), localize('uiOutpostBuildingInfoNotOwned'), localize('uiOutpostBuildingInfoOwned'))" target="building_info:hardtext" />
+                <link expr="ifthenelse(eq(@%outpost_selected:OWNED,0), localize('uiOutpostBuildingInfoNotOwned'), localize('uiOutpostBuildingInfoOwned'))" target="building_info:uc_hardtext" />
                 <link expr="ifthenelse(eq(@%outpost_selected:OWNED,0), 0, 1)" target="building1:active" />
                 <link expr="ifthenelse(eq(@%outpost_selected:OWNED,0), 0, 1)" target="building2:active" />
                 <link expr="ifthenelse(eq(@%outpost_selected:OWNED,0), 0, 1)" target="building3:active" />
@@ -553,11 +553,11 @@
         <group id="content" x="0" y="0" w="0" h="0" child_resize_h="true" child_resize_hmargin="8" posref="TL TL">
             <!-- NAME -->
             <view type="text" id="outpost_name" posref="TM TM" x="0" y="-8" global_color="false" fontsize="12" shadow="true" />
-            <link expr="getOutpostName(@SERVER:OUTPOST_SELECTED:SHEET)" target="outpost_name:hardtext" />
+            <link expr="getOutpostName(@SERVER:OUTPOST_SELECTED:SHEET)" target="outpost_name:uc_hardtext" />
             <!-- WAR COST -->
             <view style="outpost_title" id="title_war_cost" posparent="parent" posref="TL TL" x="0" y="-30" hardtext="uiOutpostWarCost" />
             <view style="outpost_value_R" id="outpost_war_cost" posparent="title_war_cost" />
-            <link expr="@SERVER:OUTPOST_SELECTED:WARCOST" target="outpost_war_cost:hardtext" />
+            <link expr="@SERVER:OUTPOST_SELECTED:WARCOST" target="outpost_war_cost:uc_hardtext" />
             <view style="outpost_value_B" id="outpost_war_cost_desc" posparent="title_war_cost" hardtext="uiOutpostWarCostDesc" fontsize="10" />
             <!-- TIME SETUP -->
             <group id="war_schedule" sizeparent="parent" sizeref="w" w="0" child_resize_h="true" child_resize_hmargin="2" posparent="outpost_war_cost_desc" posref="BL TL" x="-8" y="-10">
@@ -573,7 +573,7 @@
                 <instance template="text_tt" posparent="title_att_period" tooltip="uittOutpostAttPeriod" />
                 <view style="outpost_value_B" id="outpost_att_period" posparent="title_att_period" />
                 <!-- NB: emulate war for this text (don't want to display N/A) -->
-                <link expr="getOutpostPeriod(@UI:TEMP:OUTPOST:DECLARE_WAR_ACK_TIME_RANGE_ATT, @SERVER:OUTPOST_SELECTED:TIME_RANGE_LENGTH, @UI:SAVE:OUTPOST:TIME_ZONE, %outpost_status_WarDeclaration, 1)" target="outpost_att_period:hardtext" />
+                <link expr="getOutpostPeriod(@UI:TEMP:OUTPOST:DECLARE_WAR_ACK_TIME_RANGE_ATT, @SERVER:OUTPOST_SELECTED:TIME_RANGE_LENGTH, @UI:SAVE:OUTPOST:TIME_ZONE, %outpost_status_WarDeclaration, 1)" target="outpost_att_period:uc_hardtext" />
                 <!-- Relevant only if ACK received -->
                 <link expr="@UI:TEMP:OUTPOST:DECLARE_WAR_ACK_RECEIVED" target="outpost_att_period:active" />
                 <!-- TIME ZONE SELECTION -->
@@ -652,9 +652,9 @@
         <!-- active the line if the squad slot is here -->
         <link expr="ne(@%outpost_selected:SQUAD_SHOP:#index:SHEET, 0)" target="#id:active,#id_select:active" />
         <!-- squad name -->
-        <link expr="getSquadName(@%outpost_selected:SQUAD_SHOP:#index:SHEET)" target="#id:name:hardtext" />
+        <link expr="getSquadName(@%outpost_selected:SQUAD_SHOP:#index:SHEET)" target="#id:name:uc_hardtext" />
         <!-- squad cost -->
-        <link expr="getSquadCost(@%outpost_selected:SQUAD_SHOP:#index:SHEET)" target="#id:cost:hardtext" />
+        <link expr="getSquadCost(@%outpost_selected:SQUAD_SHOP:#index:SHEET)" target="#id:cost:uc_hardtext" />
     </template>
     <group style="container_modal" id="squad_shop" w="520" h="270" resizer="false" openable="false" title="uiOutpostSquadShopTitle" savable="false" global_color="false" opened="true" movable="true" active="false" header_color="UI:SAVE:WIN:COLORS:MEM" modal_parent="outpost">
         <group id="header_opened" x="0" y="0" w="0" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color"></group>
@@ -674,7 +674,7 @@
                 <view type="text" id="title_desc" posref="TL TL" x="300" y="-8" hardtext="uiOutpostDescription" global_color="false" />
                 <instance template="text_tt" posparent="title_desc" tooltip="uittOutpostSquadDesc" />
                 <view type="text" id="squad_desc" posref="TL TL" x="300" y="-26" multi_line="true" multi_line_space="0" line_maxw="200" fontsize="10" />
-                <link expr="ifthenelse(eq(@UI:TEMP:OUTPOST:SQUAD_TO_BUY,-1), '', getSquadDesc(@%outpost_selected:SQUAD_SHOP:[UI:TEMP:OUTPOST:SQUAD_TO_BUY]:SHEET))" target="squad_desc:hardtext" />
+                <link expr="ifthenelse(eq(@UI:TEMP:OUTPOST:SQUAD_TO_BUY,-1), '', getSquadDesc(@%outpost_selected:SQUAD_SHOP:[UI:TEMP:OUTPOST:SQUAD_TO_BUY]:SHEET))" target="squad_desc:uc_hardtext" />
                 <!-- SET / CANCEL -->
                 <instance template="button_ok_cancel" posref="BR BR" x="-8" y="4" onclick_ok="proc" onclick_ok_param="ss_proc_set_squad" ok_text="uiOutpostSetSquad" tooltip_ok="uittOutpostSetSquad" onclick_cancel="hide" onclick_cancel_param="ui:interface:squad_shop" cancel_text="uittCancel" />
                 <link expr="eq(@UI:TEMP:OUTPOST:SQUAD_TO_BUY,-1)" target="ok_cancel:ok:frozen" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/phrase.xml b/ryzom/client/data/gamedev/interfaces_v3/phrase.xml
index 508a8681e..4c3d756c5 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/phrase.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/phrase.xml
@@ -283,19 +283,23 @@
     <variable entry="UI:PHRASE:FABER:MP_SELECT:$i:SHEET" type="sint32" value="0" size="%phrase_faber_selection_max" />
     <variable entry="UI:PHRASE:FABER:MP_SELECT:$i:QUALITY" type="sint32" value="0" size="%phrase_faber_selection_max" />
     <variable entry="UI:PHRASE:FABER:MP_SELECT:$i:QUANTITY" type="sint32" value="0" size="%phrase_faber_selection_max" />
-    <variable entry="UI:PHRASE:FABER:MP_SELECT:$i:USER_COLOR" type="sint32" value="1" size="%phrase_faber_selection_max" />
+    <variable entry="UI:PHRASE:FABER:MP_SELECT:$i:USER_COLOR" type="sint32" value="0" size="%phrase_faber_selection_max" />
     <variable entry="UI:PHRASE:FABER:MP_SELECT:$i:WEIGHT" type="sint32" value="0" size="%phrase_faber_selection_max" />
     <!-- Define varaibles for the mp selected array-->
     <template name="phrase_faber_def_build_mps" index="" id="">
         <variable entry="UI:PHRASE:FABER:MP_BUILD:#index:$i:SHEET" type="sint32" value="0" size="%phrase_faber_max_mp_slot" />
         <variable entry="UI:PHRASE:FABER:MP_BUILD:#index:$i:QUALITY" type="sint32" value="0" size="%phrase_faber_max_mp_slot" />
         <variable entry="UI:PHRASE:FABER:MP_BUILD:#index:$i:QUANTITY" type="sint32" value="0" size="%phrase_faber_max_mp_slot" />
-        <variable entry="UI:PHRASE:FABER:MP_BUILD:#index:$i:USER_COLOR" type="sint32" value="1" size="%phrase_faber_max_mp_slot" />
+        <variable entry="UI:PHRASE:FABER:MP_BUILD:#index:$i:USER_COLOR" type="sint32" value="0" size="%phrase_faber_max_mp_slot" />
         <variable entry="UI:PHRASE:FABER:MP_BUILD:#index:$i:WEIGHT" type="sint32" value="0" size="%phrase_faber_max_mp_slot" />
     </template>
     <vector template="phrase_faber_def_build_mps" id="yoyo_pipo_faber$i" index="$i" _size="%phrase_faber_max_item_req" _firstpos="TL TL" _xfirst="0" _nextpos="TR TL" _yfirst="0" />
     <!-- Define varaibles for the plan selection -->
     <variable entry="UI:PHRASE:FABER:FABER_PLAN:SHEET" type="sint32" value="0" />
+    <variable entry="UI:PHRASE:FABER:FABER_PLAN:HP_BUFF" type="sint32" value="0" />
+    <variable entry="UI:PHRASE:FABER:FABER_PLAN:SAP_BUFF" type="sint32" value="0" />
+    <variable entry="UI:PHRASE:FABER:FABER_PLAN:STA_BUFF" type="sint32" value="0" />
+    <variable entry="UI:PHRASE:FABER:FABER_PLAN:FOCUS_BUFF" type="sint32" value="0" />
     <!-- Define varaibles for the Mp Quantity setup -->
     <variable entry="UI:PHRASE:FABER:MP_QUANTITY:$i:SELECTED" type="sint32" value="0" size="%phrase_faber_max_item_req" />
     <variable entry="UI:PHRASE:FABER:MP_QUANTITY:$i:REQUIRED" type="sint32" value="0" size="%phrase_faber_max_item_req" />
@@ -303,7 +307,7 @@
     <variable entry="UI:PHRASE:FABER:STACK_SELECT:SHEET" type="sint32" value="0" />
     <variable entry="UI:PHRASE:FABER:STACK_SELECT:QUALITY" type="sint32" value="0" />
     <variable entry="UI:PHRASE:FABER:STACK_SELECT:QUANTITY" type="sint32" value="0" />
-    <variable entry="UI:PHRASE:FABER:STACK_SELECT:USER_COLOR" type="sint32" value="1" />
+    <variable entry="UI:PHRASE:FABER:STACK_SELECT:USER_COLOR" type="sint32" value="0" />
     <variable entry="UI:PHRASE:FABER:STACK_SELECT:WEIGHT" type="sint32" value="0" />
     <!-- declare the dummy mp stack selection value -->
     <variable entry="UI:PHRASE:FABER:STACK_SELECT:CUR_QUANTITY" type="sint32" value="0" />
@@ -312,7 +316,7 @@
     <variable entry="UI:PHRASE:FABER:RESULT_ITEM:SHEET" type="sint32" value="0" />
     <variable entry="UI:PHRASE:FABER:RESULT_ITEM:QUALITY" type="sint32" value="0" />
     <variable entry="UI:PHRASE:FABER:RESULT_ITEM:QUANTITY" type="sint32" value="0" />
-    <variable entry="UI:PHRASE:FABER:RESULT_ITEM:USER_COLOR" type="sint32" value="1" />
+    <variable entry="UI:PHRASE:FABER:RESULT_ITEM:USER_COLOR" type="sint32" value="0" />
     <variable entry="UI:PHRASE:FABER:RESULT_ITEM:LOCKED" type="sint32" value="0" />
     <variable entry="UI:PHRASE:FABER:RESULT_ITEM:WEIGHT" type="sint32" value="0" />
     <variable entry="UI:PHRASE:FABER:RESULT_ITEM:NAMEID" type="sint32" value="0" />
@@ -335,7 +339,7 @@
         <action handler="phrase_faber_select_mp_quantity" />
     </proc>
     <group type="modal" id="phrase_faber_mp_quantity" exit_click_out="true" posref="TL TL" w="185" h="100" x="-35" y="85" on_enter="phrase_faber_select_mp_quantity" options="skin_modal">
-        <view type="text" id="text" posref="TL TL" x="4" y="-4" color="255 255 255 255" fontsize="12" shadow="true" global_color="false" hardtext="SELECT QUANTITY" />
+        <view type="text" id="text" posref="TL TL" x="4" y="-4" color="255 255 255 255" fontsize="12" shadow="true" global_color="false" hardtext="uiSelectQuantity" />
         <ctrl type="sheet" id="sheet" onclick_r="open_help_auto" value="UI:PHRASE:FABER:STACK_SELECT" posref="MM MM" x="-26" y="0" use_quantity="false" />
         <view type="text" id="x" posparent="sheet" posref="MR MM" x="8" y="0" color="255 255 255 255" fontsize="12" shadow="true" hardtext="X" />
         <instance template="edit_box_widget" id="edit" entry_type="positive_integer" text_ref="TR TR" text_y="-1" fontsize="12" posparent="sheet" posref="MR ML" x="16" y="0" text_x="-2" w="32" prompt="" enter_loose_focus="false" multi_line="false" max_num_chars="3" onchange="editbox_number" onchange_params="value=UI:PHRASE:FABER:STACK_SELECT:CUR_QUANTITY|update_text=false|value=UI:PHRASE:FABER:STACK_SELECT:MAX_QUANTITY" onenter="phrase_faber_select_mp_quantity" max_historic="0" />
@@ -416,6 +420,19 @@
                 <view type="text" id="name" posparent="item_result" posref="TR TL" x="4" y="0" fontsize="10" multi_line="false" line_maxw="340" hardtext="uittFaberItemResult" over_extend_view_text="true" />
                 <view type="text" id="desc" posparent="name" posref="BL TL" x="0" y="0" fontsize="8" multi_line="false" line_maxw="340" hardtext="..." over_extend_view_text="true" />
                 <link expr="@UI:PHRASE:FABER:RESULT_ITEM:SHEET" action="lua:game:updatePhraseFaberPreview('UI:PHRASE:FABER:RESULT_ITEM:SHEET')" />
+                <!-- buffs -->
+                <view type="bitmap" id="hp_icon" posref="TR TR" x="-2" y="-2" scale="true" w="16" h="16" texture="ico_heal.tga" />
+                <view type="bitmap" id="sap_icon" posparent="hp_icon" posref="BR TR" x="0" y="0" scale="true" w="16" h="16" texture="ico_sap.tga" />
+                <view type="bitmap" id="sta_icon" posparent="sap_icon" posref="BR TR" x="0" y="0" scale="true" w="16" h="16" texture="ico_stamina.tga" />
+                <view type="bitmap" id="focus_icon" posparent="sta_icon" posref="BR TR" x="0" y="0" scale="true" w="16" h="16" texture="ico_focus.tga" />
+                <view type="text_number" id="hp_text" posparent="hp_icon" posref="ML MR" x="0" y="0" fontsize="10" shadow="true" value="UI:PHRASE:FABER:FABER_PLAN:HP_BUFF" global_color="true" />
+                <view type="text_number" id="sap_text" posparent="sap_icon" posref="ML MR" x="0" y="0" fontsize="10" shadow="true" value="UI:PHRASE:FABER:FABER_PLAN:SAP_BUFF" global_color="true" />
+                <view type="text_number" id="sta_text" posparent="sta_icon" posref="ML MR" x="0" y="0" fontsize="10" shadow="true" value="UI:PHRASE:FABER:FABER_PLAN:STA_BUFF" global_color="true" />
+                <view type="text_number" id="focus_text" posparent="focus_icon" posref="ML MR" x="0" y="0" fontsize="10" shadow="true" value="UI:PHRASE:FABER:FABER_PLAN:FOCUS_BUFF" global_color="true" />
+                <link expr="ne(@UI:PHRASE:FABER:FABER_PLAN:HP_BUFF, 0)" target="hp_icon:active,hp_text:active" />
+                <link expr="ne(@UI:PHRASE:FABER:FABER_PLAN:SAP_BUFF, 0)" target="sap_icon:active,sap_text:active" />
+                <link expr="ne(@UI:PHRASE:FABER:FABER_PLAN:STA_BUFF, 0)" target="sta_icon:active,sta_text:active" />
+                <link expr="ne(@UI:PHRASE:FABER:FABER_PLAN:FOCUS_BUFF, 0)" target="focus_icon:active,focus_text:active" />
                 <!-- Stat Preview -->
                 <vector template="template_mp_faber_stat" id="stat$i" _size="%MAX_STAT_MP_CRAFT" _firstpos="BL TL" _xfirst="0" _yfirst="-6" _nextpos="BL TL" />
             </group>
@@ -444,7 +461,7 @@
             <group id="name_cost" w="120" h="26" posparent="ctrl_phrase" posref="TR TL" x="2" y="-1">
                 <!-- NAME. Get the Name spell -->
                 <view type="text" id="spell_name" posref="TL TL" y="-1" w="120" h="10" shadow="true" fontsize="10" global_color="false" />
-                <link expr="getSPhraseName(@SERVER:EXECUTE_PHRASE:LINK:#index:PHRASE)" target="spell_name:hardtext" />
+                <link expr="getSPhraseName(@SERVER:EXECUTE_PHRASE:LINK:#index:PHRASE)" target="spell_name:uc_hardtext" />
                 <!-- COSTS (HP, SAP, STA) -->
                 <!--
                         <view type="text" id="costs" posparent="spell" posref="BR BL" x="2" y="0" shadow="true" fontsize="8" hardtext="uiLinksCosts" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/player.lua b/ryzom/client/data/gamedev/interfaces_v3/player.lua
index 96dc81962..4a03a2a87 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/player.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/player.lua
@@ -329,7 +329,7 @@ function game:playerTTPvp()
 		elseif(buttonMode==1 and buttonPushed) then
 			text = i18n.get('uittPvPModeTagOnChange');
 		else
-			text = "";
+			text = ucstring();
 		end
 		-- timer
 		if(buttonTimer) then
@@ -338,7 +338,7 @@ function game:playerTTPvp()
 			local tempsString = game:formatTime( pvpServerTagTimer - currentServerTick ); 
 			local timeFmt= i18n.get('uittPvPTagTimer');
 			timeFmt= findReplaceAll(timeFmt, '%temps', tempsString);
-			text= concatString(text, timeFmt);
+			text= concatUCString(text, timeFmt);
 		end
 	end
 
@@ -367,12 +367,12 @@ end
 function game:bonusMalusSetText(ui, slot, fmt)
 	local uiTextGroup= ui["text" .. tostring(slot) ];
 	if(uiTextGroup) then
-		uiTextGroup.shade0.text_format= fmt;
-		uiTextGroup.shade1.text_format= fmt;
-		uiTextGroup.shade2.text_format= fmt;
-		uiTextGroup.shade3.text_format= fmt;
-		uiTextGroup.text.text_format= fmt;
-		uiTextGroup.text2.text_format= fmt;
+		uiTextGroup.shade0.uc_hardtext_format= fmt;
+		uiTextGroup.shade1.uc_hardtext_format= fmt;
+		uiTextGroup.shade2.uc_hardtext_format= fmt;
+		uiTextGroup.shade3.uc_hardtext_format= fmt;
+		uiTextGroup.text.uc_hardtext_format= fmt;
+		uiTextGroup.text2.uc_hardtext_format= fmt;
 	end
 end
 
@@ -822,7 +822,7 @@ function game:setPhraseTooltipCarac(ttWin, name, value, textValue)
 		icon.active = true
 		text.active = true
 		if textValue ~= nil then 			
-			text.text = textValue
+			text.uc_hardtext = textValue
 		else
 			text.hardtext = tostring(value)			
 		end
@@ -835,9 +835,9 @@ function game:timeInSecondsToReadableTime(regenTime)
 	local minutes = math.fmod(math.floor(regenTime / 60), 60)	
 	local hours = math.floor(regenTime / 3600)	
 	local result = ""
-	if seconds > 0 then result = concatString(tostring(seconds), i18n.get("uittSecondsShort"))	end
-	if minutes > 0 then result = concatString(tostring(minutes), i18n.get("uittMinutesShort"), result) end	
-	if hours > 0 then result = concatString(tostring(hours), i18n.get("uittHoursShort"), result) end	
+	if seconds > 0 then result = concatUCString(tostring(seconds), i18n.get("uittSecondsShort"))	end
+	if minutes > 0 then result = concatUCString(tostring(minutes), i18n.get("uittMinutesShort"), result) end	
+	if hours > 0 then result = concatUCString(tostring(hours), i18n.get("uittHoursShort"), result) end	
 	return result	
 end
 
@@ -849,12 +849,15 @@ function game:setPhraseTooltipPowerRegenTime(ttWin, regenTimeInTicks)
 		text.active = false
 	else				
 		text.active = true		
-		text.text_single_line_format = concatString(i18n.get("uittRegenTime"), game:timeInSecondsToReadableTime(math.floor((regenTimeInTicks + 9) * 0.1)))
+		text.uc_hardtext_single_line_format = concatUCString(i18n.get("uittRegenTime"), game:timeInSecondsToReadableTime(math.floor((regenTimeInTicks + 9) * 0.1)))
 		text:invalidateCoords()
 		ttWin:invalidateCoords()
 	end
 end
 
+
+local EmptyUCString = ucstring()
+
 ------------------------------------------------------------------------------------------------------------
 -- called by C++ code when the tooltip of a phrase is about to be displayed
 function game:updatePhraseTooltip(phrase)	
@@ -862,12 +865,12 @@ function game:updatePhraseTooltip(phrase)
 	local ttWin = getUI("ui:interface:action_context_help")
 	local text = phrase:getName()
 	
-	if not text then
-		text = ""
+	if not text or text == EmptyUCString then
+		text = ucstring("")
 	end
 
 	local desc = phrase:getDesc()
-	if desc and desc ~= "" then
+	if desc and desc ~= EmptyUCString then
 		local str = tostring(desc)
 		local charFound = false
 		for k = 1, string.len(str) do
@@ -877,22 +880,22 @@ function game:updatePhraseTooltip(phrase)
 			end
 		end
 		if charFound then
-			text = concatString(text, "\n@{CCCF}", desc)
+			text = concatUCString(text, "\n@{CCCF}", desc)
 		end
 	else
-		text = concatString(text, "@{CCCF}")
+		text = concatUCString(text, "@{CCCF}")
 	end
 	-- IMPORTANT : the following getters on 'phrase' take in account the 'total action malus' for the timebeing 	
 	self:setPhraseTooltipCarac(ttWin, "hp_cost",	phrase:getHpCost())
 	self:setPhraseTooltipCarac(ttWin, "sta_cost",	phrase:getStaCost())
 	self:setPhraseTooltipCarac(ttWin, "sap_cost",	phrase:getSapCost())	
 	self:setPhraseTooltipCarac(ttWin, "focus_cost", phrase:getFocusCost())	
-	self:setPhraseTooltipCarac(ttWin, "cast_time",  phrase:getCastTime(), concatString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds")))
+	self:setPhraseTooltipCarac(ttWin, "cast_time",  phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds")))
 	local castRange = phrase:getCastRange()
 	if not phrase:isMagicPhrase() then
 		castRange = 0
 	end
-	self:setPhraseTooltipCarac(ttWin, "cast_range", castRange, concatString(tostring(castRange), i18n.get("uittMeters")))
+	self:setPhraseTooltipCarac(ttWin, "cast_range", castRange, concatUCString(tostring(castRange), i18n.get("uittMeters")))
 	-- if the phrase is a power / aura, then we may want to display its regen time in the tooltip
 	if phrase:isPowerPhrase() then
 		setOnDraw(ttWin, "game:updatePowerPhraseTooltip()")
@@ -906,7 +909,7 @@ function game:updatePhraseTooltip(phrase)
 		successRateText.active = false
 	else
 		successRateText.active = true
-		successRateText.text_single_line_format = concatString(i18n.get("uittSuccessRate"), tostring(successRate), " %")
+		successRateText.uc_hardtext_single_line_format = concatUCString(i18n.get("uittSuccessRate"), tostring(successRate), " %")
 	end
 
 	local disableTimeText = ttWin:find("disable_time")	
@@ -916,7 +919,7 @@ function game:updatePhraseTooltip(phrase)
 			disableTimeText.active = false
 		else
 			disableTimeText.active = true
-			disableTimeText.text_single_line_format = concatString(i18n.get("uittDisableTime"), game:timeInSecondsToReadableTime(disableTime / 10))
+			disableTimeText.uc_hardtext_single_line_format = concatUCString(i18n.get("uittDisableTime"), game:timeInSecondsToReadableTime(disableTime / 10))
 		end
 	else
 		disableTimeText.active = false
@@ -951,9 +954,9 @@ end
 ------------------------------------------------------------------------------------------------------------
 -- called by C++ code when the tooltip of a buff item is about to be displayed
 function game:updateBuffItemTooltip(buffItem)	
-	local ttWin = getUI("ui:interface:buff_item_context_help")	
+	local ttWin = getUI("ui:interface:buff_item_context_help")
 	local item = buffItem:getItemInfo()
-	local text = buffItem:getName()	
+	local text = buffItem:getName()
 
 	self:setPhraseTooltipCarac(ttWin, "hp_buff", item.HpBuff)
 	self:setPhraseTooltipCarac(ttWin, "sta_buff", item.StaBuff)
@@ -970,7 +973,8 @@ function game:updateBuffItemTooltip(buffItem)
 		ttWin:find("durability_max").hardtext = item.HpMax
 	end
 
-	updateTooltipCoords()	
+	updateTooltipCoords()
+
 	return text
 end
 
@@ -1006,12 +1010,12 @@ function game:updatePhraseFaberPreview(dbPath)
 
 	local name = ui:find("name")
 	if (name ~= nil) then
-		ui:find("name").hardtext = getSheetLocalizedName(sheet)
+		ui:find("name").uc_hardtext = getSheetLocalizedName(sheet)
 	end
 
 	local desc = ui:find("desc")
 	if (desc ~= nil) then
-		ui:find("desc").hardtext = getSheetLocalizedDesc(sheet)
+		ui:find("desc").uc_hardtext = getSheetLocalizedDesc(sheet)
 	end
 end
 
diff --git a/ryzom/client/data/gamedev/interfaces_v3/player.xml b/ryzom/client/data/gamedev/interfaces_v3/player.xml
index 4607d9da9..df1cd74ff 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/player.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/player.xml
@@ -23,11 +23,11 @@
     <proc id="player_active">
         <action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:PLAYER|value=1" />
         <!--  
-<action handler="set" params="target_property=ui:interface:player:char3d:char:anim|value=0" />
-<action handler="set" params="target_property=ui:interface:player:char3d:cam:posz|value=add(0.15,getprop('ui:interface:player:char3d:char:headz'))" />
-<action handler="set" params="target_property=ui:interface:player:char3d:cam:tgtz|value=add(0.15,getprop('ui:interface:player:char3d:char:headz'))" />
-<action handler="anim_start" params="anim=anim_refresh_player" />
--->
+      <action handler="set" params="target_property=ui:interface:player:char3d:char:anim|value=0" />
+      <action handler="set" params="target_property=ui:interface:player:char3d:cam:posz|value=add(0.15,getprop('ui:interface:player:char3d:char:headz'))" />
+      <action handler="set" params="target_property=ui:interface:player:char3d:cam:tgtz|value=add(0.15,getprop('ui:interface:player:char3d:char:headz'))" />
+      <action handler="anim_start" params="anim=anim_refresh_player" />
+    -->
     </proc>
     <proc id="player_cam_position">
         <action handler="set" params="target_property=ui:interface:player:char3d:cam:posz|value=add(0.12,getprop('ui:interface:player:char3d:char:headz'))" />
@@ -240,8 +240,8 @@
         <action id="unseat" name="uimUnmount" handler="beast_order" params="order=unmount|beast_index=@UI:BEAST_SELECTED" icon="mektoub_unmount.tga" />
     </group>
     <!-- temp variable to store the animal selected 
-  0: All animals
-  1 to 5: Pack animals
+        0: All animals
+        1 to 5: Pack animals
 -->
     <variable entry="UI:BEAST_SELECTED" type="sint64" value="0" />
     <group type="container" id="animal_global" w="236" h="96" title="uiAnimalsTitle" opened="true" openable="false" resizer="false" movable="true" active="false" pop_min_h="62" pop_max_h="512" min_w="236" max_w="236" on_active="set" on_active_params="dblink=UI:VARIABLES:ISACTIVE:ANIMAL_GLOBAL|value=1" on_deactive="set" on_deactive_params="dblink=UI:VARIABLES:ISACTIVE:ANIMAL_GLOBAL|value=0" global_color="false" global_color_over="true" header_color="UI:SAVE:WIN:COLORS:ANI" help_page="interf_animals.html">
@@ -261,7 +261,7 @@
         <action handler="set" params="dblink=UI:BEAST_SELECTED|value=@0" />
         <!-- If ALL MENU, display the menu. Only if some animal present -->
         <!-- MAX_INVENTORY_ANIMAL -->
-        <action cond="and(eq(@0,0), or( isAnimalStatusPresent(@%pa_beast0:STATUS), isAnimalStatusPresent(@%pa_beast1:STATUS), isAnimalStatusPresent(@%pa_beast2:STATUS), isAnimalStatusPresent(@%pa_beast3:STATUS) ) )" handler="active_menu" params="menu=ui:interface:animal_menu_all" />
+        <action cond="and(eq(@0,0), or( isAnimalStatusPresent(@%pa_beast0:STATUS), isAnimalStatusPresent(@%pa_beast1:STATUS), isAnimalStatusPresent(@%pa_beast2:STATUS), isAnimalStatusPresent(@%pa_beast3:STATUS), isAnimalStatusPresent(@%pa_beast4:STATUS), isAnimalStatusPresent(@%pa_beast5:STATUS), isAnimalStatusPresent(@%pa_beast6:STATUS) ) )" handler="active_menu" params="menu=ui:interface:animal_menu_all" />
         <!-- If SINGLE MENU, display the menu -->
         <action cond="ne(@0,0)" handler="active_menu" params="menu=ui:interface:animal_menu" />
     </proc>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/player_trade.lua b/ryzom/client/data/gamedev/interfaces_v3/player_trade.lua
new file mode 100644
index 000000000..f80911a10
--- /dev/null
+++ b/ryzom/client/data/gamedev/interfaces_v3/player_trade.lua
@@ -0,0 +1,32 @@
+-- In this file we define functions that serves for player windows
+local base = "ui:interface:player_trade:header_opened";
+local slots = 10; -- Change in local_database.xml, database.xml and NbExchangeSlots on server
+
+------------------------------------------------------------------------------------------------------------
+-- create the game namespace without reseting if already created in an other file.
+if (game==nil) then
+	game= {};
+end
+
+------------------------------------------------------------------------------------------------------------
+-- Update weight and bulk indicator in trade window for receive side
+function game:updateReceiveBulkAndWeight()
+	getUI(base .. ":receive:bulk_txt").hardtext = tostring(getBulk("RECEIVE"));
+	getUI(base .. ":receive:weight_txt").hardtext = tostring(getWeight("RECEIVE"));
+end
+
+-- Update weight and bulk indicator in trade window for give side
+function game:updateGiveBulkAndWeight()
+	getUI(base .. ":give:bulk_txt").hardtext = tostring(getBulk("GIVE"));
+	getUI(base .. ":give:weight_txt").hardtext = tostring(getWeight("GIVE"));
+end
+
+function getWeight(inventory)
+	local weight = runExpr("getItemsWeight('LOCAL:EXCHANGE:"..inventory.."', 0," .. slots .. ")");
+	return math.floor(weight * 100) / 100;
+end
+
+function getBulk(inventory)
+	local bulk = runExpr("getItemsBulk('LOCAL:EXCHANGE:"..inventory.."', 0," .. slots .. ")");
+	return math.floor(bulk * 100) / 100;
+end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml b/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
index ba87a9397..14e6bb347 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
@@ -1,5 +1,6 @@
 <interface_config>
     <root id="interface" x="0" y="0" w="800" h="600" active="true" />
+    <lua file="player_trade.lua" />
     <!-- some initialisations to do when the player trade window is opened -->
     <proc id="open_player_trade">
         <!-- reset the price that the player proposes -->
@@ -35,8 +36,8 @@
         <group type="list_sheet_filter_exchangeable" id="list" posref="TL TL" value="%bag" wspace="2" hspace="2" array="false" x="0" y="0" child_resize_h="true" child_resize_w="true" child_resize_wmargin="4" child_resize_hmargin="4" display_empty_slot="true" squarify="true" onclick_l="put_bag_item_to_exchange" onclick_r="open_help_auto" lmargin="4" rmargin="4" tmargin="4" bmargin="4" column_max="16" auto_grayed="true" maxitem="%max_bag_invslot"></group>
     </group>
     <!-- Interface for trade between players -->
-    <group id="player_trade" type="container" x="400" y="650" w="196" h="417" pop_max_h="438" title="uiTrade2Player" global_color="false" on_active="proc" on_active_params="open_player_trade" active="false" openable="false" opened="true" movable="true" resizer="false" header_color="UI:SAVE:WIN:COLORS:TRADE" escapable="true" on_escape="end_exchange" on_close_button="end_exchange">
-        <group id="header_opened" w="184" h="410" posref="TL TL">
+    <group id="player_trade" type="container" x="258" y="650" w="262" h="407" pop_max_h="428" title="uiTrade2Player" global_color="false" on_active="proc" on_active_params="open_player_trade" active="false" openable="false" opened="true" movable="true" resizer="false" header_color="UI:SAVE:WIN:COLORS:TRADE" escapable="true" on_escape="end_exchange" on_close_button="end_exchange">
+        <group id="header_opened" w="250" h="400" posref="TL TL">
             <!-- 1/ TITLE & INTRO -->
             <!--
                 <view type="text" id="text" posref="TL TL" x="16" y="-8" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiTrade2Player" global_color="false" />
@@ -47,12 +48,32 @@
                                 onclick_l="end_exchange" tooltip="uittClose" />
                 -->
             <!-- 3/ RECEIVING -->
-            <instance template="box_widget" id="receive_back" posref="TM TM" w="184" h="176" x="0" y="-19" />
-            <view type="text" id="receive_text" posref="TL TL" posparent="receive_back" x="4" y="-4" color="255 255 255 255" fontsize="11" shadow="true" hardtext="uiOtherGive" global_color="true" />
-            <group id="receive" posref="TM TM" x="0" y="-18" posparent="receive_back" w="174" h="156">
+            <instance template="box_widget" id="receive_back" posref="TM TM" w="250" h="171" x="0" y="-19" />
+            <view type="text" id="receive_text" posref="TL TL" posparent="receive_back" x="15" y="-14" color="255 255 255 255" fontsize="11" shadow="true" hardtext="uiOtherGive" global_color="true" />
+            <group id="receive" posref="TM TM" x="15" y="-28" posparent="receive_back" w="250" h="146">
+                <!-- Items received (inventories:exchange_proposition in the database) -->
+                <group id="received_items" posref="TL TL" x="0" y="-6" h="86" w="218">
+                    <!-- 10 sheets that can't be drag and dropped -->
+                    <ctrl type="sheet" id="slot0" value="%exchange_receive:0" posparent="parent" posref="TL TL" x="0" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot1" value="%exchange_receive:1" posparent="slot0" posref="TR TL" x="2" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot2" value="%exchange_receive:2" posparent="slot1" posref="TR TL" x="2" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot3" value="%exchange_receive:3" posparent="slot2" posref="TR TL" x="2" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot4" value="%exchange_receive:4" posparent="slot3" posref="TR TL" x="2" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot5" value="%exchange_receive:5" posparent="slot0" posref="BL TL" x="0" y="-2" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot6" value="%exchange_receive:6" posparent="slot5" posref="TR TL" x="2" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot7" value="%exchange_receive:7" posparent="slot6" posref="TR TL" x="2" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot8" value="%exchange_receive:8" posparent="slot7" posref="TR TL" x="2" onclick_r="open_help_auto" />
+                    <ctrl type="sheet" id="slot9" value="%exchange_receive:9" posparent="slot8" posref="TR TL" x="2" onclick_r="open_help_auto" />
+                </group>
                 <!-- Money received -->
-                <view type="text" id="money_r" posref="TL TL" x="0" y="0" color="255 255 255 128" fontsize="10" shadow="true" hardtext="uiMoneyTitle" />
-                <instance template="argent" id="money_received" posref="TL TL" x="0" y="-12" value="%exchange_receive_money" />
+                <instance template="argent" id="money_received" posref="BL TL" x="0" y="-14" w="130" h="16" posparent="received_items" tooltip="uittMoneyTradeOffer" value="%exchange_receive_money" />
+                <view type="text" id="bulk_txt" posref="BR TR" y="-7" x="0" posparent="received_items" color="255 255 255 255" global_color="false" shadow="true" fontsize="10" />
+                <instance template="text_tt" tooltip="uittBulkExchangeReceive" posparent="bulk_txt" />
+                <view type="bitmap" id="bulk" posref="ML MR" x="-4" y="0" scale="true" h="12" w="12" posparent="bulk_txt" texture="animal_inventory.tga" global_color="false" />
+                <view type="text" id="weight_txt" posparent="bulk_txt" posref="BR TR" y="0" x="0" color="255 255 255 255" global_color="false" shadow="true" fontsize="10" />
+                <instance template="text_tt" tooltip="uittWeightExchangeReceive" posparent="weight_txt" />
+                <view type="bitmap" id="weight" posref="ML MR" x="0" y="0" scale="true" h="12" w="12" posparent="weight_txt" texture="W_weight.tga" global_color="false" />
+                <link expr="depends(@%exchange_receive)" action="lua:game:updateReceiveBulkAndWeight()" />
                 <!--
                         <instance template="thunes" id="money_received" posref="TL TL" x="0" y="-12"
                          value_1="%money_offer_from_other:SMALL_SEED"
@@ -61,27 +82,27 @@
                          value_4="%money_offer_from_other:VERY_BIG_SEED"        
                         />
                         -->
-                <!-- Items received (inventories:exchange_proposition in the database) -->
-                <group id="received_items" posref="BL TL" posparent="money_received" x="0" y="-16" h="86" w="174">
-                    <!-- 8 sheets that can't be drag and dropped -->
-                    <ctrl type="sheet" id="slot0" value="%exchange_receive:0" posparent="parent" posref="TL TL" x="0" onclick_r="open_help_auto" />
-                    <ctrl type="sheet" id="slot1" value="%exchange_receive:1" posparent="slot0" posref="TR TL" x="2" onclick_r="open_help_auto" />
-                    <ctrl type="sheet" id="slot2" value="%exchange_receive:2" posparent="slot1" posref="TR TL" x="2" onclick_r="open_help_auto" />
-                    <ctrl type="sheet" id="slot3" value="%exchange_receive:3" posparent="slot2" posref="TR TL" x="2" onclick_r="open_help_auto" />
-                    <ctrl type="sheet" id="slot4" value="%exchange_receive:4" posparent="slot0" posref="BL TL" x="0" y="-2" onclick_r="open_help_auto" />
-                    <ctrl type="sheet" id="slot5" value="%exchange_receive:5" posparent="slot4" posref="TR TL" x="2" onclick_r="open_help_auto" />
-                    <ctrl type="sheet" id="slot6" value="%exchange_receive:6" posparent="slot5" posref="TR TL" x="2" onclick_r="open_help_auto" />
-                    <ctrl type="sheet" id="slot7" value="%exchange_receive:7" posparent="slot6" posref="TR TL" x="2" onclick_r="open_help_auto" />
-                </group>
-                <view type="text" id="items_r" posref="TL BL" posparent="received_items" x="0" y="0" color="255 255 255 128" fontsize="10" shadow="true" hardtext="uiItems" />
             </group>
             <!-- 4/ YOU GIVE -->
-            <instance template="box_widget" id="give_back" posref="BM TM" posparent="receive_back" w="184" h="176" x="0" y="-18" />
-            <view type="text" id="give_text" posref="TL TL" posparent="give_back" x="4" y="-4" color="255 255 255 255" fontsize="11" shadow="true" hardtext="uiPlayerGive" global_color="true" />
-            <group id="give" posref="TM TM" posparent="give_back" x="0" y="-18" w="174" h="156">
+            <instance template="box_widget" id="give_back" posref="BM TM" posparent="receive_back" w="250" h="171" x="0" y="-18" />
+            <view type="text" id="give_text" posref="TL TL" posparent="give_back" x="15" y="-14" color="255 255 255 255" fontsize="11" shadow="true" hardtext="uiPlayerGive" global_color="true" />
+            <group id="give" posref="TM TM" posparent="give_back" x="15" y="-28" w="250" h="156">
+                <!-- Items to give -->
+                <group id="given_items" posref="TL TL" x="0" y="-6" h="86" w="218">
+                    <!-- 10 sheets that can't be drag and dropped -->
+                    <ctrl type="sheet" id="slot0" onclick_r="open_help_auto" value="%exchange_give:0" oncandrop="can_drop_to_exchange" dragable="true" posparent="parent" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TL TL" x="0" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot1" onclick_r="open_help_auto" value="%exchange_give:1" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot0" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot2" onclick_r="open_help_auto" value="%exchange_give:2" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot1" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot3" onclick_r="open_help_auto" value="%exchange_give:3" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot2" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot4" onclick_r="open_help_auto" value="%exchange_give:4" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot3" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot5" onclick_r="open_help_auto" value="%exchange_give:5" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot0" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="BL TL" x="0" y="-2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot6" onclick_r="open_help_auto" value="%exchange_give:6" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot5" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot7" onclick_r="open_help_auto" value="%exchange_give:7" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot6" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot8" onclick_r="open_help_auto" value="%exchange_give:8" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot7" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                    <ctrl type="sheet" id="slot9" onclick_r="open_help_auto" value="%exchange_give:9" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot8" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
+                </group>
                 <!-- Money to give -->
-                <view type="text" id="money_r" posref="TL TL" x="0" y="0" color="255 255 255 128" fontsize="10" shadow="true" hardtext="uiMoneyTitle" />
-                <instance template="argent" id="money_given" posref="TL TL" x="0" y="-12" value="%money_proposal" />
+                <instance template="argent" id="money_given" posref="BL TL" x="0" y="-14" w="130" h="16" posparent="given_items" tooltip="uittMoneyTradeOffer" value="%money_proposal" />
                 <!-- <instance template="thunes" id="money_given" posref="TL TL" x="0" y="-12"
                          value_1="%money_proposal_1"
                          value_2="%money_proposal_2"
@@ -90,24 +111,14 @@
                         />
                         -->
                 <!-- Set money -->
-                <view type="bitmap" id="sep" posparent="money_given" posref="TR TL" x="2" y="-2" scale="true" h="36" w="2" texture="W_line_ver.tga" />
-                <!-- Set money -->
-                <ctrl type="button" id="choose_money" button_type="push_button" posparent="sep" posref="BR BL" y="0" x="4" tx_normal="w_button_edit.tga" tx_pushed="w_button_edit.tga" tx_over="W_button_16_over.tga" onclick_l="enter_modal" params_l="group=ui:interface:money_choose_dialog" tooltip="uittSetMoney" />
-                <!-- Reset money -->
-                <ctrl type="button" id="reset_money" button_type="push_button" posparent="choose_money" posref="TL BL" y="1" x="0" tx_normal="w_button_reset.tga" tx_pushed="w_button_reset.tga" tx_over="W_button_16_over.tga" onclick_l="proc" params_l="reset_money_quantity" tooltip="uittClearMoney" />
-                <!-- Items to give -->
-                <group id="given_items" posref="BL TL" posparent="money_given" x="0" y="-32" h="86" w="174">
-                    <!-- 8 sheets that can't be drag and dropped -->
-                    <ctrl type="sheet" id="slot0" onclick_r="open_help_auto" value="%exchange_give:0" oncandrop="can_drop_to_exchange" dragable="true" posparent="parent" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TL TL" x="0" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
-                    <ctrl type="sheet" id="slot1" onclick_r="open_help_auto" value="%exchange_give:1" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot0" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
-                    <ctrl type="sheet" id="slot2" onclick_r="open_help_auto" value="%exchange_give:2" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot1" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
-                    <ctrl type="sheet" id="slot3" onclick_r="open_help_auto" value="%exchange_give:3" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot2" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
-                    <ctrl type="sheet" id="slot4" onclick_r="open_help_auto" value="%exchange_give:4" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot0" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="BL TL" x="0" y="-2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
-                    <ctrl type="sheet" id="slot5" onclick_r="open_help_auto" value="%exchange_give:5" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot4" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
-                    <ctrl type="sheet" id="slot6" onclick_r="open_help_auto" value="%exchange_give:6" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot5" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
-                    <ctrl type="sheet" id="slot7" onclick_r="open_help_auto" value="%exchange_give:7" oncandrop="can_drop_to_exchange" dragable="true" posparent="slot6" ondrop="proc" params_drop="drop_item" oncannotdrop="put_exchange_item_to_bag" posref="TR TL" x="2" selection_group="inventory_selection" onclick_l="exchange_left_click_on_slot" />
-                </group>
-                <view type="text" id="items_r" posref="TL BL" posparent="given_items" x="0" y="0" color="255 255 255 128" fontsize="10" shadow="true" hardtext="uiItems" />
+                <ctrl type="button" id="choose_money" button_type="push_button" posparent="money_given" posref="BR BL" y="0" x="4" tx_normal="w_button_edit.tga" tx_pushed="w_button_edit.tga" tx_over="W_button_16_over.tga" onclick_l="enter_modal" params_l="group=ui:interface:money_choose_dialog" tooltip="uittSetMoney" />
+                <view type="text" id="bulk_txt" posref="BR TR" y="-7" x="0" posparent="given_items" color="255 255 255 255" global_color="false" shadow="true" fontsize="10" />
+                <instance template="text_tt" tooltip="uittBulkExchangeGive" posparent="bulk_txt" />
+                <view type="bitmap" id="bulk" posref="ML MR" x="-4" y="0" scale="true" h="12" w="12" posparent="bulk_txt" texture="animal_inventory.tga" global_color="false" />
+                <view type="text" id="weight_txt" posparent="bulk_txt" posref="BR TR" y="0" x="0" color="255 255 255 255" global_color="false" shadow="true" fontsize="10" />
+                <instance template="text_tt" tooltip="uittWeightExchangeGive" posparent="weight_txt" />
+                <view type="bitmap" id="weight" posref="ML MR" x="0" y="0" scale="true" h="12" w="12" posparent="weight_txt" texture="W_weight.tga" global_color="false" />
+                <link expr="depends(@%exchange_give)" action="lua:game:updateGiveBulkAndWeight()" />
             </group>
             <!-- 5/ VALIDATIONS -->
             <group id="validation" posparent="receive_back" w="40" h="20" posref="BM TM" x="0" y="1">
@@ -146,7 +157,7 @@
     </group>
     <!-- link to connect the activation of this dialog to the database entry that given the signal to start -->
     <link expr="@%exchange_begun" action="player_trade_start" target="player_trade:active" />
-    <link expr="depends(@%exchange_text)" action="set_server_string" params="value=@%exchange_text|target=ui:interface:player_trade:title" />
+    <link expr="depends(@%exchange_text)" action="set_server_string" params="value=@%exchange_text|target=ui:interface:player_trade:uc_title" />
     <!-- ************************************* -->
     <!-- *  MONEY SELECTION FOR PLAYER TRADE * -->
     <!-- ************************************* -->
@@ -197,7 +208,7 @@
     <!-- init the trade invitation modal box -->
     <proc id="init_invitation_box">
         <!-- set the name of the player that propose the invitation -->
-        <action handler="set_server_string" params="value=@@%other_player_name_id|target=other_player_name:hardtext" />
+        <action handler="set_server_string" params="value=@@%other_player_name_id|target=other_player_name:uc_hardtext" />
     </proc>
     <!-- INVITATION TO TRADE -->
     <!--<group type="modal" id="accept_trade_invitation" posref="MM MM" w="192" h="56"
diff --git a/ryzom/client/data/gamedev/interfaces_v3/r2ed.xml b/ryzom/client/data/gamedev/interfaces_v3/r2ed.xml
index c57500252..6acda139c 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/r2ed.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/r2ed.xml
@@ -569,7 +569,7 @@
                         <group id="mission_tag_label" h="20" w="120" x="0" y="0" posref="TL TL" posparent="parent">
                             <view type="text" id="type_label_text" posref="BL BL" x="0" y="0" color="255 255 255 255" global_color="true" fontsize="12" shadow="true" hardtext="uiR2EDScenarioMissionTag" />
                         </group>
-                        <instance template="edit_box_widget" id="mission_tag_eb" posref="MR ML" x="0" posparent="mission_tag_label" w="200" onenter="lua" negative_filter='' fontsize="12" params="r2.ScenarioWindow:onScenarioMissionTagChanged()" on_focus_lost="lua" on_focus_lost_params="r2.ScenarioWindow:onScenarioMissionTagChanged()" reset_focus_on_hide="true" max_num_chars="32" />
+                        <instance template="edit_box_widget" id="mission_tag_eb" posref="MR ML" x="0" posparent="mission_tag_label" w="200" onenter="lua" negative_filter='"{}[]' fontsize="12" params="r2.ScenarioWindow:onScenarioMissionTagChanged()" on_focus_lost="lua" on_focus_lost_params="r2.ScenarioWindow:onScenarioMissionTagChanged()" reset_focus_on_hide="true" max_num_chars="32" />
                     </group>
                     <ctrl style="text_button_16" id="reset_ed" posparent="mission_tag" posref="BL TL" y="-4" wmargin="8" color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255" onclick_l="lua" params_l="if r2 and r2.acts then r2.acts.deleteOldScenario=true end runCommand('resetEditor')" hardtext="reset editor" />
                     <ctrl style="text_button_16" id="reset_ed_and_reload_ui" posparent="reset_ed" posref="BL TL" y="-4" color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255" onclick_l="lua" params_l="if r2 and r2.acts then r2.acts.deleteOldScenario=true end runCommand('resetEditorAndReloadUI')" hardtext="reset editor and reload ui" />
@@ -651,7 +651,7 @@
     <group type="container" id="r2ed_editbox_test" w="150" title="uiR2EDTableTest" global_color="false" line_at_bottom="false" movable="true" opened="true" openable="false" resizer="true" header_color="UI:SAVE:WIN:COLORS:OPT" pop_min_w="150" pop_min_h="150" pop_max_w="800" pop_max_h="600" active="false">
         <group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL">
             <group id="enclosing" sizeref="wh" w="-16" h="0" posref="TL TL">
-                <instance template="edit_box_widget" text_y="-1" posref="TL TL" sizeref="w" w="-8" fontsize="14" x="0" reset_focus_on_hide="true" negative_filter='' child_resize_hmargin="4" max_historic="0" y="-2" onchange="" onchange_params="" prompt="" enter_loose_focus="true" color="255 255 255 255" onenter="proc" params="" id="eb" text_ref="TL TL" entry_type="text" multi_line="true" max_num_chars="1024" />
+                <instance template="edit_box_widget" text_y="-1" posref="TL TL" sizeref="w" w="-8" fontsize="14" x="0" reset_focus_on_hide="true" negative_filter='"{}[]' child_resize_hmargin="4" max_historic="0" y="-2" onchange="" onchange_params="" prompt="" enter_loose_focus="true" color="255 255 255 255" onenter="proc" params="" id="eb" text_ref="TL TL" entry_type="text" multi_line="true" max_num_chars="1024" />
             </group>
         </group>
     </group>
@@ -925,7 +925,7 @@ text_y="-2"
                 <view type="text" id="name_text" posref="TL TL" x="2" y="0" color="255 255 255 255" global_color="true" fontsize="#fontsize" shadow="true" hardtext="#hardtext" />
             </group>
             <!-- edit box -->
-            <group type="edit_box" id="edit_box_group" sizeref="w" posparent="label" posref="BL TL" x="0" y="-2" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" on_focus_lost="#on_focus_lost" on_focus_lost_params="#on_focus_lost_params" negative_filter='' max_num_chars="#max_num_chars" prompt="" enter_loose_focus="true" entry_type="#entry_type" reset_focus_on_hide="true" menu_r="">
+            <group type="edit_box" id="edit_box_group" sizeref="w" posparent="label" posref="BL TL" x="0" y="-2" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" on_focus_lost="#on_focus_lost" on_focus_lost_params="#on_focus_lost_params" negative_filter='"{}[]' max_num_chars="#max_num_chars" prompt="" enter_loose_focus="true" entry_type="#entry_type" reset_focus_on_hide="true" menu_r="">
                 <instance template="box_widget" id="back_edit_box" posref="TL TL" sizeref="w" h="20" />
                 <view type="text" id="edit_text" x="4" y="-5" posref="TL TL" multi_line="false" fontsize="10" shadow="true" hardtext="" global_color="false" />
             </group>
@@ -1632,7 +1632,7 @@ text_y="-2"
         <action handler="lua" params="r2.setFeatureDisplayHelp()" />
         <action handler="set" params="target='ui:interface:feature_help:active'|value=0" />
     </proc>
-    <group type="container" id="feature_help" w="370" pop_min_w="370" pop_max_w="370" h="550" pop_min_h="550" pop_max_h="550" title="" global_color="false" header_color="UI:SAVE:WIN:COLORS:R2_FEATURE_HELP" title_bar_open="false" open_button="false" force_open_out="true" right_button="false" lockable="true" openable="false" opened="true" movable="true" active="false" savable="true">
+    <group type="container" id="feature_help" w="370" pop_min_w="370" pop_max_w="370" h="550" pop_min_h="550" pop_max_h="550" title="" global_color="false" header_color="UI:SAVE:WIN:COLORS:R2_FEATURE_HELP" uc_title="" title_bar_open="false" open_button="false" force_open_out="true" right_button="false" lockable="true" openable="false" opened="true" movable="true" active="false" savable="true">
         <group id="header_closed" x="0" y="0" child_resize_w="true" h="12" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color"></group>
         <group id="header_opened" x="0" y="0" w="370" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color"></group>
         <group id="content" x="0" y="0" posref="TL TL" w="0" h="0" sizeref="w">
diff --git a/ryzom/client/data/gamedev/interfaces_v3/r2ed_scenario.xml b/ryzom/client/data/gamedev/interfaces_v3/r2ed_scenario.xml
index 9e21ea3a0..3c1cf7395 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/r2ed_scenario.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/r2ed_scenario.xml
@@ -350,7 +350,7 @@
                         <group id="title_label" h="20" w="70" x="0" y="0" posref="TL TL" posparent="parent">
                             <view type="text" id="type_label_text" posref="BL BL" x="0" y="0" color="255 255 255 255" global_color="true" fontsize="12" shadow="true" hardtext="uiR2EDScenarioTitle" />
                         </group>
-                        <instance template="edit_box_widget" id="title_eb" posref="MR ML" x="0" posparent="title_label" w="200" onenter="lua" negative_filter='' fontsize="12" params="r2.ScenarioWindow:onTitleChanged()" on_focus_lost="lua" on_focus_lost_params="r2.ScenarioWindow:onTitleChanged()" reset_focus_on_hide="true" max_num_chars="32" tooltip="uiR2EDScenarioTitleTooltip" tooltip_parent="win" />
+                        <instance template="edit_box_widget" id="title_eb" posref="MR ML" x="0" posparent="title_label" w="200" onenter="lua" negative_filter='"{}[]' fontsize="12" params="r2.ScenarioWindow:onTitleChanged()" on_focus_lost="lua" on_focus_lost_params="r2.ScenarioWindow:onTitleChanged()" reset_focus_on_hide="true" max_num_chars="32" tooltip="uiR2EDScenarioTitleTooltip" tooltip_parent="win" />
                     </group>
                     <!-- SCENARIO NOTES  -->
                     <group id="scenario_notes" x="0" y="-15" sizeparent="parent" sizeref="wh" w="0" h="-270" posparent="title" posref="BL TL">
@@ -361,7 +361,7 @@
                             <instance template="box_widget" id="back" sizeref="wh" w="0" h="0" />
                         </group>
                         <group id="crop_desc" posparent="back_small_description" posref="TL TL" x="4" y="-4" sizeref="wh" w="-4" h="-12" />
-                        <group type="edit_box" id="small_description" posparent="crop_desc" posref="TL TL" x="0" y="0" sizeref="w" negative_filter='' child_resize_h="true" w="-15" child_resize_hmargin="10" max_sizeparent="crop_desc" max_sizeref="h" max_h="-4" want_return="true" on_focus_lost="lua" on_focus_lost_params="r2.ScenarioWindow:setScenarioNotes() r2.ScenarioWindow:cancelFocusOnText()" max_num_bytes="255" max_num_return="20">
+                        <group type="edit_box" id="small_description" posparent="crop_desc" posref="TL TL" x="0" y="0" sizeref="w" negative_filter='"{}[]' child_resize_h="true" w="-15" child_resize_hmargin="10" max_sizeparent="crop_desc" max_sizeref="h" max_h="-4" want_return="true" on_focus_lost="lua" on_focus_lost_params="r2.ScenarioWindow:setScenarioNotes() r2.ScenarioWindow:cancelFocusOnText()" max_num_chars="256" max_num_return="20">
                             <view type="text" id="edit_text" x="4" y="-1" posref="TL TL" multi_line="true" fontsize="12" shadow="true" hardtext="" global_color="false" />
                         </group>
                         <ctrl style="skin_scroll" id="small_description_scroll" align="B" target="small_description" posparent="crop_desc" posref="TR TL" x="-12" y="0" />
@@ -445,7 +445,7 @@
                                 <instance template="box_widget" id="back" sizeref="wh" w="0" h="0" />
                             </group>
                             <group id="crop_desc" posparent="back_small_description" posref="TL TL" x="4" y="-4" sizeref="wh" w="-4" h="-12" />
-                            <group type="edit_box" id="small_description" posparent="crop_desc" posref="TL TL" x="0" y="0" sizeref="w" child_resize_h="true" w="-15" child_resize_hmargin="10" max_sizeparent="crop_desc" max_sizeref="h" max_h="-4" want_return="true" max_num_bytes="255" max_num_return="20" onenter="" params="" on_focus_lost="lua" on_focus_lost_params="r2.ScenarioWindow:setActNotes() r2.ScenarioWindow:cancelFocusOnText()">
+                            <group type="edit_box" id="small_description" posparent="crop_desc" posref="TL TL" x="0" y="0" sizeref="w" child_resize_h="true" w="-15" child_resize_hmargin="10" max_sizeparent="crop_desc" max_sizeref="h" max_h="-4" want_return="true" max_num_chars="256" max_num_return="20" onenter="" params="" on_focus_lost="lua" on_focus_lost_params="r2.ScenarioWindow:setActNotes() r2.ScenarioWindow:cancelFocusOnText()">
                                 <view type="text" id="edit_text" x="4" y="-1" posref="TL TL" multi_line="true" fontsize="12" shadow="true" hardtext="" global_color="false" />
                             </group>
                             <ctrl style="skin_scroll" id="small_description_scroll" align="B" target="small_description" posparent="crop_desc" posref="TR TL" x="-12" y="0" />
@@ -467,7 +467,7 @@
     </group>
     <!-- modal to choose quantity for plot items -->
     <group type="modal" id="r2ed_choose_plot_item_quantity" exit_click_out="true" posref="TL TL" w="155" h="80" options="skin_modal" on_enter="lua" on_enter_params="r2.DMGift:onValidateQuantity()">
-        <view type="text" id="text" posref="TL TL" x="4" y="-4" color="255 255 255 255" fontsize="12" shadow="true" global_color="false" hardtext="SELECT QUANTITY" />
+        <view type="text" id="text" posref="TL TL" x="4" y="-4" color="255 255 255 255" fontsize="12" shadow="true" global_color="false" hardtext="uiSelectQuantity" />
         <ctrl type="sheet" id="sheet" onclick_r="open_help_auto" value="LOCAL:R2:CURR_PLOT_ITEM" posref="MM MM" x="-26" y="0" use_quantity="false" use_quality="false" />
         <view type="text" id="x" posparent="sheet" posref="MR MM" x="8" y="0" color="255 255 255 255" fontsize="12" shadow="true" hardtext="X" />
         <instance template="edit_box_widget" id="edit" entry_type="positive_integer" text_ref="TR TR" text_y="-1" fontsize="12" posparent="sheet" posref="MR ML" x="16" y="0" text_x="-2" w="32" prompt="" enter_loose_focus="false" multi_line="false" max_num_chars="3" onenter="lua" params="r2.DMGift:onValidateQuantity()" max_historic="0" />
@@ -499,7 +499,7 @@
         </group>
     </group>
     <!-- title update -->
-    <link expr="depends(@%dm_gift_text)" action="set_server_string" params="value=@%dm_gift_text|target=ui:interface:r2ed_dm_gift:title" />
+    <link expr="depends(@%dm_gift_text)" action="set_server_string" params="value=@%dm_gift_text|target=ui:interface:r2ed_dm_gift:uc_title" />
     <tree node="r2ed_dm_gift"></tree>
     <group type="container" id="r2ed_scenario_filter" title="uiR2EDScenarioFilters" global_color="false" line_at_bottom="false" movable="true" active="false" opened="true" openable="false" resizer="true" header_color="UI:SAVE:WIN:COLORS:R2_SCENARIO_FILTER" on_close="" on_close_params="" on_deactive="" on_deactive_params="" pop_min_w="300" pop_min_h="270" w="300" h="270" pop_max_w="300" pop_max_h="270">
         <group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL">
diff --git a/ryzom/client/data/gamedev/interfaces_v3/reset.xml b/ryzom/client/data/gamedev/interfaces_v3/reset.xml
index d2992b250..0bce5329b 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/reset.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/reset.xml
@@ -451,7 +451,7 @@
         <!-- ************ -->
         <!--     MISC     -->
         <!-- ************ -->
-        <action handler="lua" params="getUI('ui:interface:keys').title = i18n.get('uiKeysTitle')" />
+        <action handler="lua" params="getUI('ui:interface:keys').uc_title = i18n.get('uiKeysTitle')" />
         <action handler="lua" params="local w = getUI('ui:interface:r2ed_toolbar_window', false) if w then w.active = (r2~=nil and r2.Mode~=nil and r2.Mode=='Test') end" />
         <!-- reenable missions, possibly hidden after a ring session -->
         <action handler="lua:game:updateMissionJournalMode()" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/ring_access_point.lua b/ryzom/client/data/gamedev/interfaces_v3/ring_access_point.lua
index 92573ef38..ca04561f1 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/ring_access_point.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/ring_access_point.lua
@@ -200,7 +200,7 @@ end
 --***********************************************************************
 function RingAccessPoint:initScenarioTypes()
 	for k = 0, 6 do		
-		self.ScenarioTypeToUtf8[k] = i18n.get("uiRAP_ST_" .. tostring(k))		
+		self.ScenarioTypeToUtf8[k] = i18n.get("uiRAP_ST_" .. tostring(k)):toUtf8()		
 	end
 end
 
@@ -227,33 +227,38 @@ function RingAccessPoint:getColumn(name)
 	return getUI("ui:interface:ring_sessions:content:main:enclosing:columns:getw:column_group:" .. name .. ":values")
 end
 
+
 --***********************************************************************
 function RingAccessPoint:getSelectList()
 	return getUI("ui:interface:ring_sessions:content:main:enclosing:columns:getw:select")
 	--return getUI("ui:interface:checkpass:content:enclosing:select")
 end
 
+
+local scratchUCStr = ucstring()
+
 --***********************************************************************
 function RingAccessPoint:newTemplate(name, cache)	
 	local group
-	if #cache ~= 0 then
-		group = cache[#cache]
-		table.remove(cache, #cache)
+	if table.getn(cache) ~= 0 then
+		group = cache[table.getn(cache)]
+		table.remove(cache, table.getn(cache))
 	else		
 		group = createGroupInstance(name, "", {})	
 	end
 	return group
 end
 
-local lineFeed = "\n"
-local lineEnd = ". "
+local lineFeed = ucstring("\n")
+local lineEnd = ucstring(". ")
 
 --***********************************************************************
 -- build a new text group from utf8 text
 function RingAccessPoint:newTextLabel(value)				
 	local group = self:newTemplate("rap_text", self.TextCache)
-	local str = findReplaceAll(value, lineFeed, lineEnd)
-	group:find("t").text_single_line_format = str
+	scratchUCStr:fromUtf8(value)
+	scratchUCStr = findReplaceAll(scratchUCStr, lineFeed, lineEnd)
+	group:find("t").uc_hardtext_single_line_format = scratchUCStr
 	return group
 end
 
@@ -261,14 +266,15 @@ end
 -- build a new text group from utf8 text
 function RingAccessPoint:newCenteredTextLabel(value)				
 	local group = self:newTemplate("rap_text_centered", self.CenteredTextCache)
-	group:find("t").text_single_line_format = value
+	scratchUCStr:fromUtf8(value)
+	group:find("t").uc_hardtext_single_line_format = scratchUCStr
 	return group
 end
 
 --***********************************************************************
 function RingAccessPoint:newNumberLabel(value)	
 	local group = self:newTemplate("rap_number", self.NumberCache)
-	group:find("t").text_single_line_format = tostring(value)
+	group:find("t").uc_hardtext_single_line_format = tostring(value)
 	return group
 end
 
@@ -318,7 +324,7 @@ function RingAccessPoint:addLine(line)
 	
 	local level = line.Level-1
 	if level >= 0 and level <= 5 then
-		self:getColumn("level"):addChild(self:newNumberLabel(i18n.get("uiRAP_Level" .. tostring(level))))
+		self:getColumn("level"):addChild(self:newNumberLabel(i18n.get("uiRAP_Level" .. tostring(level)):toUtf8()))
 	else
 		self:getColumn("level"):addChild(self:newNumberLabel("?"))
 	end
@@ -327,7 +333,7 @@ function RingAccessPoint:addLine(line)
 	if self.LangToTex[line.Language] ~= nil then
 		self:getColumn("language"):addChild(self:newBitmap(self.LangToTex[line.Language]))
 	elseif i18n.hasTranslation("uiR2ED" .. line.Language) then
-		self:getColumn("language"):addChild(self:newCenteredTextLabel(i18n.get("uiR2ED" .. line.Language)))
+		self:getColumn("language"):addChild(self:newCenteredTextLabel(i18n.get("uiR2ED" .. line.Language):toUtf8()))
 	else
 		self:getColumn("language"):addChild(self:newCenteredTextLabel(line.Language))
 	end		
@@ -455,10 +461,10 @@ function RingAccessPoint:fill(list)
 	self:putInCache()
 	--
 	--	("***********************")
-	--debugInfo("TextCache size =  " .. #self.TextCache)
-	--debugInfo("CenteredTextCache size =  " .. #self.CenteredTextCache)
-	--debugInfo("NumberCache size =  " .. #self.NumberCache)
-	--debugInfo("BitmapCache size =  " .. #self.BitmapCache)	
+	--debugInfo("TextCache size =  " .. table.getn(self.TextCache))
+	--debugInfo("CenteredTextCache size =  " .. table.getn(self.CenteredTextCache))
+	--debugInfo("NumberCache size =  " .. table.getn(self.NumberCache))
+	--debugInfo("BitmapCache size =  " .. table.getn(self.BitmapCache))	
 	--self:clear()
 	self.CurrList = list
 	self.CurrActiveList = {}
@@ -521,7 +527,7 @@ function RingAccessPoint:setMessage(msg, color)
 	-- The version below set the msg in the middle of the window
 	--local errorTxt = self:getWindow():find("errorMsg")
 
-	errorTxt.text = msg
+	errorTxt.uc_hardtext = msg
 	errorTxt.color = color
 	errorTxt.active=true
 	--self:getWindow():invalidateCoords()
@@ -549,7 +555,7 @@ end
 function RingAccessPoint:sort(list)
 	local sortDir = self.SortDir			
 	local function sorter(lhs, rhs)
-		for k = 1, #sortDir do
+		for k = 1, table.getn(sortDir) do
 			if lhs[sortDir[k].Var] ~= rhs[sortDir[k].Var] then
 				if sortDir[k].Up then
 					return not sortDir[k].Cmp(lhs[sortDir[k].Var], rhs[sortDir[k].Var])					
@@ -571,7 +577,7 @@ function RingAccessPoint:headerLeftClick(down, criterion)
 	parent.tup.active = not down		
 	-- insert 		
 	local sortDir = self.SortDir
-	for k = 1, #sortDir do
+	for k = 1, table.getn(sortDir) do
 		if sortDir[k].Var == criterion then			
 			sortDir[k].Up = not sortDir[k].Up			
 			table.insert(sortDir, 1, sortDir[k])			
@@ -625,20 +631,20 @@ function RingAccessPoint:onLineSessionTooltip()
 	local activeLine = self.CurrActiveList[self:getSelectList():getElementIndex(getUICaller().parent) + 1]
 	local contextHelpText
 	if self:isInvited(activeLine.Flags) then
-		contextHelpText = i18n.get("uiRAP_HowToJoin")
+		contextHelpText = i18n.get("uiRAP_HowToJoin"):toUtf8()
 	else
-		contextHelpText = i18n.get("uiRAP_HowToBeInvited")
+		contextHelpText = i18n.get("uiRAP_HowToBeInvited"):toUtf8()
 	end
 
 	local desc = activeLine.Desc
 	if desc=="" then desc="-" end
-	contextHelpText = contextHelpText .. "\n\n@{6F6F}" .. i18n.get("uiR2EDProp_LoadScenario_Description") .. " : @{FFFF}" .. desc .. "\n\n"
+	contextHelpText = contextHelpText .. "\n\n@{6F6F}" .. i18n.get("uiR2EDProp_LoadScenario_Description"):toUtf8() .. " : @{FFFF}" .. ucstring(desc):toUtf8() .. "\n\n"
 
-	local rateFun =			"@{6F6F}" .. i18n.get("uiRAP_RateFun") .. " : @{FFFF}"
-	local rateDiff =		"@{6F6F}" .. i18n.get("uiRAP_RateDifficulty") .. " : @{FFFF}"
-	local rateAccess =		"@{6F6F}" .. i18n.get("uiRAP_RateAccessibility") .. " : @{FFFF}"
-	local rateOrig =		"@{6F6F}" .. i18n.get("uiRAP_RateOriginality") .. " : @{FFFF}"
-	local rateDirection =	"@{6F6F}" .. i18n.get("uiRAP_RateDirection") .. " : @{FFFF}"
+	local rateFun =			"@{6F6F}" .. i18n.get("uiRAP_RateFun"):toUtf8() .. " : @{FFFF}"
+	local rateDiff =		"@{6F6F}" .. i18n.get("uiRAP_RateDifficulty"):toUtf8() .. " : @{FFFF}"
+	local rateAccess =		"@{6F6F}" .. i18n.get("uiRAP_RateAccessibility"):toUtf8() .. " : @{FFFF}"
+	local rateOrig =		"@{6F6F}" .. i18n.get("uiRAP_RateOriginality"):toUtf8() .. " : @{FFFF}"
+	local rateDirection =	"@{6F6F}" .. i18n.get("uiRAP_RateDirection"):toUtf8() .. " : @{FFFF}"
 	
 	if activeLine.NbRating>0 then
 		rateFun =		rateFun .. tostring(math.min(100, activeLine.RateFun)) .. "/100"
@@ -647,11 +653,11 @@ function RingAccessPoint:onLineSessionTooltip()
 		rateOrig =		rateOrig ..	tostring(math.min(100, activeLine.RateOriginality)) .. "/100"
 		rateDirection =	rateDirection .. tostring(math.min(100, activeLine.RateDirection)) .. "/100"
 	else
-		rateFun =		rateFun .. i18n.get("uiRAP_NoRate")
-		rateDiff =		rateDiff .. i18n.get("uiRAP_NoRate")	
-		rateAccess =	rateAccess .. i18n.get("uiRAP_NoRate")
-		rateOrig =		rateOrig ..	i18n.get("uiRAP_NoRate")
-		rateDirection =	rateDirection .. i18n.get("uiRAP_NoRate")
+		rateFun =		rateFun .. i18n.get("uiRAP_NoRate"):toUtf8()
+		rateDiff =		rateDiff .. i18n.get("uiRAP_NoRate"):toUtf8()	
+		rateAccess =	rateAccess .. i18n.get("uiRAP_NoRate"):toUtf8()
+		rateOrig =		rateOrig ..	i18n.get("uiRAP_NoRate"):toUtf8()
+		rateDirection =	rateDirection .. i18n.get("uiRAP_NoRate"):toUtf8()
 	end
 		
 --	contextHelpText = contextHelpText .. rateFun .. "\n"
@@ -660,7 +666,9 @@ function RingAccessPoint:onLineSessionTooltip()
 --	contextHelpText = contextHelpText .. rateOrig .. "\n"
 --	contextHelpText = contextHelpText .. rateDirection .. "\n"
 
-	setContextHelpText(contextHelpText)
+	local uc_contextHelpText = ucstring()
+	uc_contextHelpText:fromUtf8(contextHelpText)
+	setContextHelpText(uc_contextHelpText)
 end
 
 
@@ -716,9 +724,10 @@ end
 --***********************************************************************
 function RingAccessPoint:onTell()
 	--debugInfo("tell to owner of session" .. self.SelectedSessionId)
-	player = self:getSessionFromId(self.SelectedSessionId).Owner
+	player = ucstring()		
+	player:fromUtf8(self:getSessionFromId(self.SelectedSessionId).Owner)
 	tell(player, i18n.get("uiRAP_AskForInvite"))	
-	displaySystemInfo(concatString(i18n.get("uiRAP_TellSentTo"), player), "BC")	
+	displaySystemInfo(concatUCString(i18n.get("uiRAP_TellSentTo"), player), "BC")	
 end
 
 --***********************************************************************
@@ -906,7 +915,7 @@ function RingAccessPoint:onDraw()
 			--	refreshText.active = false
 			--else			
 			--	refreshText.active = true
-			--	refreshText.text = waitText 
+			--	refreshText.uc_hardtext = waitText 
 			--end
 		end
 	else
diff --git a/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.lua b/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.lua
index 372db9d42..44a0451d7 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.lua
@@ -45,24 +45,24 @@ function game.RingAccessPointFilter:init()
 	local levelCB = filterScenarioWnd:find("level"):find("combo_box")
 	assert(levelCB)
 	levelCB:resetTexts()
-	levelCB:addText(i18n.get("uiScenarioLevel_Any"))
-	levelCB:addText("1-50")
-	levelCB:addText("51-100")
-	levelCB:addText("101-150")
-	levelCB:addText("151-200")
-	levelCB:addText("201-250")
+	levelCB:addText(ucstring(i18n.get("uiScenarioLevel_Any")))
+	levelCB:addText(ucstring("1-50"))
+	levelCB:addText(ucstring("51-100"))
+	levelCB:addText(ucstring("101-150"))
+	levelCB:addText(ucstring("151-200"))
+	levelCB:addText(ucstring("201-250"))
 	levelCB.selection = 0
 
 	local genreCB = filterScenarioWnd:find("genre"):find("combo_box")
 	assert(genreCB)
 	genreCB:resetTexts()
-	genreCB:addText(i18n.get("uiScenarioOrient_Any"))
-	genreCB:addText(i18n.get("uiScenarioOrient_NewbieTraining"))
-	genreCB:addText(i18n.get("uiScenarioOrient_StoryTelling"))
-	genreCB:addText(i18n.get("uiScenarioOrient_Mistery"))
-	genreCB:addText(i18n.get("uiScenarioOrient_HackSlash"))
-	genreCB:addText(i18n.get("uiScenarioOrient_GuildTraining"))
-	genreCB:addText(i18n.get("uiScenarioOrient_Other"))
+	genreCB:addText(ucstring(i18n.get("uiScenarioOrient_Any")))
+	genreCB:addText(ucstring(i18n.get("uiScenarioOrient_NewbieTraining")))
+	genreCB:addText(ucstring(i18n.get("uiScenarioOrient_StoryTelling")))
+	genreCB:addText(ucstring(i18n.get("uiScenarioOrient_Mistery")))
+	genreCB:addText(ucstring(i18n.get("uiScenarioOrient_HackSlash")))
+	genreCB:addText(ucstring(i18n.get("uiScenarioOrient_GuildTraining")))
+	genreCB:addText(ucstring(i18n.get("uiScenarioOrient_Other")))
 	genreCB.selection = 0
 	
 	local name = filterScenarioWnd:find("name"):find("edit_box_group")
@@ -85,10 +85,10 @@ function game.RingAccessPointFilter:getURLParameters()
 	local filterScenarioWnd = self:getWnd()
 	assert(filterScenarioWnd)
 
-	local owner = filterScenarioWnd:find("owner"):find("edit_box_group").input_string	
+	local owner = filterScenarioWnd:find("owner"):find("edit_box_group").uc_input_string	
 	local level = self.LevelToURLParam[filterScenarioWnd:find("level"):find("combo_box").selection]	   
 	local orientation = self.OrientationToURLParam[filterScenarioWnd:find("genre"):find("combo_box").selection]
-	local name = filterScenarioWnd:find("name"):find("edit_box_group").input_string	
+	local name = filterScenarioWnd:find("name"):find("edit_box_group").uc_input_string	
 	local charSlot = getCharSlot()
 
 	local result = string.format("&owner=%s&level=%s&orientation=%s&name=%s&charSlot=%u", encodeURLUnicodeParam(owner), level, orientation, encodeURLUnicodeParam(name), charSlot)
@@ -107,12 +107,12 @@ function game.RingAccessPointFilter:validate()
 	end
    local ucUrl
    if config.Local == 1 then
-			ucUrl = NicoMagicURL -- for test in local mode				
+			ucUrl = ucstring(NicoMagicURL) -- for test in local mode				
    else
          ucUrl = getDynString(game.NpcWebPage.UrlTextId)
    end	
    debugInfo(tostring(ucUrl))
-	local utf8Url = ucUrl	
+	local utf8Url = ucUrl:toUtf8()	
 	local browser = getUI("ui:interface:npc_web_browser"):find("html")
 	-- when in ring mode, add the parameters ourselves. 60 second is the timout for zope....
 	browseNpcWebPage(getUIId(browser), utf8Url .. self:getURLParameters(), false, 60)
diff --git a/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml b/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml
index d8f2be83f..dbd9e21b9 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml
@@ -307,7 +307,7 @@
     <tree node="ring_chars_tracking" />
     <group type="modal" id="invite_character" exit_click_out="true" posref="MM MR" w="212" child_resize_h="true" child_resize_hmargin="8" options="skin_modal" on_active="" on_active_params="">
         <view type="text" id="text" case_mode="%case_first_word_letter_up" posref="TL TL" x="6" y="-4" color="255 255 255 255" global_color="false" fontsize="14" shadow="true" hardtext="uiPeopleAddContact" />
-        <instance template="edit_box_widget" id="add_contact_eb" posref="TL TL" x="6" y="-24" child_resize_h="true" w="200" onenter="add_contact" max_num_bytes="255" entry_type="playername" />
+        <instance template="edit_box_widget" id="add_contact_eb" posref="TL TL" x="6" y="-24" child_resize_h="true" w="200" onenter="add_contact" max_num_chars="255" entry_type="playername" />
         <instance template="button_ok_cancel" posparent="add_contact_eb" posref="BR TR" x="0" y="-4" onclick_ok="r2ed_invite_character" onclick_ok_param="" onclick_cancel="leave_modal" onclick_cancel_param="" />
     </group>
     <!-- **************************************************************************************************************** -->
@@ -411,7 +411,7 @@
                                 <instance template="box_widget" id="back" sizeref="wh" w="0" h="0" />
                             </group>
                             <group id="crop_desc" posparent="back_small_description" posref="TL TL" x="4" y="-4" sizeref="wh" w="-20" h="-12" />
-                            <group type="edit_box" id="edit_small_description" posparent="crop_desc" posref="TL TL" x="0" y="0" sizeref="w" child_resize_h="true" w="0" child_resize_hmargin="10" max_sizeparent="crop_desc" max_sizeref="h" max_h="-4" want_return="true" onenter="" params="" on_focus_lost="" on_focus_lost_params="" reset_focus_on_hide="true" max_num_bytes="255">
+                            <group type="edit_box" id="edit_small_description" posparent="crop_desc" posref="TL TL" x="0" y="0" sizeref="w" child_resize_h="true" w="0" child_resize_hmargin="10" max_sizeparent="crop_desc" max_sizeref="h" max_h="-4" want_return="true" onenter="" params="" on_focus_lost="" on_focus_lost_params="" reset_focus_on_hide="true" max_num_chars="256">
                                 <view type="text" id="edit_text" x="4" y="-1" posref="TL TL" multi_line="true" fontsize="12" shadow="true" hardtext="" global_color="false" />
                             </group>
                             <ctrl style="skin_scroll" id="small_description_scroll" align="B" target="edit_small_description" posparent="crop_desc" posref="TR TL" x="5" y="0" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/taskbar.lua b/ryzom/client/data/gamedev/interfaces_v3/taskbar.lua
index 674bd4ca8..0a9533e48 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/taskbar.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/taskbar.lua
@@ -6,10 +6,10 @@ if (game==nil) then
 end
 
 ------------------------------------------------------------------------------------------------------------
--- 
+--
 function game:getMilkoTooltipWithKey(prop, tooltip, tooltip_pushed, name, param)
 	local tt
-	
+
 	-- Check if button is toggled and choose the good tooltip
 	if (prop ~= '' and tooltip_pushed ~= '') then
 		local db = getDbProp(prop)
@@ -21,20 +21,20 @@ function game:getMilkoTooltipWithKey(prop, tooltip, tooltip_pushed, name, param)
 	else
 		tt = tooltip;
 	end
-	
+
 	-- Get key shortcut
 	local text = i18n.get(tt)
 	local key = runExpr('getKey(\'' .. name .. '\',\'' .. param .. '\',1)')
-	
+
 	if (key ~= nil and key  ~= '') then
 		key = ' @{2F2F}(' .. key .. ')'
-		text = concatString(text, key)
+		text = concatUCString(text, key)
 	end
-	
+
 	setContextHelpText(text)
 end
 
 function game:taskbarDisableTooltip(ui)
 	local uiGroup = getUI(ui)
 	disableContextHelpForControl(uiGroup)
-end
\ No newline at end of file
+end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml b/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml
index 2485063b8..f6d04089b 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml
@@ -28,7 +28,7 @@
         <!-- the big button is used to restore the current specific mode -->
         <ctrl type="button" id="#id" button_type="radio_button" posparent="#posparent" x="#x" y="#y" posref="#posref" tx_normal="#texture" tx_pushed="#texture" tx_over="W_button_28_over.tga" color="255 255 255 128" col_pushed="255 255 255 255" click_when_pushed="true" onclick_l="proc" params_l="tb_setdesktop|#desk_value" global_color_pushed="false" onlongclick_l="proc" params_longclick_l="tb_open_gestion_windows" />
         <!-- the arrow button open a modal to select the new specific mode -->
-        <!--<ctrl type="button" id="arrow_up#id" button_type="push_button" posparent="#id" posref="TR TL" y="0" 
+        <!--<ctrl type="button" id="arrow_up#id" button_type="push_button" posparent="#id" posref="TR TL" y="0"
                                                                                 tx_normal="W_mode_choice.tga" tx_pushed="W_mode_choice.tga" tx_over="W_button_mode_over.tga"
                                                                                 color="255 255 255 128" col_pushed="255 255 255 255"
                                                                                 onclick_l="enter_modal" params_l="group=#onlist_modal" />-->
@@ -61,11 +61,6 @@
         <action handler="reselect_character" />
         <action handler="leave_modal" />
     </proc>
-    <proc id="quit_dialog_launch_editor">
-        <action handler="leave_modal" />
-        <!-- must leave modal first because 'launch game' may pop a message box in some cases if patching was uncomplete -->
-        <action handler="launch_game" params="slot=ingame_auto|edit_mode=1" />
-    </proc>
     <!-- the modal (formerly: h="60") -->
     <define id="quit_button_delta_y" value="-4" />
     <group type="modal" id="quit_dialog" exit_click_out="false" mouse_pos="false" posref="MM MM" child_resize_w="true" child_resize_wmargin="16" child_resize_h="true" child_resize_hmargin="16" win_priority="%win_priority_highest" on_enter="proc" options="skin_modal" y="20" on_enter_params="quit_dialog_ryzom" on_active="configure_quit_dialog_box" on_active_params="">
@@ -403,7 +398,7 @@
         <!-- Ring -->
         <!--
         <instance template="mk_icon_text" id="sys8" hardtext="uiMk_interaction8" posparent="sys7" posref="BL TL"
-                onclick_l="show_hide" params_l="r2ed_ring_window" tooltip="uiMk_interaction8" 
+                onclick_l="show_hide" params_l="r2ed_ring_window" tooltip="uiMk_interaction8"
                 tx_normal="tb_ring_window.tga" tx_pushed="tb_ring_window.tga" c="%color_yellow"/>
                 -->
     </group>
@@ -420,6 +415,11 @@
         <instance template="mk_icon_text" id="sys5" hardtext="uiMk_system5" posparent="sys4" posref="BL TL" onclick_l="show_hide" params_l="connection" tooltip="uiMk_system5" tx_normal="tb_connection.tga" tx_pushed="tb_connection.tga" c="%color_beige" />
         <!-- Mp3 player -->
         <instance template="mk_icon_text" id="sys6" hardtext="uiMk_system6" posparent="sys5" posref="BL TL" onclick_l="show_hide" params_l="mp3_player" tooltip="uiMk_system6" tx_normal="mp3.tga" tx_pushed="mp3.tga" c="%color_beige" />
+        <!-- Background downloader
+        <instance template="mk_icon_text" id="sys7" hardtext="uiMk_system8" posparent="sys6" posref="BL TL"
+                onclick_l="show_hide" params_l="bg_downloader" tooltip="uiMk_system8"
+                tx_normal="bg_downloader.tga" tx_pushed="bg_downloader.tga" c="%color_beige" />
+         -->
     </group>
     <group style="mk_sub_menu" id="milko_help" modal_parent="milko_pad" child_resize_h="true" child_resize_hmargin="8">
         <!-- Help -->
@@ -444,8 +444,8 @@
         <view type="bitmap" id="#id" posparent="#posparent" x="#x" y="#y" posref="#posref" texture="w_slot_win_menu.tga" />
         <view type="bitmap" id="back#id" posparent="#id" x="1" y="0" posref="ML ML" texture="M_back.tga" global_color="false" />
         <!--
-                <ctrl type="button" id="icon#id" button_type="toggle_button" posparent="#id" x="1" y="0" posref="ML ML" 
-                                                                                tx_normal="none.tga" tx_pushed="none.tga" tx_over="W_button_32_over.tga" 
+                <ctrl type="button" id="icon#id" button_type="toggle_button" posparent="#id" x="1" y="0" posref="ML ML"
+                                                                                tx_normal="none.tga" tx_pushed="none.tga" tx_over="W_button_32_over.tga"
                                                                                 color="255 255 255 128" col_pushed="255 255 255 255" col_over="255 255 255 255"
                                                                                 global_color_normal="false" global_color_over="true" global_color_pushed="false"
                                                                                 click_when_pushed="true" onclick_l="proc" params_l="wlm_active#nb" />
@@ -469,7 +469,7 @@
     <template name="win_button" id="" posparent="parent" posref="TL TL" x="0" y="0" sizeref="w" w="0" h="14" pushflag="" win_name="">
         <group id="#id" sizeref="w" w="0" h="14" x="#x" y="#y" posref="#posref" posparent="#posparent">
             <ctrl type="button" id="but" button_type="toggle_button" x="8" y="0" posref="ML ML" tx_normal="W_slot_on.tga" tx_pushed="W_opacity_on.tga" color="#color" col_pushed="#color" col_over="#color" global_color_normal="false" global_color_over="false" global_color_pushed="false" click_when_pushed="true" onclick_l="show_hide" params_l="#win_name" />
-            <view type="text_formated" id="text" posparent="but" posref="MR ML" x="4" y="-3" fontsize="11" global_color="false" color="#color" shadow="true" format="#text" />
+            <view type="text" id="text" posparent="but" posref="MR ML" x="4" y="-3" fontsize="11" global_color="false" color="#color" shadow="true" hardtext="#text" />
             <view type="text" id="key" posref="MR MR" x="-8" y="-2" fontsize="8" global_color="false" color="#color" shadow="true" hardtext="uiNotAssigned" />
             <link expr="@#pushflag" target="but:pushed" />
             <link expr="ifthenelse(eq(@#pushflag,1), makeRGB(255,255,255), intToColor(@#color))" target="text:color_rgba,key:color_rgba" />
@@ -480,7 +480,7 @@
         <group id="#id" sizeref="w" w="0" h="14" x="#x" y="#y" posref="#posref" posparent="#posparent">
             <view type="bitmap" id="back" x="8" texture="W_slot_on.tga" color="#color_grayed" posref="ML ML" global_color="false" />
             <ctrl type="button" id="but" button_type="toggle_button" x="8" y="0" posref="ML ML" active="false" tx_normal="W_slot_on.tga" tx_pushed="W_opacity_on.tga" color="#color" col_pushed="#color" col_over="#color" global_color_normal="false" global_color_over="false" global_color_pushed="false" click_when_pushed="true" onclick_l="show_hide" params_l="#win_name" />
-            <view type="text_formated" id="text" posparent="back" posref="MR ML" x="4" y="-3" fontsize="11" global_color="false" color="#color_grayed" shadow="true" format="#text" />
+            <view type="text" id="text" posparent="back" posref="MR ML" x="4" y="-3" fontsize="11" global_color="false" color="#color_grayed" shadow="true" hardtext="#text" />
             <view type="text" id="key" posref="MR MR" x="-8" y="0" fontsize="8" global_color="false" color="#color_grayed" shadow="true" hardtext="CTRL+SHIFT+ALT+NUMPADD" />
             <link expr="@#pushflag" target="but:pushed" />
             <link expr="not(#test_grayed)" target="but:active" />
@@ -519,7 +519,7 @@
             <instance template="win_button" id="invent" color="UI:SAVE:WIN:COLORS:INV" text="uimwInventory" posparent="hands2" posref="BL TL" x="0" y="-4" pushflag="UI:VARIABLES:ISACTIVE:INVENTORY" win_name="inventory" />
             <instance template="win_button" id="action_book" color="UI:SAVE:WIN:COLORS:INV" text="uiPhraseBookTitle" posparent="invent" posref="BL TL" x="0" y="-4" pushflag="UI:VARIABLES:ISACTIVE:ACTIONS" win_name="phrase_book" />
             <instance template="win_button" id="links" color="UI:SAVE:WIN:COLORS:INV" text="uiLinksTitle" posparent="action_book" posref="BL TL" x="0" y="-4" pushflag="UI:VARIABLES:ISACTIVE:LINKS" win_name="links" />
-            <!--    
+            <!--
                 <instance template="win_button" id="defense" color="UI:SAVE:WIN:COLORS:INV" text="uiDefenseTitle" posparent="links" posref="BL TL" x="0" y="-4"
                         pushflag="UI:VARIABLES:ISACTIVE:DEFENSE" win_name="defense" />
                 -->
@@ -537,7 +537,7 @@
                 -->
             <instance template="win_button_grayed" id="guild_forum" color="UI:SAVE:WIN:COLORS:MEM" text="uimwGuildForum" posparent="guild" posref="BL TL" x="0" y="-4" pushflag="UI:VARIABLES:ISACTIVE:GUILD_FORUM" win_name="guild_forum" color_grayed="UI:SAVE:WIN:COLORS:MEM_GRAYED" test_grayed="not(%is_guild_present)" />
             <instance template="win_button_grayed" id="team_list" color="UI:SAVE:WIN:COLORS:MEM" text="uimwTeamList" posparent="guild_forum" posref="BL TL" x="0" y="-4" pushflag="UI:VARIABLES:ISACTIVE:TEAM_LIST" win_name="team_list" color_grayed="UI:SAVE:WIN:COLORS:MEM_GRAYED" test_grayed="not(%is_team_present)" />
-            <!--    
+            <!--
                 <instance template="win_button" id="team_chat" color="UI:SAVE:WIN:COLORS:MEM" text="uimwTeamChat" posparent="team_list" posref="BL TL" x="0" y="-4"
                         pushflag="UI:VARIABLES:ISACTIVE:TEAM_CHAT"              win_name="team_chat" />
                 -->
@@ -584,6 +584,8 @@
             <instance template="win_button" id="connection" color="UI:SAVE:WIN:COLORS:OPT" text="uimwConnection" posparent="macros" posref="BL TL" x="0" y="-4" pushflag="UI:VARIABLES:ISACTIVE:CONNECTION" win_name="connection" />
             <instance template="win_button" id="mp3" color="UI:SAVE:WIN:COLORS:OPT" text="uimwMP3Player" posparent="connection" posref="BL TL" x="0" y="-4" pushflag="UI:VARIABLES:ISACTIVE:MP3PLAYER" win_name="mp3_player" />
             <instance template="win_button" id="mp" color="UI:SAVE:WIN:COLORS:OPT" text="uimwTaskBar" posparent="mp3" posref="BL TL" x="0" y="-4" pushflag="UI:VARIABLES:ISACTIVE:MILKO_PAD" win_name="milko_pad" />
+            <!--            <instance template="win_button" id="bg_downloader" color="UI:SAVE:WIN:COLORS:OPT" text="uimwBGDownloader" posparent="mp3" posref="BL TL" x="0" y="-4"
+                        pushflag="UI:VARIABLES:ISACTIVE:BG_DOWNLOADER" win_name="bg_downloader" /> -->
             <!--<instance template="win_button" id="cosm" color="UI:SAVE:WIN:COLORS:OPT" text="uimwCosmetics" posparent="mp3" posref="BL TL" x="0" y="-4"
                         pushflag="UI:VARIABLES:ISACTIVE:COSMETICS" win_name="cosmetics" />-->
         </group>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/webig.lua b/ryzom/client/data/gamedev/interfaces_v3/webig.lua
index c13e52ec7..2f9ad2781 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/webig.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/webig.lua
@@ -216,8 +216,6 @@ function webig:openUrl(url)
 	getUI("ui:interface:web_transactions"):find("html"):browse(url)
 end
 
---assert(nil, "RELOADABLE SCRIPT")
-
 
 
 
diff --git a/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
index 42f33019f..244072420 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
@@ -226,4 +226,12 @@
             <view type="text" id="text" color="#color_text" global_color="false" fontsize="#fontsize" shadow="#shadow" posref="MM MM" hardtext="#text" />
         </group>
     </template>
+    <template name="title_template" keep="true" color="255 0 0 200" icon="" text="" tooltip="" titleid="" enable="true">
+        <group id="#id" posref="MM MM" w="500" h="25">
+            <view type="bitmap" id="check" overlay="3" active="true" x="9" posref="ML ML" texture="ency_step_slot.tga" color="255 255 255 255" global_color="false" />
+            <view type="bitmap" id="finished" active="true" x="9" posref="ML ML" texture="#icon" color="255 255 255 255" global_color="false" />
+            <ctrl type="button" id="ctrl" button_type="push_button" tooltip="#tooltip" global_color_normal="false" global_color_over="false" global_color_pushed="false" posref="MM MM" x="0" y="0" w="510" h="60" tx_normal="blank.tga" tx_pushed="blank.tga" tx_over="blank.tga" scale="true" color="0 0 0 0" col_over="255 120 0 #enable" col_pushed="255 255 255 #enable" onclick_l="lua" params_l="activeTitle([[#titleid]])" />
+            <view type="text" id="text" x="30" color="#color" global_color="true" fontsize="12" shadow="true" posref="ML ML" hardtext="#text" />
+        </group>
+    </template>
 </interface_config>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index 39e1875b9..140fadbb2 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -4,6 +4,31 @@
 <interface_config>
     <root id="interface" x="0" y="0" w="800" h="600" active="true" />
     <proc id="proc_nothing"></proc>
+    <!-- a text with border -->
+    <template name="bc_border_text" keep="true" posref="TM TM" posparent="parent" x="0" y="-20" w="-4">
+        <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="true" sizeref="w" w="#w">
+            <!--
+                <group id="text" posref="TL TL" x="4" y="-4" child_resize_h="true" sizeref="w" w="-8">
+                        <view type="bitmap" id="bg" sizeref="hw" h="0" w="0" scale="true" texture="W_box_blank.tga"/>
+                        <view type="text_id_formated" format="$t" id="text" textid="#text_id" multi_line="true" fontsize="12" shadow="true" global_color="false"/>
+                </group>
+        -->
+            <!-- the border -->
+            <!--
+                <instance template="thin_bc_border" posparent="text"/>
+                -->
+        </group>
+    </template>
+    <template name="bc_border_text2" keep="true" posref="TM TM" posparent="parent" x="0" y="0" w="-4">
+        <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="true" w="#w">
+            <group id="text" posref="TL TL" x="4" y="-4" child_resize_h="true" sizeref="w" w="-8">
+                <view type="bitmap" id="bg" sizeref="hw" h="0" w="0" scale="true" texture="W_box_blank.tga" />
+                <view type="text_id_formated" format="$t" id="text" textid="#text_id" multi_line="true" fontsize="12" shadow="true" global_color="false" />
+            </group>
+            <!-- the border -->
+            <instance template="thin_bc_border" posparent="text" />
+        </group>
+    </template>
     <!-- template for border inside of a group -->
     <template name="inner_thin_border_group" posparent="parent" keep="true" inherit_gc_alpha="false" posref="BL BL" w="0" h="0">
         <group id="itb" posparent="#posparent" sizeref="hw" w="#w" h="#h" posref="#posref">
@@ -320,16 +345,16 @@
     <!-- *  ITEM MENU * -->
     <!-- ************** -->
     <proc id="move_to_bag">
-        <action handler="move_item" params="to=lists|nblist=1| listsheet0=ui:interface:inventory:content:bag:iil:bag_icons" />
+        <action handler="move_item" params="to=lists|nblist=1|listsheet0=ui:interface:inventory:content:bag:iil:bag_icons" />
     </proc>
     <proc id="move_to_pa">
-        <action handler="move_item" params="to=lists|nblist=1| listsheet0=ui:interface:inventory:content:pa@0:iil:bag_icons" />
+        <action handler="move_item" params="to=lists|nblist=1|listsheet0=ui:interface:inventory:content:pa@0:iil:bag_icons" />
     </proc>
     <proc id="move_to_room">
-        <action handler="move_item" params="to=lists|nblist=1| listsheet0=ui:interface:inventory:content:room:iil:bag_icons" />
+        <action handler="move_item" params="to=lists|nblist=1|listsheet0=ui:interface:inventory:content:room:iil:bag_icons" />
     </proc>
     <proc id="move_to_guild">
-        <action handler="move_item" params="to=lists|nblist=1| listsheet0=ui:interface:inventory:content:guild:iil:bag_icons" />
+        <action handler="move_item" params="to=lists|nblist=1|listsheet0=ui:interface:inventory:content:guild:iil:bag_icons" />
     </proc>
     <!-- item menu when we are in bags (do not modify hierarchy or ids if you do not modify the code) -->
     <group type="menu" id="item_menu_in_bag" extends="base_menu" on_deactive="item_menu_deactivate" on_active="item_menu_check">
@@ -363,7 +388,7 @@
         <separator />
         <action id="destroy" name="uimDestroy" handler="proc" params="destroy_item_proc" icon="r2_toolbar_kill_small.tga" />
         <separator />
-        <action id="item_group" name="uimGroup" />
+        <action id="item_group" name="uimGroup" icon="r2_toolbar_customize_look_small.tga" />
         <!-- Will be activated and populated in code -->
         <group type="menu" id="item_group_menu" extends="base_menu"></group>
     </group>
@@ -641,9 +666,9 @@
     <!-- ********************* -->
     <!-- *  EDIT BOX WIDGET  * -->
     <!-- ********************* -->
-    <template name="edit_box_widget" active="true" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" child_resize_hmargin="0" multi_line="false" x="0" y="0" w="0" h="0" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" enter_loose_focus="true" prompt="&gt;" enter_recover_focus="true" max_num_bytes="0" max_num_chars="255" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="40" fontsize="10" shadow="true" shadow_x="1" shadow_y="1" shadow_color="0 0 0 255" shadow_outline="false" backup_father_container_pos="false" want_return="false" clear_on_escape="false" color="255 255 255 255" continuous_text_update="false" bg_texture="W_box_blank.tga" on_focus_lost="" on_focus_lost_params="" max_float_prec="5" tooltip="" tooltip_parent="" negative_filter="" render_layer="0">
+    <template name="edit_box_widget" active="true" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" child_resize_hmargin="0" multi_line="false" x="0" y="0" w="0" h="0" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" enter_loose_focus="true" prompt="&gt;" enter_recover_focus="true" max_num_chars="255" menu_r="" onchange="" onchange_params="" entry_type="text" keep="true" max_historic="40" fontsize="10" shadow="true" shadow_x="1" shadow_y="1" shadow_color="0 0 0 255" shadow_outline="false" backup_father_container_pos="false" want_return="false" clear_on_escape="false" color="255 255 255 255" continuous_text_update="false" bg_texture="W_box_blank.tga" on_focus_lost="" on_focus_lost_params="" max_float_prec="5" tooltip="" tooltip_parent="" negative_filter="" render_layer="0">
         <group id="#id" active="#active" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="#child_resize_h" child_resize_hmargin="#child_resize_hmargin" sizeref="#sizeref" w="#w" h="#h" render_layer="#render_layer">
-            <group type="edit_box" sizeref="w" w="-8" id="eb" posref="TL TL" x="4" y="-4" child_resize_h="true" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" max_num_bytes="#max_num_bytes" max_num_chars="#max_num_chars" prompt="#prompt" enter_loose_focus="#enter_loose_focus" enter_recover_focus="#enter_recover_focus" entry_type="#entry_type" reset_focus_on_hide="#reset_focus_on_hide" menu_r="#menu_r" max_historic="#max_historic" want_return="#want_return" clear_on_escape="#clear_on_escape" backup_father_container_pos="#backup_father_container_pos" on_focus_lost="#on_focus_lost" on_focus_lost_params="#on_focus_lost_params" max_float_prec="#max_float_prec" tooltip="#tooltip" tooltip_parent="#tooltip_parent" negative_filter="#negative_filter" render_layer="#render_layer">
+            <group type="edit_box" sizeref="w" w="-8" id="eb" posref="TL TL" x="4" y="-4" child_resize_h="true" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" max_num_chars="#max_num_chars" prompt="#prompt" enter_loose_focus="#enter_loose_focus" enter_recover_focus="#enter_recover_focus" entry_type="#entry_type" reset_focus_on_hide="#reset_focus_on_hide" menu_r="#menu_r" max_historic="#max_historic" want_return="#want_return" clear_on_escape="#clear_on_escape" backup_father_container_pos="#backup_father_container_pos" on_focus_lost="#on_focus_lost" on_focus_lost_params="#on_focus_lost_params" max_float_prec="#max_float_prec" tooltip="#tooltip" tooltip_parent="#tooltip_parent" negative_filter="#negative_filter" render_layer="#render_layer">
                 <view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="#bg_texture" inherit_gc_alpha="true" render_layer="#render_layer" />
                 <view id="edit_text" type="text" continuous_update="#continuous_text_update" x="#text_x" y="#text_y" posref="#text_ref" multi_line="#multi_line" multi_line_space="0" fontsize="#fontsize" color="#color" shadow="#shadow" shadow_x="#shadow_x" shadow_y="#shadow_y" shadow_color="#shadow_color" shadow_outline="#shadow_outline" hardtext="" global_color="false" render_layer="#render_layer" />
             </group>
@@ -689,7 +714,7 @@
     <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:SHEET" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:QUANTITY" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:QUALITY" type="sint32" value="0" />
-    <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:USER_COLOR" type="sint32" value="1" />
+    <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:USER_COLOR" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:WEIGHT" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:NAMEID" type="sint32" value="0" />
     <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:INFOVERSION" type="sint32" value="0" />
@@ -698,7 +723,7 @@
     <variable entry="UI:VARIABLES:STACK_SELECTED:DSPSLOT:RM_FABER_STAT_TYPE" type="sint32" value="0" />
     <!-- the modal -->
     <group type="modal" id="stack_dialog" exit_click_out="true" posref="TL TL" w="155" h="80" options="skin_modal" on_enter="proc" on_enter_params="stack_dialog_ok">
-        <view type="text" id="text" posref="TL TL" x="4" y="-4" color="255 255 255 255" fontsize="12" shadow="true" global_color="false" hardtext="SELECT QUANTITY" />
+        <view type="text" id="text" posref="TL TL" x="4" y="-4" color="255 255 255 255" fontsize="12" shadow="true" global_color="false" hardtext="uiSelectQuantity" />
         <ctrl type="sheet" id="sheet" onclick_r="open_help_auto" value="UI:VARIABLES:STACK_SELECTED:DSPSLOT" posref="MM MM" x="-26" y="0" use_quantity="false" />
         <view type="text" id="x" posparent="sheet" posref="MR MM" x="8" y="0" color="255 255 255 255" fontsize="12" shadow="true" hardtext="X" />
         <instance template="edit_box_widget" id="edit" entry_type="positive_integer" text_ref="TR TR" text_y="0" fontsize="12" posparent="sheet" posref="MR ML" x="16" y="0" text_x="-2" w="32" prompt="" enter_loose_focus="false" multi_line="false" max_num_chars="3" onchange="editbox_number" onchange_params="value=UI:VARIABLES:STACK_SELECTED:CUR_QUANTITY|update_text=false" onenter="proc" params="stack_dialog_ok" max_historic="0" />
@@ -959,7 +984,7 @@
     <variable entry="UI:DROP_DESTROY_ITEM:ITEM:SHEET" type="sint64" value="0" />
     <variable entry="UI:DROP_DESTROY_ITEM:ITEM:QUANTITY" type="sint64" value="0" />
     <variable entry="UI:DROP_DESTROY_ITEM:ITEM:QUALITY" type="sint64" value="0" />
-    <variable entry="UI:DROP_DESTROY_ITEM:ITEM:USER_COLOR" type="sint64" value="1" />
+    <variable entry="UI:DROP_DESTROY_ITEM:ITEM:USER_COLOR" type="sint64" value="0" />
     <variable entry="UI:DROP_DESTROY_ITEM:ITEM:LOCKED" type="sint64" value="0" />
     <variable entry="UI:DROP_DESTROY_ITEM:ITEM:WEIGHT" type="sint64" value="0" />
     <variable entry="UI:DROP_DESTROY_ITEM:ITEM:NAMEID" type="sint64" value="0" />
@@ -1203,7 +1228,7 @@
     <variable entry="UI:glob_var:help:$i:QUALITY" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
     <variable entry="UI:glob_var:help:$i:QUANTITY" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
     <variable entry="UI:glob_var:help:$i:SLOT_TYPE" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
-    <variable entry="UI:glob_var:help:$i:USER_COLOR" type="sint32" value="1" size="%MAX_HELP_WINDOW" />
+    <variable entry="UI:glob_var:help:$i:USER_COLOR" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
     <variable entry="UI:glob_var:help:$i:NAMEID" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
     <variable entry="UI:glob_var:help:$i:INFO_VERSION" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
     <variable entry="UI:glob_var:help:$i:ENCHANT" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
@@ -1227,7 +1252,7 @@
         <variable entry="UI:glob_var:help:$i:BUILD_ITEMS:#index:QUALITY" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
         <variable entry="UI:glob_var:help:$i:BUILD_ITEMS:#index:QUANTITY" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
         <variable entry="UI:glob_var:help:$i:BUILD_ITEMS:#index:SLOT_TYPE" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
-        <variable entry="UI:glob_var:help:$i:BUILD_ITEMS:#index:USER_COLOR" type="sint32" value="1" size="%MAX_HELP_WINDOW" />
+        <variable entry="UI:glob_var:help:$i:BUILD_ITEMS:#index:USER_COLOR" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
         <variable entry="UI:glob_var:help:$i:BUILD_ITEMS:#index:NAMEID" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
         <variable entry="UI:glob_var:help:$i:BUILD_ITEMS:#index:INFO_VERSION" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
         <variable entry="UI:glob_var:help:$i:BUILD_ITEMS:#index:ENCHANT" type="sint32" value="0" size="%MAX_HELP_WINDOW" />
@@ -1309,7 +1334,6 @@
                 <!-- Item is in auto mode -->
                 <ctrl type="sheet" id="ctrl_slot" use_slot_type_db_entry="true" nature="auto" value="UI:glob_var:help:#index" posref="TR TR" x="-4" y="-10" use_quantity="true" />
                 <view type="text_id" id="creator" posparent="ctrl_slot" posref="BR TR" y="-2" dynamic_string="false" fontsize="12" />
-                <view type="text" id="creator_header" posparent="creator" posref="ML MR" fontsize="12" hardtext="uiCreatorHeader" active="false" />
                 <!-- the scroll text (with only one text) -->
                 <group id="scroll_text" sizeref="w" posref="TL TL" w="0" y="-6" child_resize_h="true" child_resize_hmargin="8">
                     <instance template="inner_thin_border_group" />
diff --git a/ryzom/server/src/ai_service/doc/doxycfg/doxygen.css b/ryzom/server/src/ai_service/doc/doxycfg/doxygen.css
index e400da42a..5409d71cc 100644
--- a/ryzom/server/src/ai_service/doc/doxycfg/doxygen.css
+++ b/ryzom/server/src/ai_service/doc/doxycfg/doxygen.css
@@ -1,62 +1,62 @@
-a.code { color: #4444EE; font-weight: normal; text-decoration: none; }
-a.coderef { color: #4444EE; font-weight: normal; }
-a:link { color: #0066CC; text-decoration: none; }
-a:visited { color: #436976; text-decoration: none; }
-a.code{ color: #436976; font-weight: normal; text-decoration: none; }
-a.coderef{ color: #436976; font-weight: normal; }
-a.qindex{ font-weight: normal; white-space: nowrap; }
-a.qindex:hover, a.qindexref:hover { background-color: #DDDDFF; text-decoration: none; }
-a.qindexhl, a.qindexrefhl { background-color: #6666CC; color: #FFFFFF; font-weight: bold; text-decoration: none; }
-a.qindexhl:hover, a.qindexrefhl:hover { background-color: #6666CC; text-decoration: none; }
-a.qindexref{ }
-a:hover { color: #B52010; color: #B52010; text-decoration: underline; text-decoration: underline; }
-a.el, a.qindex, a.qindexref, a.el { font-weight: bold; text-decoration: none; }
-/* this is repeated to fix a difference in browser rendering, perhaps should be set for each class of <a> */
-body { background: #FFFFFF; color: #000000; margin-left: 20px; margin-right: 20px; }
-body { background: #FFFFFF; color: #000000; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 70%; margin: 0; }
-caption, a.elref, a.elref, caption { font-weight: bold; }
-div.ah { background-color: #000000; color: #FFFFFF; font-weight: bold; margin-bottom: 3px; margin-top: 3px; }
-div.ah{ background: #000000; color: #FFFFFF; font-weight: bold; margin-bottom: 3px; margin-top: 3px; }
-div.footer{ background: #B0C2D7; border: 1px solid #436976; color: #000000; font-style: normal; margin-top: 5em; padding-bottom: 3px; text-align: center; }
-div.fragment { background-color: #F5F5F5; border: 1px solid #CCCCCC; margin: 4px; padding-left: 4px; width: 98%; }
-div.fragment{ background: #FFFFCC; border: 1px solid #CCCCCC; margin-left: 2em; margin-right: 2em; }
-pre { font-size: 120%; margin:2px 1px 3px 1px; }
-div.groupheader { font-weight: bold; margin-bottom: 6px; margin-left: 16px; margin-top: 12px; }
-div.groupheader{ border-bottom: 1px solid #557E8C; font-weight: bold; margin-bottom: 6px; margin-left: 16px; margin-top: 12px; }
-div.grouptext{ font-style: italic; margin-left: 16px; }
-div.header{ background: #B0C2D7; border: 1px solid #436976; color: #000000; font-style: normal; margin-bottom: 1em; padding-bottom: 3px; padding-left: 10px; text-align: left; text-transform: lowercase; }
-div.header a, div.footer a{ color: #436976; font-weight: bold; white-space: nowrap; }
-div.header a {margin-right: 1em; }
-div.header a:visited, div.footer a:visited { color: #436976; font-weight: bold; }
-div.header a:hover, div.footer a:hover { color: #B52010; font-weight: bold; text-decoration: none; }
-div.index { padding-right: 10px; text-align: right; }
-div.maindox { margin: 2%; width: 96%; }
-div.nav { float: left; }
-div.qindex { background-color: #EEEEFF; border: 4px solid #EEEEFF; margin-bottom: 2px; text-align: center; width: 100%; }
-dl.el { margin-left: -1cm; }
-font.charliteral, span.charliteral { color: #008080; }
-font.comment, span.comment { color: #800000; }
-font.keyword, span.keyword { color: #008000; }
-font.keywordflow, span.keywordflow { color: #E08000; }
-font.keywordtype, span.keywordtype { color: #604020; }
-font.preprocessor, span.preprocessor { color: #806020; }
-font.stringliteral, span.stringliteral { color: #002080; }
-h1{ font-size: 220%; text-align: center; }
-h2{ border-bottom: 2px solid #557E8C; font-size: 170%; }
-hr { border: 1px solid #000000; }
-img.formuladsp { }
-img.formulainl { vertical-align: middle; }
-p.formuladsp { text-align: center; }
-td { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 70%; }
-td.indexkey{ background: #EEEEFF; font-weight: bold; margin: 2px 0px; padding: 2px 10px; }
-td.indexvalue{ background: #EEEEFF; font-style: italic; margin: 2px 0px; padding: 2px 10px; }
-td.md{ font-weight: bold; }
-td.mdname, td.mdname1 { color: #FF9900; font-weight: bold; }
-tr.memlist { background-color: #F0F0F0; }
-ul { list-style-type: square; }
-.mdescleft { background-color: #FAFAFA; border-bottom: 1px none #E0E0E0; border-left: 1px none #E0E0E0; border-right: 1px none #E0E0E0; border-top: 1px none #E0E0E0; margin: 0px; padding-left: 8px; }
-.mdescright { background-color: #FAFAFA; border-bottom: 1px none #E0E0E0; border-left: 1px none #E0E0E0; border-right: 1px none #E0E0E0; border-top: 1px none #E0E0E0; font-style: italic; margin: 0px; padding-bottom: 0px; padding-left: 4px; padding-right: 8px; }
-.mdrow { padding: 8px 20px; }
-.mdtable { background: #EEEEEE; border: 1px solid #CCCCCC; }
-.memitemleft { background-color: #FAFAFA; border-top-color: #FFFFFF; border-top-style: solid; border-top-width: 2px; font-family: Geneva, Arial, Helvetica, sans-serif; font-size: 12px; margin: 4px; padding: 1px 0px 0px 8px; }
-.memitemright { background-color: #FAFAFA; border-top-color: #FFFFFF; border-top-style: solid; border-top-width: 2px; font-family: Geneva, Arial, Helvetica, sans-serif; font-size: 13px; margin: 4px; padding: 1px 0px 0px 8px; }
+a.code { color: #4444EE; font-weight: normal; text-decoration: none; }
+a.coderef { color: #4444EE; font-weight: normal; }
+a:link { color: #0066CC; text-decoration: none; }
+a:visited { color: #436976; text-decoration: none; }
+a.code{ color: #436976; font-weight: normal; text-decoration: none; }
+a.coderef{ color: #436976; font-weight: normal; }
+a.qindex{ font-weight: normal; white-space: nowrap; }
+a.qindex:hover, a.qindexref:hover { background-color: #DDDDFF; text-decoration: none; }
+a.qindexhl, a.qindexrefhl { background-color: #6666CC; color: #FFFFFF; font-weight: bold; text-decoration: none; }
+a.qindexhl:hover, a.qindexrefhl:hover { background-color: #6666CC; text-decoration: none; }
+a.qindexref{ }
+a:hover { color: #B52010; color: #B52010; text-decoration: underline; text-decoration: underline; }
+a.el, a.qindex, a.qindexref, a.el { font-weight: bold; text-decoration: none; }
+/* this is repeated to fix a difference in browser rendering, perhaps should be set for each class of <a> */
+body { background: #FFFFFF; color: #000000; margin-left: 20px; margin-right: 20px; }
+body { background: #FFFFFF; color: #000000; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 70%; margin: 0; }
+caption, a.elref, a.elref, caption { font-weight: bold; }
+div.ah { background-color: #000000; color: #FFFFFF; font-weight: bold; margin-bottom: 3px; margin-top: 3px; }
+div.ah{ background: #000000; color: #FFFFFF; font-weight: bold; margin-bottom: 3px; margin-top: 3px; }
+div.footer{ background: #B0C2D7; border: 1px solid #436976; color: #000000; font-style: normal; margin-top: 5em; padding-bottom: 3px; text-align: center; }
+div.fragment { background-color: #F5F5F5; border: 1px solid #CCCCCC; margin: 4px; padding-left: 4px; width: 98%; }
+div.fragment{ background: #FFFFCC; border: 1px solid #CCCCCC; margin-left: 2em; margin-right: 2em; }
+pre { font-size: 120%; margin:2px 1px 3px 1px; }
+div.groupheader { font-weight: bold; margin-bottom: 6px; margin-left: 16px; margin-top: 12px; }
+div.groupheader{ border-bottom: 1px solid #557E8C; font-weight: bold; margin-bottom: 6px; margin-left: 16px; margin-top: 12px; }
+div.grouptext{ font-style: italic; margin-left: 16px; }
+div.header{ background: #B0C2D7; border: 1px solid #436976; color: #000000; font-style: normal; margin-bottom: 1em; padding-bottom: 3px; padding-left: 10px; text-align: left; text-transform: lowercase; }
+div.header a, div.footer a{ color: #436976; font-weight: bold; white-space: nowrap; }
+div.header a {margin-right: 1em; }
+div.header a:visited, div.footer a:visited { color: #436976; font-weight: bold; }
+div.header a:hover, div.footer a:hover { color: #B52010; font-weight: bold; text-decoration: none; }
+div.index { padding-right: 10px; text-align: right; }
+div.maindox { margin: 2%; width: 96%; }
+div.nav { float: left; }
+div.qindex { background-color: #EEEEFF; border: 4px solid #EEEEFF; margin-bottom: 2px; text-align: center; width: 100%; }
+dl.el { margin-left: -1cm; }
+font.charliteral, span.charliteral { color: #008080; }
+font.comment, span.comment { color: #800000; }
+font.keyword, span.keyword { color: #008000; }
+font.keywordflow, span.keywordflow { color: #E08000; }
+font.keywordtype, span.keywordtype { color: #604020; }
+font.preprocessor, span.preprocessor { color: #806020; }
+font.stringliteral, span.stringliteral { color: #002080; }
+h1{ font-size: 220%; text-align: center; }
+h2{ border-bottom: 2px solid #557E8C; font-size: 170%; }
+hr { border: 1px solid #000000; }
+img.formuladsp { }
+img.formulainl { vertical-align: middle; }
+p.formuladsp { text-align: center; }
+td { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 70%; }
+td.indexkey{ background: #EEEEFF; font-weight: bold; margin: 2px 0px; padding: 2px 10px; }
+td.indexvalue{ background: #EEEEFF; font-style: italic; margin: 2px 0px; padding: 2px 10px; }
+td.md{ font-weight: bold; }
+td.mdname, td.mdname1 { color: #FF9900; font-weight: bold; }
+tr.memlist { background-color: #F0F0F0; }
+ul { list-style-type: square; }
+.mdescleft { background-color: #FAFAFA; border-bottom: 1px none #E0E0E0; border-left: 1px none #E0E0E0; border-right: 1px none #E0E0E0; border-top: 1px none #E0E0E0; margin: 0px; padding-left: 8px; }
+.mdescright { background-color: #FAFAFA; border-bottom: 1px none #E0E0E0; border-left: 1px none #E0E0E0; border-right: 1px none #E0E0E0; border-top: 1px none #E0E0E0; font-style: italic; margin: 0px; padding-bottom: 0px; padding-left: 4px; padding-right: 8px; }
+.mdrow { padding: 8px 20px; }
+.mdtable { background: #EEEEEE; border: 1px solid #CCCCCC; }
+.memitemleft { background-color: #FAFAFA; border-top-color: #FFFFFF; border-top-style: solid; border-top-width: 2px; font-family: Geneva, Arial, Helvetica, sans-serif; font-size: 12px; margin: 4px; padding: 1px 0px 0px 8px; }
+.memitemright { background-color: #FAFAFA; border-top-color: #FFFFFF; border-top-style: solid; border-top-width: 2px; font-family: Geneva, Arial, Helvetica, sans-serif; font-size: 13px; margin: 4px; padding: 1px 0px 0px 8px; }