diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index ce6540915..ca6534931 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -239,14 +239,14 @@ SkinNbMaxPoly_ps1	= 70000;
 SkinNbMaxPoly_ps2	= 100000;
 SkinNbMaxPoly_ps3	= 200000;
 
-NbMaxSkeletonNotCLod		= 50;
+NbMaxSkeletonNotCLod		= 125;
 NbMaxSkeletonNotCLod_min	= 5;
-NbMaxSkeletonNotCLod_max	= 100;
+NbMaxSkeletonNotCLod_max	= 255;
 NbMaxSkeletonNotCLod_step	= 5;
 NbMaxSkeletonNotCLod_ps0	= 10;
-NbMaxSkeletonNotCLod_ps1	= 25;
-NbMaxSkeletonNotCLod_ps2	= 50;
-NbMaxSkeletonNotCLod_ps3	= 100;
+NbMaxSkeletonNotCLod_ps1	= 50;
+NbMaxSkeletonNotCLod_ps2	= 125;
+NbMaxSkeletonNotCLod_ps3	= 255;
 
 CharacterFarClip		= 200.0;
 CharacterFarClip_min	= 50.0;
diff --git a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga
index 14ab1b585..026fada23 100644
Binary files a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga and b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga differ
diff --git a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt
index e8b54e4c0..0927a36e8 100644
--- a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt
+++ b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt
@@ -660,7 +660,8 @@ small_task_generic.tga 0.984375000000 0.515625000000 1.000000000000 0.5312500000
 small_task_guild.tga 0.984375000000 0.531250000000 1.000000000000 0.546875000000
 small_task_rite.tga 0.984375000000 0.546875000000 1.000000000000 0.562500000000
 W_leader.tga 0.984375000000 0.562500000000 0.997070312500 0.574218750000
-tb_mode.tga 0.984375000000 0.574218750000 0.996093750000 0.585937500000
-w_major.tga 0.984375000000 0.585937500000 0.996093750000 0.597656250000
-ge_acc_baniere_em.ps 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+w_major.tga 0.984375000000 0.574218750000 0.996093750000 0.585937500000
+tb_mode.tga 0.984375000000 0.585937500000 0.996093750000 0.597656250000
+profile.tga 0.984375000000 0.597656250000 0.996093750000 0.609375000000
 ge_acc_baniere_em - Copie.ps 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+ge_acc_baniere_em.ps 0.000000000000 0.000000000000 0.000000000000 0.000000000000
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
index 88306afc5..a3f4d49a1 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
@@ -2748,8 +2748,11 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <!-- *             MISC           * -->
   <!-- ****************************** -->
   <variable entry="UI:SAVE:SHOW_CLOCK"
-             type="bool"
-             value="false" />
+            type="bool"
+            value="false" />
+  <variable entry="UI:SAVE:SHOW_RETICLE"
+            type="bool"
+            value="true" />
   <variable entry="UI:VARIABLES:MISSION_SELECTED_PREV_SESSION"
             type="sint32"
             value="-1" />
@@ -2960,12 +2963,18 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:CHAT:COLORS:TELL"
             type="rgba"
             value="170 170 170 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN"
+            type="rgba"
+            value="162 255 173 255" />
   <variable entry="UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
             type="bool"
             value="false" />
   <variable entry="UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
              type="bool"
              value="false" />
+  <variable entry="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
+             type="bool"
+             value="false" />
   <!-- ***************************** -->
   <!-- *    SYSTEM INFO COLORS     * -->
   <!-- ***************************** -->
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
index f15f3adc9..927dacb28 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
@@ -1349,6 +1349,14 @@
                   posparent="cao"
                   x="0"
                   y="-12" />
+        <instance template="tgcw_checkbox"
+                  id="show_reticle"
+                  text="uiShowReticle"
+                  tooltip="uittShowReticle"
+                  posref="BL TL"
+                  posparent="show_clock"
+                  x="0"
+                  y="-12" />
       </group>
       <ctrl style="skin_scroll"
             id="sb_hud"
@@ -1393,6 +1401,7 @@
           <combo_text name="uigcFrancais" />
           <combo_text name="uigcDeutch" />
           <combo_text name="uigcRussian" />
