diff --git a/template/cclear/admin/cat_list.tpl b/template/cclear/admin/cat_list.tpl
index 190b85dcd..7331fe2e3 100644
--- a/template/cclear/admin/cat_list.tpl
+++ b/template/cclear/admin/cat_list.tpl
@@ -1,63 +1,48 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
-<!-- BEGIN infos -->
-<div class="info">
-  <!-- BEGIN info -->
-  <li>{infos.info.INFO}</li>
-  <!-- END info -->
-</div>
-<!-- END infos -->
+<!-- $Id$ -->
+<h2>{lang:title_categories}</h2>
+
 <h3>{CATEGORIES_NAV}</h3>
-<!--table style="width:100%;"-->
-<!-- BEGIN category -->
-<table style="width:100%;">
-<tr>
-  <td style="width:1px;padding:5px;"><img src="{category.CATEGORY_IMG_SRC}" alt="{category.CATEGORY_IMG_ALT}" title="{category.CATEGORY_IMG_TITLE}" /></td>
-  <td style="width:60%;text-align:left;"><a class="titreImg" href="{category.U_CATEGORY}">{category.CATEGORY_NAME}</a>
-    <br />
-	<!-- BEGIN storage -->
-    {L_STORAGE} : {category.CATEGORY_DIR} - 
-    <!-- END storage -->
-	{L_NB_IMG} : {category.CATEGORY_NB_IMG}
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <a href="{category.U_MOVE_UP}">{L_MOVE_UP}</a><br />
-	<a href="{category.U_MOVE_DOWN}">{L_MOVE_DOWN}</a>
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <a href="{category.U_CAT_EDIT}">{L_EDIT}</a>
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <!-- BEGIN image_info -->
-    <a href="{category.U_INFO_IMG}">{L_INFO_IMG}</a>
-    <!-- END image_info -->
-    <!-- BEGIN no_image_info -->
-    <span style="color:darkgray;">{L_INFO_IMG}</span>
-    <!-- END no_image_info -->
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <!-- BEGIN virtual -->
-    <a href="{category.U_CAT_DELETE}">{L_DELETE}</a>
-    <!-- END virtual -->
-    <!-- BEGIN storage -->
-    <span style="color:darkgray;">{L_DELETE}</span>
-    <!-- END storage -->
-  </td>
-<tr>
-</table>
-<!-- END category -->
-<!--/table-->
-<form action="{F_ACTION}" method="post" id="add_virtual">
-  <p>
-    {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
-    <input type="hidden" name="rank" value="{NEXT_RANK}"/>
-    <input type="submit" value="{L_SUBMIT}" class="bouton" name="submit" />
-  </p>
+
+<form id="categoryOrdering" action="" method="post">
+
+  <ul>
+
+    <!-- BEGIN category -->
+    <li> <!-- category {category.ID} -->
+
+      <ul class="categoryActions">
+        <li><a href="{category.U_JUMPTO}" title="{lang:jump to category}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li> 
+        <li><a href="{category.U_EDIT}" title="{lang:edit category informations}"><img src="./template/default/theme/category_edit.png" alt="{lang:edit}"/></a></li>
+        <!-- BEGIN elements -->
+        <li><a href="{category.elements.URL}" title="{lang:manage category elements}"><img src="./template/default/theme/category_elements.png" alt="{lang:elements}" /></a></li>
+        <!-- END elements -->
+        <li><a href="{category.U_CHILDREN}" title="{lang:manage sub-categories}"><img src="./template/default/theme/category_children.png" alt="{lang:sub-categories}" /></a></li> 
+        <!-- BEGIN permissions -->
+        <li><a href="{category.permissions.URL}" title="{lang:edit category permissions}" ><img src="./template/default/theme/category_permissions.png" alt="{lang:permissions}" /></a></li>
+        <!-- END permissions -->
+        <!-- BEGIN delete -->
+        <li><a href="{category.delete.URL}" title="{lang:delete category}"><img src="./template/default/theme/category_delete.png" alt="{lang:delete}" /></a></li>
+        <!-- END delete -->
+      </ul>
+
+      <p><strong>{category.NAME}</strong></p>
+
+      <p>
+        <label>
+          {lang:Position} :
+          <input type="text" size="4" name="catOrd[{category.ID}]" maxlength="4" value="{category.RANK}" />
+        </label>
+      </p>
+
+    </li>
+    <!-- END category -->
+
+  <p><input name="submitOrder" type="submit" class="bouton" value="{lang:Save order}" /></p>
+
+</form>
+
+<form action="{F_ACTION}" method="post">
+  {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
+  <input type="hidden" name="rank" value="{NEXT_RANK}"/>
+  <input type="submit" value="{L_SUBMIT}" class="bouton" name="submitAdd" />
 </form>
diff --git a/template/cclear/admin/cat_modify.tpl b/template/cclear/admin/cat_modify.tpl
index 3083e8be2..678bef349 100644
--- a/template/cclear/admin/cat_modify.tpl
+++ b/template/cclear/admin/cat_modify.tpl
@@ -1,73 +1,133 @@
-<!-- BEGIN confirmation -->
-<div style="color:red;text-align:center;">
-  {L_EDIT_CONFIRM} <a href="{U_PERMISSIONS}">{L_HERE}</a></div>
-<!-- END confirmation -->
+<!-- $Id$ -->
+<h2>{lang:title_edit_cat}</h2>
+
 <h3>{CATEGORIES_NAV}</h3>
-<form action="{F_ACTION}" method="POST" id="cat_representant">
-<table style="width:100%;">
-    <!-- BEGIN representant -->
-    <tr>
-      <td style="width:50%;" align="center">
-        <a href="{representant.URL}"><img src="{representant.SRC}" alt="" class="miniature" /></a>
-      </td>
-      <td class="row1"><input type="submit" name="set_random_representant" value="{L_SET_RANDOM_REPRESENTANT}" class="bouton" /></td>
-    </tr>
-    <!-- END representant -->
-  </table>
-</form>
+
+<ul class="categoryActions">
+  <li><a href="{U_JUMPTO}" title="{lang:jump to category}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
+  <!-- BEGIN elements -->
+  <li><a href="{elements.URL}" title="{lang:manage category elements}"><img src="./template/default/theme/category_elements.png" alt="{lang:elements}" /></a></li>
+  <!-- END elements -->
+  <li><a href="{U_CHILDREN}" title="{lang:manage sub-categories}"><img src="./template/default/theme/category_children.png" alt="{lang:sub-categories}" /></a></li>
+  <!-- BEGIN permissions -->
+  <li><a href="{permissions.URL}" title="{lang:edit category permissions}" ><img src="./template/default/theme/category_permissions.png" alt="{lang:permissions}" /></a></li>
+  <!-- END permissions -->
+  <!-- BEGIN delete -->
+  <li><a href="{delete.URL}" title="{lang:delete category}"><img src="./template/default/theme/category_delete.png" alt="{lang:delete}" /></a></li>
+  <!-- END delete -->
+</ul>
+
 <form action="{F_ACTION}" method="POST" id="cat_modify">
+
+<fieldset>
+  <legend>{lang:Informations}</legend>
+  <table>
     <!-- BEGIN server -->
-    <ul>
-      <dt><strong>{L_REMOTE_SITE}</strong></dt>
-      <dd>{server.SITE_URL}</dd>
-    </ul>
+    <tr>
+      <td><strong>{L_REMOTE_SITE}</strong></td>
+      <td>{server.SITE_URL}</td>
+    </tr>
     <!-- END server -->
-    <ul>
-      <dt><strong>{L_EDIT_NAME}</strong></dt>
-      <dd> <input type="text" name="name" value="{CAT_NAME}" maxlength="60"/> </dd>
-    </ul>
-	<!-- BEGIN storage -->
-    <ul>
-      <dt><strong>{L_STORAGE}</strong></dt>
-      <dd>{storage.CATEGORY_DIR}</dd>
-    </ul>
-	<!-- END storage -->
-    <ul>
-      <dt><strong>{L_EDIT_COMMENT}</strong></dt>
-      <dd> <textarea name="comment" rows="3" cols="50" >{CAT_COMMENT}</textarea> </dd>
-    </ul>
-	<h3>{L_EDIT_CAT_OPTIONS}</h3>
-    <ul>
-      <dt class="biglabel"><strong>{L_EDIT_STATUS}&nbsp;:</strong><br /><span class="small">{L_EDIT_STATUS_INFO}</span></dt>
-      <dd>
-	  <input type="radio" class="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}&nbsp;&nbsp;
-	  <input type="radio" class="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
-      </dd>
-    </ul>
-    <ul>
-      <dt class="biglabel"><strong>{L_EDIT_LOCK}&nbsp;:</strong><br /><span class="small">{L_EDIT_LOCK_INFO}</span></dt>
-      <dd>
-	  <input type="radio" class="radio" name="visible" value="false" {LOCKED} />{L_YES}&nbsp;&nbsp;
-	  <input type="radio" class="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
-      </dd>
-    </ul>
-    <ul>
-      <dt class="biglabel"><strong>{L_EDIT_COMMENTABLE}&nbsp;:</strong><br /><span class="small">{L_EDIT_COMMENTABLE_INFO}</span></dt>
-      <dd>
-          <input type="radio" class="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}&nbsp;&nbsp;
-          <input type="radio" class="radio" name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
-      </dd>
-    </ul>
+    <!-- BEGIN storage -->
+    <tr>
+      <td><strong>{L_STORAGE}</strong></td>
+      <td class="row1">{storage.CATEGORY_DIR}</td>
+    </tr>
+    <!-- END storage -->
+    <tr>
+      <td><strong>{L_EDIT_NAME}</strong></td>
+      <td>
+        <input type="text" name="name" value="{CAT_NAME}" maxlength="60"/>
+      </td>
+    </tr>
+    <tr>
+      <td><strong>{L_EDIT_COMMENT}</strong></td>
+      <td>
+        <textarea name="comment" class="description">{CAT_COMMENT}</textarea>
+      </td>
+    </tr>
+  </table>
+</fieldset>
+
+<!-- BEGIN move -->
+<fieldset>
+  <legend>{lang:Move}</legend>
+  {lang:Parent category}
+  <select name="parent">
+    <!-- BEGIN parent_option -->
+    <option class="{move.parent_option.CLASS}" {move.parent_option.SELECTED} value="{move.parent_option.VALUE}">{move.parent_option.OPTION}</option>
+    <!-- END parent_option -->
+  </select>  
+</fieldset>
+<!-- END move -->
+
+<fieldset>
+  <legend>{lang:Options}</legend>
+  <table>
+    <tr>
+      <td><strong>{L_EDIT_STATUS}</strong><br /><span class="small">{L_EDIT_STATUS_INFO}</span></td>
+      <td>
+	  <input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
+	  <input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
+      </td>
+    </tr>
+    <tr>
+      <td><strong>{L_EDIT_LOCK}</strong><br /><span class="small">{L_EDIT_LOCK_INFO}</span></td>
+      <td>
+	  <input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
+	  <input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
+      </td>
+    </tr>
+    <tr>
+      <td><strong>{L_EDIT_COMMENTABLE}</strong><br /><span class="small">{L_EDIT_COMMENTABLE_INFO}</span></td>
+      <td>
+          <input type="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}
+          <input type="radio"  name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
+      </td>
+    </tr>
     <!-- BEGIN upload -->
-    <ul>
-      <dt class="biglabel"><strong>{L_EDIT_UPLOADABLE}&nbsp;:</strong><br /><span class="small">{L_EDIT_UPLOADABLE_INFO}</span></dt>
-      <dd>
-          <input type="radio" class="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}&nbsp;&nbsp;
-          <input type="radio" class="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{L_NO}
-      </dd>
-    </ul>
+    <tr>
+      <td><strong>{L_EDIT_UPLOADABLE}</strong><br /><span class="small">{L_EDIT_UPLOADABLE_INFO}</span></td>
+      <td>
+          <input type="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}
+          <input type="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{L_NO}
+      </td>
+    </tr>
     <!-- END upload -->
-    <p>
-        <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
-    <p>
+  </table>
+</fieldset>
+
+<p style="text-align:center;">
+  <input type="submit" value="{L_SUBMIT}" name="submit" />
+  <input type="reset" value="{lang:Reset}" name="reset" />
+</p>
+
+<!-- BEGIN representant -->
+<fieldset>
+  <legend>{lang:Representant}</legend>
+  <table>
+    <tr>
+      <td align="center">
+        <!-- BEGIN picture -->
+        <a href="{representant.picture.URL}"><img src="{representant.picture.SRC}" alt="" class="miniature" /></a>
+        <!-- END picture -->
+
+        <!-- BEGIN random -->
+        <img src="./template/default/theme/category_representant_random.png" alt="{lang:Random picture}" class="miniature" />
+        <!-- END random -->
+      </td>
+      <td>
+        <!-- BEGIN set_random --> 
+        <p><input type="submit" name="set_random_representant" value="{L_SET_RANDOM_REPRESENTANT}" /></p>
+        <!-- END set_random -->
+
+        <!-- BEGIN delete_representant -->
+        <p><input type="submit" name="delete_representant" value="{lang:Delete Representant}" /></p>
+        <!-- END delete_representant -->
+      </td>
+    </tr>
+  </table>
+</fieldset>
+<!-- END representant -->
+
 </form>
diff --git a/template/cclear/admin/cat_options.tpl b/template/cclear/admin/cat_options.tpl
index c9cf1e8ef..7ee2a945e 100644
--- a/template/cclear/admin/cat_options.tpl
+++ b/template/cclear/admin/cat_options.tpl
@@ -1,31 +1,12 @@
-<div class="admin">{L_CAT_TITLE}</div>
-<form name="form1" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
-<div style="clear:both;"></div>
-<div style="height:auto;">
-  <div style="float:left;padding:10px;width:300px;">
-  <span class="titreMenu">{L_CAT_OPTIONS_TRUE}</span><br />
-  <select style="height:auto;width:280px" name="cat_true[]" multiple="multiple" size="10">
-    <!-- BEGIN category_option_true -->
-    <option class="{category_option_true.CLASS}" {category_option_true.SELECTED} value="{category_option_true.VALUE}">{category_option_true.OPTION}</option>
-    <!-- END category_option_true -->
-  </select>
-  </div>
-  <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
-    <input type="submit" value="&laquo;" name="trueify" style="font-size:15px;" class="bouton" /><br/>
-    <input type="submit" value="&raquo;" name="falsify" style="font-size:15px;" class="bouton" />
-  </div>
-  <div style="float:right;padding:10px;width:300px;">
-   <span class="titreMenu">{L_CAT_OPTIONS_FALSE}</span><br />
-  <select style="width:280px" name="cat_false[]" multiple="multiple" size="10">
-    <!-- BEGIN category_option_false -->
-    <option class="{category_option_false.CLASS}" {category_option_false.SELECTED} value="{category_option_false.VALUE}">{category_option_false.OPTION}</option>
-    <!-- END category_option_false -->
-  </select>
-  </div>
-</div>
-<div style="clear:both;"></div>
-<input type="hidden" name="{HIDDEN_NAME}" value="{HIDDEN_VALUE}" />
-<input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-</form>
-<div class="information">{L_CAT_OPTIONS_INFO}</div>
+<!-- $Id$ -->
+<h2>{lang:title_cat_options}</h2>
+
+<form method="post" action="{F_ACTION}" id="cat_options">
+  <fieldset>
+    <legend>{L_SECTION}</legend>
+    {DOUBLE_SELECT}
+  </fieldset>
+</form>
+
+<p class="information">{L_CAT_OPTIONS_INFO}</div>
 
diff --git a/template/cclear/admin/element_set_global.tpl b/template/cclear/admin/element_set_global.tpl
index 6014291f9..def1d30a0 100644
--- a/template/cclear/admin/element_set_global.tpl
+++ b/template/cclear/admin/element_set_global.tpl
@@ -1,6 +1,7 @@
-<h1>{lang:Batch management}</h1>
+<!-- $Id$ -->
+<h2>{lang:Batch management}</h2>
 
-<div class="admin">{CATEGORY_TITLE}</div>
+<h3>{CATEGORIES_NAV}</h3>
 
 <p style="text-align:center;">
   global mode 
diff --git a/template/cclear/admin/element_set_unit.tpl b/template/cclear/admin/element_set_unit.tpl
index 48dac9046..b71130efd 100644
--- a/template/cclear/admin/element_set_unit.tpl
+++ b/template/cclear/admin/element_set_unit.tpl
@@ -1,4 +1,6 @@
-<div class="admin">{CATEGORY_TITLE}</div>
+<h2>{lang:Batch management}</h2>
+
+<h3>{CATEGORIES_NAV}</h3>
 
 <p style="text-align:center;">
   <a href="{U_GLOBAL_MODE}">global mode</a>
@@ -22,39 +24,31 @@
 
 </fieldset>
 
-<fieldset>
+<div class="navigationBar">{NAV_BAR}</div>
 
-  <legend>Elements</legend>
+<!-- BEGIN element -->
+<fieldset class="elementEdit">
+  <legend>{element.LEGEND}</legend>
 
-  <div class="navigationBar">{NAV_BAR}</div>
+  <a href="{element.U_EDIT}"><img src="{element.TN_SRC}" alt="" class="miniature" title="{lang:Edit all picture informations}" /></a>
 
-  <table width="100%">
+  <table>
 
     <tr>
-      <th class="row2" style="text-align:center;">&nbsp;</td>
-      <th class="row2" style="text-align:center;">name</td>
-      <th class="row2" style="text-align:center;">author</td>
-      <th class="row2" style="text-align:center;">description</td>
-      <th class="row2" style="text-align:center;">creation date</td>
-      <th class="row2" style="text-align:center;">keywords</td>
+      <td><strong>{lang:Name}</strong></td>
+      <td><input type="text" name="name-{element.ID}" value="{element.NAME}" /></td>
     </tr>
 
-    <!-- BEGIN element -->
     <tr>
+      <td><strong>{lang:Author}</strong></td>
+      <td><input type="text" name="author-{element.ID}" value="{element.AUTHOR}" /></td>
+    </tr>
 
-      <td style="text-align:center;"><img src="{element.TN_SRC}" alt="" class="miniature" title="{element.FILENAME}" /></td>
-
-      <td style="text-align:center;"><input type="text" name="name-{element.ID}" value="{element.NAME}" maxlength="255"/></td>
-
-      <td style="text-align:center;"><input type="text" name="author-{element.ID}" value="{element.AUTHOR}" maxlength="255" size="12" /></td>
-
-      <td style="text-align:center;"><textarea name="comment-{element.ID}" rows="5" cols="30" style="overflow:auto">{element.COMMENT}</textarea></td>
-
-      <td style="text-align:left;">
-        <input type="radio" name="date_creation_action-{element.ID}" value="leave" checked="checked" /> leave unchanged
-        <br /><input type="radio" name="date_creation_action-{element.ID}" value="unset" /> unset
-        <br /><input type="radio" name="date_creation_action-{element.ID}" value="set" id="date_creation_action_set-{element.ID}" />
-
+    <tr>
+      <td><strong>{lang:Creation date}</strong></td>
+      <td>
+        <label><input type="radio" name="date_creation_action-{element.ID}" value="unset" /> unset</label>
+        <input type="radio" name="date_creation_action-{element.ID}" value="set" id="date_creation_action_set-{element.ID}" /> set to
         <select onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;" name="date_creation_day-{element.ID}">
           <!-- BEGIN date_creation_day -->
           <option {element.date_creation_day.SELECTED} value="{element.date_creation_day.VALUE}">{element.date_creation_day.OPTION}</option>
@@ -72,18 +66,27 @@
                maxlength="4"
                value="{element.DATE_CREATION_YEAR}" />
       </td>
-
-      <td style="text-align:center;"><input type="text" name="keywords-{element.ID}" value="{element.KEYWORDS}" length="255" /></td>
-
     </tr>
-    <!-- END element -->
+
+    <tr>
+      <td><strong>{lang:Keywords}</strong></td>
+      <td><input type="text" name="keywords-{element.ID}" value="{element.KEYWORDS}" size="50" /></td>
+    </tr>
+
+    <tr>
+      <td><strong>{lang:Description}</strong></td>
+      <td><textarea name="description-{element.ID}" class="description">{element.DESCRIPTION}</textarea></td>
+    </tr>
 
   </table>
 
-  <p style="text-align:center;">
-    <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
-  </p>
-
 </fieldset>
+<!-- END element -->
+
+<p>
+  <input type="submit" value="{L_SUBMIT}" name="submit" />
+  <input type="reset" value="{lang:Reset}" />
+</p>
+
 
 </form>
diff --git a/template/cclear/admin/maintenance.tpl b/template/cclear/admin/maintenance.tpl
index 3a809a9d2..e9fe86a38 100644
--- a/template/cclear/admin/maintenance.tpl
+++ b/template/cclear/admin/maintenance.tpl
@@ -1,11 +1,10 @@
-<h1>{lang:Maintenance}</h1>
+<!-- $Id$ -->
+<h2>{lang:Maintenance}</h2>
 
 <ul>
   <li><a href="{U_MAINT_CATEGORIES}">{lang:update categories informations}</a></li>
   <li><a href="{U_MAINT_IMAGES}">{lang:update images informations}</a></li>
   <li><a href="{U_MAINT_HISTORY}">{lang:purge history}</a></li>
   <li><a href="{U_MAINT_SESSIONS}">{lang:purge sessions}</a></li>
-<!--
-  <li><a href="{U_FEEDS}">{lang:purge obsolete notification feed}</a></li>
--->
+  <li><a href="{U_MAINT_FEEDS}">{lang:purge never used notification feeds}</a></li>
 </ul>
diff --git a/template/cclear/admin/picture_modify.tpl b/template/cclear/admin/picture_modify.tpl
index 2816c9c69..46abed7b0 100644
--- a/template/cclear/admin/picture_modify.tpl
+++ b/template/cclear/admin/picture_modify.tpl
@@ -1,144 +1,182 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
+<!-- $Id$ -->
+<h2>{lang:title_picmod}</h2>
+
+<img src="{TN_SRC}" alt="{lang:thumbnail}" class="thumbnail" />
+
+<ul class="categoryActions">
+  <!-- BEGIN jumpto -->
+  <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
+  <!-- END jumpto -->
+  <li><a href="{U_SYNC}" title="{lang:synchronize metadata}"><img src="./template/default/theme/sync_metadata.png" alt="{lang:synchronize}" /></a></li>
 </ul>
-</div>
-<!-- END errors -->
-<div class="admin">{TITLE_IMG}</div>
-<form action="{F_ACTION}" method="POST">
-  <table style="width:100%;">
-    <tr>
-      <td colspan="2" align="center"><a href="{URL_IMG}" class="thumbnail"><img src="{TN_URL_IMG}" alt="" class="miniature" /></a></td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_UPLOAD_NAME}</strong></td>
-      <td class="row1"><input type="text" name="name" value="{NAME_IMG}" /> [ {L_DEFAULT} : {DEFAULT_NAME_IMG} ]</td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_FILE}</strong></td>
-      <td class="row1">{FILE_IMG}</td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_SIZE}</strong></td>
-      <td class="row1">{SIZE_IMG}</td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_FILESIZE}</strong></td>
-      <td class="row1">{FILESIZE_IMG}</td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_REGISTRATION_DATE}</strong></td>
-      <td class="row1">{REGISTRATION_DATE_IMG}</td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_PATH}</strong></td>
-      <td class="row1">{PATH_IMG}</td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_STORAGE_CATEGORY}</strong></td>
-      <td class="row1">{STORAGE_CATEGORY_IMG}</td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_AUTHOR}</strong></td>
-      <td class="row1"><input type="text" name="author" value="{AUTHOR_IMG}" /></td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_CREATION_DATE}</strong></td>
-      <td class="row1"><input type="text" name="date_creation" value="{CREATION_DATE_IMG}" /></td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_KEYWORDS}</strong></td>
-      <td class="row1"><input type="text" name="keywords" value="{KEYWORDS_IMG}" size="50" /></td>
-    </tr>
-    <tr>
-      <td style="width:50%;"><strong>{L_COMMENT}</strong></td>
-      <td class="row1"><textarea name="comment" rows="5" cols="50" style="overflow:auto">{COMMENT_IMG}</textarea></td>
-    </tr>
-    <tr>
-      <td colspan="2"><div style="margin-bottom:0px">&nbsp;</div></td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center">
-        <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
-        <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-      </td>
-    </tr>
-  </table>
-</form>
 