+          <combo_text name="uigcSpanish" />
         </group>
         <link expr="@UI:TEMP:LANGUAGE"
               action="game_config_change_language" />
@@ -1605,14 +1614,23 @@
                   posparent="cc_univ"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn"
+                  text="uiDynColor"
+                  title="uiCCDDyn"
+                  tooltip="uittChooseDynColor"
+                  posref="BL TL"
+                  posparent="cc_shout"
+                  x="0"
+                  y="-4" />
         <instance template="tgcw_checkbox"
                   id="enter_dontquit_cb"
                   text="uiEnterDontQuitCB"
                   tooltip="uittChatEnter"
-                  posparent="cc_univ"
+                  posparent="cc_dyn"
                   posref="BL TL"
                   x="0"
-                  y="-25" />
+                  y="-8" />
         <instance template="tgcw_checkbox"
                   id="show_times_in_chat_cb"
                   text="uiShowTimesInChatCB"
@@ -1621,17 +1639,27 @@
                   posref="BL TL"
                   x="0"
                   y="-8" />
+        <instance template="tgcw_checkbox"
+                  id="show_dyn_channel_name_in_chat_cb"
+                  text="uiShowDynChannelNameInChatCB"
+                  tooltip="uittShowDynChannelNameInChat"
+                  posparent="show_times_in_chat_cb"
+                  posref="BL TL"
+                  x="0"
+                  y="-8" />
         <instance template="tgcw_scrollbarint"
                   id="font_size"
                   text="uiFontSize"
                   posref="BL TL"
-                  posparent="show_times_in_chat_cb"
+                  posparent="show_dyn_channel_name_in_chat_cb"
                   x="0"
                   y="-8" />
         <link expr="@UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
               target="enter_dontquit_cb:c:pushed" />
         <link expr="@UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
               target="show_times_in_chat_cb:c:pushed" />
+        <link expr="@UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
+              target="show_dyn_channel_name_in_chat_cb:c:pushed" />
       </group>
       <ctrl style="skin_scroll"
             id="sb_chat_colors"
@@ -2707,35 +2735,35 @@
                   posref="TL TL"
                   x="0"
                   y="-20" />