-<form name="form1" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
+<form action="{F_ACTION}" method="post" id="properties">
 
-  <div style="clear:both;"></div>
+  <fieldset>
+    <legend>{lang:Informations}</legend>
 
-  <div style="height:auto;">
+    <table>
 
-    <div style="float:left;padding:10px;width:300px;">
-      <span class="titreMenu">{L_CAT_ASSOCIATED}</span><br />
-      <select style="height:auto;width:280px" name="cat_associated[]" multiple="multiple" size="10">
-        <!-- BEGIN associated_option -->
-        <option class="{associated_option.CLASS}" {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
-        <!-- END associated_option -->
-      </select>
-    </div>
+      <tr>
+        <td><strong>{lang:Path}</strong></td>
+        <td>{PATH}</td>
+      </tr>
 
-    <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
-      <input type="submit" value="&laquo;" name="associate" style="font-size:15px;" class="bouton" /><br/>
-      <input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" class="bouton" />
-    </div>
+      <tr>
+        <td><strong>{lang:Registration date}</strong></td>
+        <td>{REGISTRATION_DATE}</td>
+      </tr>
 
-    <div style="float:right;padding:10px;width:300px;">
-      <span class="titreMenu">{L_CAT_DISSOCIATED}</span><br />
-      <select style="width:280px" name="cat_dissociated[]" multiple="multiple" size="10">
-        <!-- BEGIN dissociated_option -->
-        <option class="{dissociated_option.CLASS}" {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
-        <!-- END dissociated_option -->
-      </select>
-    </div>
+      <tr>
+        <td><strong>{lang:Dimensions}</strong></td>
+        <td>{DIMENSIONS}</td>
+      </tr>
 
-  </div>
+      <tr>
+        <td><strong>{lang:Filesize}</strong></td>
+        <td>{FILESIZE}</td>
+      </tr>
 
-  <div style="clear:both;"></div>
+      <tr>
+        <td><strong>{lang:Storage category}</strong></td>
+        <td>{STORAGE_CATEGORY}</td>
+      </tr>
 
-  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
+      <!-- BEGIN links -->
+      <tr>
+        <td><strong>{lang:Linked categories}</strong></td>
+        <td>
+          <ul>
+            <!-- BEGIN category -->
+            <li>{links.category.NAME}</li>
+            <!-- END category -->
+          </ul>
+        </td>
+      </tr>
+      <!-- END links -->
+
+    </table>
+
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:Properties}</legend>
+
+    <table>
+
+      <tr>
+        <td><strong>{lang:Name}</strong></td>
+        <td><input type="text" name="name" value="{NAME}" /></td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Author}</strong></td>
+        <td><input type="text" name="author" value="{AUTHOR}" /></td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Creation date}</strong></td>
+        <td>
+          <label><input type="radio" name="date_creation_action" value="unset" /> unset</label>
+          <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> set to
+          <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_day">
+            <!-- BEGIN date_creation_day -->
+            <option {date_creation_day.SELECTED} value="{date_creation_day.VALUE}">{date_creation_day.OPTION}</option>
+            <!-- END date_creation_day -->
+          </select>
+          <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_month">
+            <!-- BEGIN date_creation_month -->
+            <option {date_creation_month.SELECTED} value="{date_creation_month.VALUE}">{date_creation_month.OPTION}</option>
+            <!-- END date_creation_month -->
+          </select>
+          <input onmousedown="document.getElementById('date_creation_action_set').checked = true;"
+                 name="date_creation_year"
+                 type="text"
+                 size="4"
+                 maxlength="4"
+                 value="{DATE_CREATION_YEAR_VALUE}" />
+        </td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Keywords}</strong></td>
+        <td><input type="text" name="keywords" value="{KEYWORDS}" size="50" /></td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Description}</strong></td>
+        <td><textarea name="description" class="description">{DESCRIPTION}</textarea></td>
+      </tr>
+
+    </table>
+
+    <p style="text-align:center;">
+      <input type="submit" value="{lang:Submit}" name="submit" />
+      <input type="reset" value="{lang:Reset}" name="reset" />
+    </p>
+
+  </fieldset>
 
 </form>
 