-        <instance template="tgcw_color" id="cc_tribe" text="uiLMTribeColor" title="uiCCDLMTribeColor" tooltip="uittChooseLMTribeColor" posref="BL TL" posparent="cc_misc" x="0" y="-16" />
-		<instance template="tgcw_color" id="cc_bandit" text="uiLMBanditColor" title="uiCCDLMBanditColor" tooltip="uittChooseLMBanditColor" posref="BL TL" posparent="cc_tribe" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_citizen" text="uiLMCitizenColor" title="uiCCDLMCitizenColor" tooltip="uittChooseLMCitizenColor" posref="BL TL" posparent="cc_bandit" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_fauna" text="uiLMFaunaColor" title="uiCCDLMFaunaColor" tooltip="uittChooseLMFaunaColor" posref="BL TL" posparent="cc_citizen" x="0" y="-16" />
-		<instance template="tgcw_color" id="cc_faunaexcel" text="uiLMFaunaExcelColor" title="uiCCDLMFaunaExcelColor" tooltip="uittChooseLMFaunaExcelColor" posref="BL TL" posparent="cc_fauna" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_faunasup" text="uiLMFaunaSupColor" title="uiCCDLMFaunaSupColor" tooltip="uittChooseLMFaunaSupColor" posref="BL TL" posparent="cc_faunaexcel" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_forage" text="uiLMForageColor" title="uiCCDLMForageColor" tooltip="uittChooseLMForageColor" posref="BL TL" posparent="cc_faunasup" x="0" y="-16" />
-		<instance template="tgcw_color" id="cc_forageexcel" text="uiLMForageExcelColor" title="uiCCDLMForageExcelColor" tooltip="uittChooseLMForageExcelColor" posref="BL TL" posparent="cc_forage" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_foragesup" text="uiLMForageSupColor" title="uiCCDLMForageSupColor" tooltip="uittChooseLMForageSupColor" posref="BL TL" posparent="cc_forageexcel" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_sap" text="uiLMSapColor" title="uiCCDLMSapColor" tooltip="uittChooseLMSapColor" posref="BL TL" posparent="cc_foragesup" x="16" y="-4" />
-		<instance template="tgcw_color" id="cc_amber" text="uiLMAmberColor" title="uiCCDLMAmberColor" tooltip="uittChooseLMAmberColor" posref="BL TL" posparent="cc_sap" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_node" text="uiLMNodeColor" title="uiCCDLMNodeColor" tooltip="uittChooseLMNodeColor" posref="BL TL" posparent="cc_amber" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_fiber" text="uiLMFiberColor" title="uiCCDLMFiberColor" tooltip="uittChooseLMFiberColor" posref="BL TL" posparent="cc_node" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_bark" text="uiLMBarkColor" title="uiCCDLMBarkColor" tooltip="uittChooseLMBarkColor" posref="BL TL" posparent="cc_fiber" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_seed" text="uiLMSeedColor" title="uiCCDLMSeedColor" tooltip="uittChooseLMSeedColor" posref="BL TL" posparent="cc_bark" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_shell" text="uiLMShellColor" title="uiCCDLMShellColor" tooltip="uittChooseLMShellColor" posref="BL TL" posparent="cc_seed" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_resin" text="uiLMResinColor" title="uiCCDLMResinColor" tooltip="uittChooseLMResinColor" posref="BL TL" posparent="cc_shell" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_wood" text="uiLMWoodColor" title="uiCCDLMWoodColor" tooltip="uittChooseLMWoodColor" posref="BL TL" posparent="cc_resin" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_oil" text="uiLMOilColor" title="uiCCDLMOilColor" tooltip="uittChooseLMOilColor" posref="BL TL" posparent="cc_wood" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_mission" text="uiLMMissionColor" title="uiCCDLMMissionColor" tooltip="uittChooseLMMissionColor" posref="BL TL" posparent="cc_oil" x="-16" y="-16" />
-		<instance template="tgcw_color" id="cc_food" text="uiLMFoodColor" title="uiCCDLMFoodColor" tooltip="uittChooseLMFoodColor" posref="BL TL" posparent="cc_mission" x="16" y="-4" />
-		<instance template="tgcw_color" id="cc_construction" text="uiLMConstructionColor" title="uiCCDLMConstructionColor" tooltip="uittChooseLMConstructionColor" posref="BL TL" posparent="cc_food" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_goo" text="uiLMGooColor" title="uiCCDLMGooColor" tooltip="uittChooseLMGooColor" posref="BL TL" posparent="cc_construction" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_insect" text="uiLMInsectColor" title="uiCCDLMInsectColor" tooltip="uittChooseLMInsectColor" posref="BL TL" posparent="cc_goo" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_kitin" text="uiLMKitinColor" title="uiCCDLMKitinColor" tooltip="uittChooseLMKitinColor" posref="BL TL" posparent="cc_insect" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_nocive" text="uiLMNociveColor" title="uiCCDLMNociveColor" tooltip="uittChooseLMNociveColor" posref="BL TL" posparent="cc_kitin" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_preservative" text="uiLMPreservativeColor" title="uiCCDLMPreservativeColor" tooltip="uittChooseLMPreservativeColor" posref="BL TL" posparent="cc_nocive" x="0" y="-4" />
-		<instance template="tgcw_color" id="cc_passage" text="uiLMPassageColor" title="uiCCDLMPassageColor" tooltip="uittChooseLMPassageColor" posref="BL TL" posparent="cc_preservative" x="-16" y="-16" />
-		<instance template="tgcw_color" id="cc_teleporter" text="uiLMTeleporterColor" title="uiCCDLMTeleporterColor" tooltip="uittChooseLMTeleporterColor" posref="BL TL" posparent="cc_passage" x="0" y="-4" />
+        <instance template="tgcw_color" id="cc_tribe" text="uiLMTribeColor" title="uiCCDLMTribe" tooltip="uittChooseLMTribeColor" posref="BL TL" posparent="cc_misc" x="0" y="-16" />
+		<instance template="tgcw_color" id="cc_bandit" text="uiLMBanditColor" title="uiCCDLMBandit" tooltip="uittChooseLMBanditColor" posref="BL TL" posparent="cc_tribe" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_citizen" text="uiLMCitizenColor" title="uiCCDLMCitizen" tooltip="uittChooseLMCitizenColor" posref="BL TL" posparent="cc_bandit" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_fauna" text="uiLMFaunaColor" title="uiCCDLMFauna" tooltip="uittChooseLMFaunaColor" posref="BL TL" posparent="cc_citizen" x="0" y="-16" />
+		<instance template="tgcw_color" id="cc_faunaexcel" text="uiLMFaunaExcelColor" title="uiCCDLMFaunaExcel" tooltip="uittChooseLMFaunaExcelColor" posref="BL TL" posparent="cc_fauna" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_faunasup" text="uiLMFaunaSupColor" title="uiCCDLMFaunaSup" tooltip="uittChooseLMFaunaSupColor" posref="BL TL" posparent="cc_faunaexcel" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_forage" text="uiLMForageColor" title="uiCCDLMForage" tooltip="uittChooseLMForageColor" posref="BL TL" posparent="cc_faunasup" x="0" y="-16" />
+		<instance template="tgcw_color" id="cc_forageexcel" text="uiLMForageExcelColor" title="uiCCDLMForageExcel" tooltip="uittChooseLMForageExcelColor" posref="BL TL" posparent="cc_forage" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_foragesup" text="uiLMForageSupColor" title="uiCCDLMForageSup" tooltip="uittChooseLMForageSupColor" posref="BL TL" posparent="cc_forageexcel" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_sap" text="uiLMSapColor" title="uiCCDLMSap" tooltip="uittChooseLMSapColor" posref="BL TL" posparent="cc_foragesup" x="16" y="-4" />
+		<instance template="tgcw_color" id="cc_amber" text="uiLMAmberColor" title="uiCCDLMAmber" tooltip="uittChooseLMAmberColor" posref="BL TL" posparent="cc_sap" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_node" text="uiLMNodeColor" title="uiCCDLMNode" tooltip="uittChooseLMNodeColor" posref="BL TL" posparent="cc_amber" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_fiber" text="uiLMFiberColor" title="uiCCDLMFiber" tooltip="uittChooseLMFiberColor" posref="BL TL" posparent="cc_node" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_bark" text="uiLMBarkColor" title="uiCCDLMBark" tooltip="uittChooseLMBarkColor" posref="BL TL" posparent="cc_fiber" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_seed" text="uiLMSeedColor" title="uiCCDLMSeed" tooltip="uittChooseLMSeedColor" posref="BL TL" posparent="cc_bark" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_shell" text="uiLMShellColor" title="uiCCDLMShell" tooltip="uittChooseLMShellColor" posref="BL TL" posparent="cc_seed" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_resin" text="uiLMResinColor" title="uiCCDLMResin" tooltip="uittChooseLMResinColor" posref="BL TL" posparent="cc_shell" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_wood" text="uiLMWoodColor" title="uiCCDLMWood" tooltip="uittChooseLMWoodColor" posref="BL TL" posparent="cc_resin" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_oil" text="uiLMOilColor" title="uiCCDLMOil" tooltip="uittChooseLMOilColor" posref="BL TL" posparent="cc_wood" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_mission" text="uiLMMissionColor" title="uiCCDLMMission" tooltip="uittChooseLMMissionColor" posref="BL TL" posparent="cc_oil" x="-16" y="-16" />
+		<instance template="tgcw_color" id="cc_food" text="uiLMFoodColor" title="uiCCDLMFood" tooltip="uittChooseLMFoodColor" posref="BL TL" posparent="cc_mission" x="16" y="-4" />
+		<instance template="tgcw_color" id="cc_construction" text="uiLMConstructionColor" title="uiCCDLMConstruction" tooltip="uittChooseLMConstructionColor" posref="BL TL" posparent="cc_food" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_goo" text="uiLMGooColor" title="uiCCDLMGoo" tooltip="uittChooseLMGooColor" posref="BL TL" posparent="cc_construction" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_insect" text="uiLMInsectColor" title="uiCCDLMInsect" tooltip="uittChooseLMInsectColor" posref="BL TL" posparent="cc_goo" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_kitin" text="uiLMKitinColor" title="uiCCDLMKitin" tooltip="uittChooseLMKitinColor" posref="BL TL" posparent="cc_insect" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_nocive" text="uiLMNociveColor" title="uiCCDLMNocive" tooltip="uittChooseLMNociveColor" posref="BL TL" posparent="cc_kitin" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_preservative" text="uiLMPreservativeColor" title="uiCCDLMPreservative" tooltip="uittChooseLMPreservativeColor" posref="BL TL" posparent="cc_nocive" x="0" y="-4" />
+		<instance template="tgcw_color" id="cc_passage" text="uiLMPassageColor" title="uiCCDLMPassage" tooltip="uittChooseLMPassageColor" posref="BL TL" posparent="cc_preservative" x="-16" y="-16" />
+		<instance template="tgcw_color" id="cc_teleporter" text="uiLMTeleporterColor" title="uiCCDLMTeleporter" tooltip="uittChooseLMTeleporterColor" posref="BL TL" posparent="cc_passage" x="0" y="-4" />
 
       </group>
       <ctrl style="skin_scroll"
@@ -2977,6 +3005,11 @@
                widget="boolbut"
                link="UI:SAVE:SHOW_CLOCK"
                realtime="true" />
+        <param ui="hud:show_reticle:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:SHOW_RETICLE"
+               realtime="true" />
         <param ui="alpha_colors:col_day:c"
                type="db"
                widget="colbut"
@@ -3062,6 +3095,11 @@
                widget="colbut"
                link="UI:SAVE:CHAT:COLORS:SHOUT"
                realtime="true" />
+        <param ui="chat_colors:cc_dyn:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN"
+               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" />
@@ -3077,6 +3115,11 @@
                widget="boolbut"
                link="UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
                realtime="true" />
+        <param ui="chat_colors:show_dyn_channel_name_in_chat_cb:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
+               realtime="true" />
         <param ui="chat_colors:font_size:c"
                type="db"
                widget="sbint"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
index d8a5105c4..f9d129789 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
@@ -715,7 +715,7 @@
         <group id="guild"
                posref="TL TL"
                sizeref="w"
-               h="12"
+               h="14"
                y="-52">
           <view type="text"
                 id="guild_title"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
index 7d7e88220..0788f82ca 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
@@ -1742,10 +1742,25 @@
               h="0"
               tooltip="uittFriendsOnline"
               tooltip_parent="win" />