-<form name="form2" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
+<form id="associations" method="post" action="{F_ACTION}#associations">
+  <fieldset>
+    <legend>{lang:Association to categories}</legend>
 
-  <div style="clear:both;"></div>
+    <table class="doubleSelect">
+      <tr>
+        <td>
+          <h3>{lang:Associated}</h3>
+          <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
+            <!-- BEGIN associated_option -->
+            <option {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
+            <!-- END associated_option -->
+          </select>
+          <p><input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;"/></p>
+        </td>
 
-  <div style="height:auto;">
-
-    <div style="float:left;padding:10px;width:300px;">
-      <span class="titreMenu">{L_REPRESENTS}</span><br />
-      <select style="height:auto;width:280px" name="cat_elected[]" multiple="multiple" size="10">
-        <!-- BEGIN elected_option -->
-        <option class="{elected_option.CLASS}" {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
-        <!-- END elected_option -->
-      </select>
-    </div>
-
-    <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
-      <input type="submit" value="&laquo;" name="elect" style="font-size:15px;" class="bouton" /><br/>
-      <input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" class="bouton" />
-    </div>
-
-    <div style="float:right;padding:10px;width:300px;">
-      <span class="titreMenu">{L_DOESNT_REPRESENT}</span><br />
-      <select style="width:280px" name="cat_dismissed[]" multiple="multiple" size="10">
-        <!-- BEGIN dismissed_option -->
-        <option class="{dismissed_option.CLASS}" {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
-        <!-- END dismissed_option -->
-      </select>
-    </div>
-
-  </div>
-
-  <div style="clear:both;"></div>
-
-  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
+        <td>
+          <h3>{lang:Dissociated}</h3>
+          <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
+            <!-- BEGIN dissociated_option -->
+            <option {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
+            <!-- END dissociated_option -->
+          </select>
+          <p><input type="submit" value="&laquo;" name="associate" style="font-size:15px;" /></p>
+        </td>
+      </tr>
+    </table>
 
+  </fieldset>
+</form>
+
+<form id="representation" method="post" action="{F_ACTION}#representation">
+  <fieldset>
+    <legend>{lang:Representation of categories}</legend>
+
+    <table class="doubleSelect">
+      <tr>
+        <td>
+          <h3>{lang:Represents}</h3>
+          <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
+            <!-- BEGIN elected_option -->
+            <option {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
+            <!-- END elected_option -->
+          </select>
+          <p><input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;"/></p>
+        </td>
+
+        <td>
+          <h3>{lang:Does not represent}</h3>
+          <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
+            <!-- BEGIN dismissed_option -->
+            <option {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
+            <!-- END dismissed_option -->
+          </select>
+          <p><input type="submit" value="&laquo;" name="elect" style="font-size:15px;" /></p>
+        </td>
+      </tr>
+    </table>
+
+  </fieldset>
 </form>
diff --git a/template/cclear/category.tpl b/template/cclear/category.tpl
index 5b2054acd..c100ac42d 100644
--- a/template/cclear/category.tpl
+++ b/template/cclear/category.tpl
@@ -95,8 +95,11 @@
   <div class="titrePage">
     <ul class="categoryActions">
       <!-- BEGIN caddie -->
-      <li><a href="{U_CADDIE}" title="{lang:add to caddie}"><img src="./template/default/theme/caddie_add.png" /></a></li>
+      <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="./template/default/theme/caddie_add.png" /></a></li>
       <!-- END caddie -->
+      <!-- BEGIN edit -->
+      <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="./template/default/theme/category_edit.png" alt="{lang:edit}"/></a></li>
+      <!-- END edit -->
     </ul>
     <h2>{TITLE}</h2>
   </div>
@@ -122,7 +125,7 @@
     <!-- END category_name -->
   </a>
   {thumbnails.line.thumbnail.IMAGE_TS}
-  <br>
+  <br />
   <!-- BEGIN nb_comments -->
   {thumbnails.line.thumbnail.nb_comments.NB_COMMENTS} {L_COMMENT}
   <!-- END nb_comments -->
diff --git a/template/cclear/content.css b/template/cclear/content.css
index 480f158bf..b07d52d32 100644
--- a/template/cclear/content.css
+++ b/template/cclear/content.css
@@ -21,13 +21,17 @@
 
 #content UL.thumbnails LI {
     display: inline;
+    text-align: center; /* eventuellement */
+    margin: 0; padding: 0;
 }
 
 #content UL.thumbnails SPAN {
-    margin: 0 10px 10px 10px;
-    vertical-align: top;
-    width: 128px; /* FIXME */
-    display:table-cell; display:inline-table; display:inline-block;
+    	margin: 0 10px 10px 10px;
+    	vertical-align: top;
+    	width: 128px;
+    	display:table-cell;   /* for geko */
+	display:inline-table; /* for ??? (ask yoDan) */
+	display:inline-block; /* for IE */
 }
 #content UL.thumbnails LI>SPAN { vertical-align: baseline; }
 #content UL.thumbnails LI IMG.thumbnail { margin-bottom: .4ex; }
@@ -65,16 +69,22 @@
 }
 
 /* actions */
-div.titrePage ul.categoryActions {
-  float: right;
+ul.categoryActions {
+  text-align: center;
   margin: 0;
+  padding: 0;
+  text-indent: 0;
 }
 
-ul.categoryActions>li {
+#content div.titrePage ul.categoryActions {
+  float: right;
+}
+
+#content ul.categoryActions>li {
   display: inline;
 }
 
-ul.categoryActions a img, ul.categoryActions a {
+#content ul.categoryActions a img, ul.categoryActions a {
   border: none;
 }
 
diff --git a/template/cclear/default-colors.css b/template/cclear/default-colors.css
index 77ce0ae51..3bf837da9 100644
--- a/template/cclear/default-colors.css
+++ b/template/cclear/default-colors.css
@@ -131,4 +131,7 @@ input, select, textarea {
 {
 	font-weight:normal;
 }
+fieldset>legend {
+  font-style: italic;
+}
 
diff --git a/template/cclear/default-layout.css b/template/cclear/default-layout.css
index d4be6120a..cd86b3d47 100644
--- a/template/cclear/default-layout.css
+++ b/template/cclear/default-layout.css
@@ -37,7 +37,7 @@ H2 {
 
 A {
     text-decoration:none;
-    border-bottom: 1px dotted #000000;
+    /*border-bottom: 1px dotted #000000;*/
 }
 A:hover {
     border-bottom-style: solid;
@@ -55,13 +55,14 @@ IMG {
 }
 
 /** General defaults **/
-ul, dl { text-align: left;}
+ul, dl, li { text-align: left;}
 
 /** forms **/
 div.formbox {
   width: 70%;
   margin: 0 auto 1em auto;
 }
+form { padding: 0.5em; }
 /* form row are dl instead of table rows */
 form dl {
   text-align: left;   /* must set it there otherwise IE render dl.biglabel dt incorectly */
@@ -115,6 +116,15 @@ form table {
 	font-size: 80%;
 }
 
+textarea.description {
+  height: 100px;
+  width: 500px;
+  overflow: auto;
+}
+select.categoryList {
+  width: 400px;
+}
+
 /** go to an admin.css ? **/
 .table2 {
 	border: 1px solid #000000; 
@@ -122,3 +132,26 @@ form table {
 	padding:0px;
 }
 form#add_virtual p { text-align: left; }
+form#categoryOrdering p {
+	text-align: left;
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+form#categoryOrdering>ul {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+form#categoryOrdering>ul>li {
+  border: 1px solid grey;
+  padding: 0px 5px;
+  margin-bottom: 5px;
+}
+
+form#categoryOrdering ul.categoryActions {
+  float: right;
+  margin-top: 5px;
+}
+
+form#cat_modify table { width: auto; }
diff --git a/template/cclear/notification.tpl b/template/cclear/notification.tpl
new file mode 100644
index 000000000..ac50a7d8f
--- /dev/null
+++ b/template/cclear/notification.tpl
@@ -0,0 +1,4 @@
+{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}
+
+<p><a href="{FEED_URL}">{lang:RSS feed}</a></p>
+<p><a href="{HOME_URL}">{lang:Return to home page}</a></p>
diff --git a/template/cclear/profile.tpl b/template/cclear/profile.tpl
index 9eff1fb74..429999397 100644
--- a/template/cclear/profile.tpl
+++ b/template/cclear/profile.tpl
@@ -8,137 +8,79 @@
 </div>
 <!-- END errors -->
 
-<!-- BEGIN add_user -->
-<h3>{L_GROUP_ADD_USER}</h3>
-<form method="post" name="post" action="{add_user.F_ACTION}">
-  <p>{L_USERNAME} <input type="text" name="login" maxlength="50" size="20" />
-  {L_PASSWORD} <input type="text" name="password" />
-  <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" /></p>
-</form>
-<!-- END add_user -->
+<h2>{L_TITLE}</h2>
+
+<div class="formbox">
+<form method="post" name="profile" action="{F_ACTION}" id="profile">
+
+  <p><input type="hidden" name="userid" value="{USERID}" /></p>
+
+  <h3>{L_REGISTRATION_INFO}</h3>
+  <dl>
+    <dt width="50%">{L_USERNAME}</dt>
+    <dd>{USERNAME}</dd>
+    <dt>{L_EMAIL}</dt>
+    <dd><input type="text" name="mail_address" value="{EMAIL}" /></dd>
+  </dl>
+  <dl class="biglabel">
+    <dt>{L_CURRENT_PASSWORD} : <br /><span class="small">{L_CURRENT_PASSWORD_HINT}</span></dt>
+    <dd><input type="password" name="password" value="" /></dd>
+  </dl>
+  <dl class="biglabel">
+    <dt>{L_NEW_PASSWORD} : <br /><span class="small">{L_NEW_PASSWORD_HINT}</span></dt>
+    <dd><input type="password" name="use_new_pwd" value="" /></dd>
+  </dl>
+  <dl class="biglabel">
+    <dt>{L_CONFIRM_PASSWORD} : <br /><span class="small">{L_CONFIRM_PASSWORD_HINT}</span></dt>
+    <dd><input type="password" name="passwordConf" value="" /></dd>
+  </dl>
+  <h3>{L_PREFERENCES}</h3>
+  <dl>
+    <dt>{L_NB_IMAGE_LINE}</dt>
+    <dd>
+      <input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" />
+    </dd>
+    <dt>{L_NB_ROW_PAGE}</dt>
+    <dd>
+      <input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" />
+    </dd>
+    <dt>{L_STYLE_SELECT}</dt>
+    <dd>
+      {STYLE_SELECT}
+    </dd>
+    <dt>{L_LANG_SELECT}</dt>
+    <dd>
+      {LANG_SELECT}
+    </dd>
+    <dt>{L_RECENT_PERIOD}</dt>
+    <dd>
+      <input type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" />
+    </dd>
+    <dt>{L_EXPAND_TREE}</dt>
+    <dd>
+      <input type="radio" class="radio" name="expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
+      <input type="radio" class="radio" name="expand" value="false" {EXPAND_TREE_NO} />{L_NO}
+    </dd>
+    <dt>{L_NB_COMMENTS}</dt>
+    <dd>
+      <input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+      <input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO} />{L_NO}
+    </dd>
+    <dt>{L_MAXWIDTH}</dt>
+    <dd>
+      <input type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
+    </dd>
+    <dt>{L_MAXHEIGHT}</dt>
+    <dd>
+      <input type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" />
+    </dd>
+  </dl>
 
-<!-- BEGIN select_user -->
-<h3>{L_SELECT_USERNAME}</h3>
-<form method="post" name="post" action="{F_SEARCH_USER_ACTION}">
   <p>
-  <input type="text" name="username" maxlength="50" size="20" />
-  <input type="submit" name="submituser" value="{L_LOOKUP_USER}" class="bouton" /> 
-  <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpwgsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
+    <input type="submit" name="validate" value="{L_SUBMIT}" class="bouton" />
+    <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
   </p>
 </form>
 
-<h3>{L_USERS_LIST}</h3>
-<form method="get" action="{F_ORDER_ACTION}">
-<p><input type="hidden" name="page" value="profile" /></p>
-<div style="text-align:center">
-  {L_ORDER_BY}
-  <select name="order_by">
-    <!-- BEGIN order_by -->
-    <option value="{select_user.order_by.VALUE}" {select_user.order_by.SELECTED} >{select_user.order_by.CONTENT}</option>
-    <!-- END order_by -->
-  </select>
-  <select name="direction">
-    <!-- BEGIN direction -->
-    <option value="{select_user.direction.VALUE}" {select_user.direction.SELECTED} >{select_user.direction.CONTENT}</option>
-    <!-- END direction -->
-  </select>
-  <input type="submit" value="{L_SUBMIT}" class="bouton" />
+  <p><a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a></p>
 </div>
-</form>
-
-<table>
-  <tr class="throw">
-    <th style="width:20%;">{L_USERNAME}</th>
-    <th style="width:20%;">{L_STATUS}</th>
-    <th style="width:30%;">{L_EMAIL}</th>
-    <th style="width:30%;">{L_GROUPS}</th>
-    <th style="width:1%;">{L_ACTIONS}</th>
-  </tr>
-  <!-- BEGIN user -->
-  <tr>
-    <td><a href="{select_user.user.U_MOD}">{select_user.user.USERNAME}</a></td>
-    <td>{select_user.user.STATUS}</td>
-    <td>{select_user.user.EMAIL}</td>
-    <td>{select_user.user.GROUPS}</td>
-<!-- [<a href="{select_user.user.U_MOD}">{L_MODIFY}</a>] -->
-    <td>[<a href="{select_user.user.U_PERM}">{L_PERMISSIONS}</a>]</td>
-  </tr>
-  <!-- END user -->
-</table>
-<div class="navigationBar">{NAVBAR}</div>
-<!-- END select_user -->
-<!-- BEGIN modify -->
-<!-- BEGIN profile -->
-<h2>{L_TITLE}</h2>
-<!-- END profile -->
-<div class="formbox">
-  <form method="post" action="{F_ACTION}">
-    <h3>{L_REGISTRATION_INFO}</h3>
-    <dl>
-      <dt>{L_USERNAME}</dt>
-      <dd><input type="text" name="username" value="{USERNAME}" />
-		<input type="hidden" name="userid" value="{USERID}" /></dd>
-      <dt>{L_EMAIL}</dt>
-      <dd><input type="text" name="mail_address" value="{EMAIL}" /></dd>
-    </dl>
-    <!-- BEGIN profile -->
-    <dl class="biglabel">
-      <dt>{L_CURRENT_PASSWORD} : <br /><span class="small">{L_CURRENT_PASSWORD_HINT}</span></dt>
-      <dd><input type="password" name="password" value="" /></dd>
-    </dl>
-    <!-- END profile -->
-    <dl class="biglabel">
-      <dt>{L_NEW_PASSWORD} : <br /><span class="small">{L_NEW_PASSWORD_HINT}</span></dt>
-      <dd><input type="password" name="use_new_pwd" value="" /></dd>
-    </dl>
-    <dl class="biglabel">
-      <dt>{L_CONFIRM_PASSWORD} : <br /><span class="small">{L_CONFIRM_PASSWORD_HINT}</span></dt>
-      <dd><input type="password" name="passwordConf" value="" /></dd>
-    </dl>
-    <h3>{L_PREFERENCES}</h3>
-    <dl>
-      <dt>{L_NB_IMAGE_LINE}</dt>
-      <dd><input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" /></dd>
-      <dt>{L_NB_ROW_PAGE}</dt>
-      <dd><input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" /></dd>
-      <dt>{L_STYLE_SELECT}</dt>
-      <dd>{STYLE_SELECT}</dd>
-      <dt>{L_LANG_SELECT}</dt>
-      <dd>{LANG_SELECT}</dd>
-      <dt>{L_RECENT_PERIOD}</dt>
-      <dd><input type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" /></dd>
-      <dt>{L_EXPAND_TREE}</dt>
-      <dd><input type="radio" class="radio" name="expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="expand" value="false" {EXPAND_TREE_NO} />{L_NO}</dd>
-      <dt>{L_NB_COMMENTS}</dt>
-      <dd><input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO} />{L_NO}</dd>
-      <dt>{L_MAXWIDTH}</dt>
-      <dd><input type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" /></dd>
-      <dt>{L_MAXHEIGHT}</dt>
-      <dd><input type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" /></dd>
-    </dl>
-    <!-- BEGIN admin -->
-    <h3>{modify.admin.L_ADMIN_USER}</h3>
-    <dl>
-      <dt>{modify.admin.L_STATUS}</dt>
-      <dd>{modify.admin.STATUS}</dd>
-    </dl>
-    <dl class="biglabel">
-      <dt>{modify.admin.L_DELETE}<br />
-		<span class="small">{modify.admin.L_DELETE_HINT}</span></dt>
-      <dd><input name="user_delete" type="checkbox" value="1"></dd>
-    </dl>
-    <!-- END admin -->
-    <p>
-      <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
-      <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-    </p>
-  </form>
-  <!-- BEGIN profile -->
-  <div style="text-align:center;margin:5px;">
-    <a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a>
-  </div>
-  <!-- END profile -->
-</div><!--formbox-->
-<!-- END modify -->