+        <ctrl type="button"
+              id="profile_button"
+              button_type="push_button"
+              posref="MR MR"
+              x="-36"
+              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" />
         <view type="bitmap"
               id="blocked"
               posref="MR MR"
-              x="-34"
+              x="-50"
               y="-2"
               texture="w_answer_16_cancel.tga"
               global_color="false"
@@ -3082,8 +3097,7 @@
            pop_min_w="216"
            pop_min_h="96"
            pop_max_w="2000"
-           pop_max_h="1600"
-           active_savable="false">
+           pop_max_h="1600" >
       <group id="header_closed"
              x="0"
              y="0"
@@ -3117,7 +3131,6 @@
                   sizeref="w"
                   w="-10"
                   onenter="chat_box_entry"
-                  reset_focus_on_hide="true"
                   backup_father_container_pos="true" />
         <view type="text"
               id="cant_write_ebw"
@@ -3143,7 +3156,7 @@
     </group>
   </template>
   <!-- those proc have the index in db of the dyn_chat, in parameter @0 -->
-  <proc id="dynamic_chat_proc_deactive">
+  <proc id="dynamic_chat_proc_close">
     <!-- The window is closed by the user, change the associated DB flag -->
     <action handler="set"
             params="dblink=UI:SAVE:ISDETACHED:DYNAMIC_CHAT@0|value=0" />
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml b/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
index 9fd4466f7..2f24561d7 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
@@ -50,7 +50,8 @@
 		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" >
+		auto_grayed="true"
+		maxitem="%max_bag_invslot" >
 	</group>
 </group>
 
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml b/code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml
index 107afffb9..a828dc08b 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml
@@ -912,7 +912,7 @@
 										click_when_pushed="true" onclick_l="show_hide" params_l="#win_name" />
 
 		<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="-4" fontsize="8" global_color="false" color="#color" shadow="true" hardtext="uiNotAssigned" />
+		<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" />
@@ -1208,6 +1208,7 @@
 	<param value="communication:contact_list|contact_list" />
 	<param value="communication:mailbox|mailbox" />
 	<param value="communication:fame|fame" />
+	<param value="communication:webig|webig" />
 	
 	<param value="options:game_config|game_config" />
 	<param value="options:keys|keys" />
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index 83d5b336e..3ba062282 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -6203,8 +6203,7 @@
               fontsize="10" />
         <instance template="text_tt"
                   tooltip="uittInventoryWeight"
-                  posparent="weight_txt"
-                  tooltip_parent="win" />
+                  posparent="weight_txt" />
         <link expr="identity(getItemsWeight('#inv_branch',0,#inv_branch_nb),@#inv_branch)"
               target="weight_txt:hardtext" />
         <view type="bar"
@@ -6221,8 +6220,7 @@
               w="0"
               h="0"
               on_tooltip="get_tt_bulk"
-              on_tooltip_params="dbbranch=#inv_branch|dbmax=#inv_bulk_max"
-              tooltip_parent="win" />
+              on_tooltip_params="dbbranch=#inv_branch|dbmax=#inv_bulk_max" />
         <link expr="identity(getItemsBulk('#inv_branch',0,#inv_branch_nb),@#inv_branch)"
               target="encombrement:value" />
       </group>
@@ -6238,8 +6236,7 @@
             id="slots_tt"
             posparent="slots_nb"
             sizeref="wh"
-            tooltip="uittInvSlots"
-            tooltip_parent="win" />
+            tooltip="uittInvSlots" />
       <link expr="identity(getInvSlotCounts('#inv_branch'),@#inv_branch)"
             target="slots_nb:hardtext" />
       <!-- uses identity(x,@branch) to add an observer on branch -->
diff --git a/code/ryzom/client/src/string_manager_client.cpp b/code/ryzom/client/src/string_manager_client.cpp
index 90df72bec..b9429a831 100644
--- a/code/ryzom/client/src/string_manager_client.cpp
+++ b/code/ryzom/client/src/string_manager_client.cpp
@@ -1115,7 +1115,7 @@ bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, co
 	{
 		// get the correct path name of the ref file
 		std::string referenceFile= lookupReferenceFile(fileNames[i]);
-		fileChecks[i].ReferenceDate= CPath::exists(referenceFile)?CFile::getFileModificationDate(referenceFile):0;
+		fileChecks[i].ReferenceDate= referenceFile.empty()?0:CFile::getFileModificationDate(referenceFile);
 
 		// get then one of the working File (NB: 0 is a valid reponse for Final Client: no working file)
 		string workingFile("./translation/work/"+CFile::getFilename(fileNames[i]));
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ
index 5057bb741..804c3e4ea 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ
+++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ
@@ -70,6 +70,7 @@
   <DEFINITION Label="Stable Service" Value="SERVICE_STABLE"/>
   <DEFINITION Label="Light helmet" Value="LIGHT_HELMET"/>
   <DEFINITION Label="ToolMaker" Value="ToolMaker"/>
+  <DEFINITION Label="Job element" Value="JOB_ELEMENT"/> 
   <DEFINITION Label="Generic" Value="GENERIC"/>
   <LOG>Tue Sep 02 10:51:46 2003 (saffray) Type Predef = 
 Fri Jun 18 11:04:28 2004 (fleury) Type Predef = 
diff --git a/code/ryzom/common/src/game_share/entity_types.h b/code/ryzom/common/src/game_share/entity_types.h
index c856425e6..3841f9a17 100644
--- a/code/ryzom/common/src/game_share/entity_types.h
+++ b/code/ryzom/common/src/game_share/entity_types.h
@@ -147,7 +147,7 @@ const TCoord		THRESHOLD_VPA				= MAX_THRESHOLD;
 
 // Visual property B
 const TPropIndex	PROPERTY_VPB				= 10;
-const TCoord		THRESHOLD_VPB				= 20000;
+const TCoord		THRESHOLD_VPB				= MAX_THRESHOLD;
 
 // Visual property C
 const TPropIndex	PROPERTY_VPC				= 11;