215 files changed, 25 insertions, 3827 deletions

diff --git a/template/cclear/theme/exit.png b/template/cclear/theme/exit.png
deleted file mode 100644
index c9a87b5cb..000000000
--- a/template/cclear/theme/exit.png
+++ /dev/null
diff --git a/template/cclear/theme/help.png b/template/cclear/theme/help.png
deleted file mode 100644
index 39d089e72..000000000
--- a/template/cclear/theme/help.png
+++ /dev/null
diff --git a/template/cclear/theme/home.png b/template/cclear/theme/home.png
deleted file mode 100644
index a7714756b..000000000
--- a/template/cclear/theme/home.png
+++ /dev/null
diff --git a/template/cclear/theme/register.png b/template/cclear/theme/register.png
deleted file mode 100644
index a28069cb7..000000000
--- a/template/cclear/theme/register.png
+++ /dev/null
diff --git a/template/default/about.tpl b/template/default/about.tpl
deleted file mode 100644
index d5fadc1bf..000000000
--- a/template/default/about.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="titrePage">{PAGE_TITLE}</div>
-<div class="menu" style="white-space:normal;margin:10px;">
-  {L_ABOUT}
-</div>
-<div style="text-align:center;margin:5px;">
-<a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a>
-</div>
-<div style="text-align:center;margin:5px;">
-<img src="./template/default/images/php_sqreuil_artistes.gif" alt="php logo" />
-</div>
\ No newline at end of file
diff --git a/template/default/admin.tpl b/template/default/admin.tpl
deleted file mode 100644
index be318afa5..000000000
--- a/template/default/admin.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<table style="width:100%;">
-  <tr>
-    <td valign="top" style="width:1%;">
-      <div id="theNavbar">
-        <dl>
-          <dt>{lang:links}</dt>
-          <dd>
-            <ul>
-              <li><a href="{U_RETURN}">{lang:home}</a></li>
-            </ul>
-          </dd>
-
-          <dt>{lang:general}</dt>
-          <dd>
-            <ul>
-              <li><a href="{U_FAQ}">{lang:instructions}</a></li>
-              <li><a href="{U_SITES}">{lang:remote_sites}</a></li>
-              <li><a href="{U_HISTORY}">{lang:history}</a></li>
-              <li><a href="{U_CAT_UPDATE}">{lang:update}</a></li>
-              <li><a href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
-            </ul>
-          </dd>
-
-          <dt>{lang:config}</dt>
-          <dd>
-            <ul>
-              <li><a href="{U_CONFIG_GENERAL}">{lang:general}</a></li>
-	      <li><a href="{U_CONFIG_COMMENTS}">{lang:comments}</a></li>
-	      <li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
-	      <li><a href="{U_CONFIG_UPLOAD}">{lang:upload}</a></li>
-	      <li><a href="{U_CONFIG_SESSION}">{lang:conf_cookie}</a></li>
-	      <li><a href="{U_CONFIG_METADATA}">{lang:metadata}</a></li>
-	    </ul>
-          </dd>
-
-          <dt>{lang:categories}</dt>
-          <dd>
-            <ul>
-              <li><a href="{U_CATEGORIES}">{lang:manage}</a></li>
-	      <li><a href="{U_CAT_UPLOAD}">{lang:upload}</a></li>
-	      <li><a href="{U_CAT_COMMENTS}">{lang:comments}</a></li>
-	      <li><a href="{U_CAT_VISIBLE}">{lang:lock}</a></li>
-	      <li><a href="{U_CAT_STATUS}">{lang:cat_security}</a></li>
-	      <!-- BEGIN representative -->
-	      <li><a href="{representative.URL}">{lang:Representative}</a></li>
-	      <!-- END representative -->
-	    </ul>
-          </dd>
-
-          <dt>{lang:pictures}</dt>
-          <dd>
-            <ul>
-              <li><a href="{U_WAITING}">{lang:waiting}</a></li>
-	      <li><a href="{U_THUMBNAILS}">{lang:thumbnails}</a></li>
-	      <li><a href="{U_COMMENTS}">{lang:comments}</a></li>
-	      <li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
-	    </ul>
-          </dd>
-
-          <dt>{lang:identification}</dt>
-          <dd>
-            <ul>
-              <li><a href="{U_USERS}">{lang:users}</a></li>
-              <li><a href="{U_GROUPS}">{lang:groups}</a></li>
-            </ul>
-          </dd>
-	</dl>
-      </div> <!-- end div#theNavbar -->
-    </td>
-
-    <td style="width:99%;" valign="top">
-      <div id="adminMain">
-
-	<!-- BEGIN errors -->
-	<div id="errors">
-	  <ul>
-	    <!-- BEGIN error -->
-	    <li>{errors.error.ERROR}</li>
-	    <!-- END error -->
-	  </ul>
-	</div>
-	<!-- END errors -->
-
-	<!-- BEGIN infos -->
-	<div id="infos">
-	  <ul>
-	    <!-- BEGIN info -->
-	    <li>{infos.info.INFO}</li>
-	    <!-- END info -->
-	  </ul>
-	</div>
-	<!-- END infos -->
-
-        {ADMIN_CONTENT}
-      </div>
-    </td>
-  </tr>
-</table>
diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl
deleted file mode 100644
index 7f92478fb..000000000
--- a/template/default/admin/cat_list.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<h1>{lang:title_categories}</h1>
-
-<h2>{CATEGORIES_NAV}</h2>
-
-<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/default/admin/cat_modify.tpl b/template/default/admin/cat_modify.tpl
deleted file mode 100644
index b738bae3f..000000000
--- a/template/default/admin/cat_modify.tpl
+++ /dev/null
@@ -1,132 +0,0 @@
-<h1>{lang:title_edit_cat}</h1>
-
-<h2>{CATEGORIES_NAV}</h2>
-
-<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">
-
-<fieldset>
-  <legend>{lang:Informations}</legend>
-  <table>
-    <!-- BEGIN server -->
-    <tr>
-      <td><strong>{L_REMOTE_SITE}</strong></td>
-      <td>{server.SITE_URL}</td>
-    </tr>
-    <!-- END server -->
-    <!-- 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 -->
-    <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 -->
-  </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/default/admin/cat_options.tpl b/template/default/admin/cat_options.tpl
deleted file mode 100644
index a3895f78c..000000000
--- a/template/default/admin/cat_options.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<h1>{lang:title_cat_options}</h1>
-
-<form method="post" action="{F_ACTION}">
-  <fieldset>
-    <legend>{L_SECTION}</legend>
-    {DOUBLE_SELECT}
-  </fieldset>
-</form>
-
-<p class="information">{L_CAT_OPTIONS_INFO}</div>
-
diff --git a/template/default/admin/cat_perm.tpl b/template/default/admin/cat_perm.tpl
deleted file mode 100644
index b71cdedc9..000000000
--- a/template/default/admin/cat_perm.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<h1>{lang:Manage permissions for a category}</h1>
-
-<h2>{CATEGORIES_NAV}</h2>
-
-<form action="{F_ACTION}" method="post" id="categoryPermissions">
-
-  <h2>{lang:Groups}</h2>
-
-  <fieldset>
-    <legend>{lang:Permission granted}</legend>
-    <ul>
-      <!-- BEGIN group_granted -->
-      <li><label><input type="checkbox" name="deny_groups[]" value="{group_granted.ID}" /> {group_granted.NAME}</label></li>
-      <!-- END group_granted -->
-    </ul>
-    <input type="submit" name="deny_groups_submit" value="{lang:Deny selected groups}" />
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:Permission denied}</legend>
-    <ul>
-      <!-- BEGIN group_denied -->
-      <li><label><input type="checkbox" name="grant_groups[]" value="{group_denied.ID}"> {group_denied.NAME}</label></li>
-      <!-- END group_denied -->
-    </ul>
-    <input type="submit" name="grant_groups_submit" value="{lang:Grant selected groups}" />
-  </fieldset>
-
-  <h2>{lang:Users}</h2>
-  
-  <fieldset>
-    <legend>{lang:Permission granted}</legend>
-    <ul>
-      <!-- BEGIN user_granted -->
-      <li><label><input type="checkbox" name="deny_users[]" value="{user_granted.ID}" /> {user_granted.NAME}</label></li>
-      <!-- END user_granted -->
-    </ul>
-    <input type="submit" name="deny_users_submit" value="{lang:Deny selected users}" />
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:Permission granted thanks to a group}</legend>
-    <ul>
-      <!-- BEGIN user_granted_indirect -->
-      <li>{user_granted_indirect.NAME} ({user_granted_indirect.GROUP})</li>
-      <!-- END user_granted_indirect -->
-    </ul>
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:Permission denied}</legend>
-    <ul>
-      <!-- BEGIN user_denied -->
-      <li><label><input type="checkbox" name="grant_users[]" value="{user_denied.ID}"> {user_denied.NAME}</label></li>
-      <!-- END user_denied -->
-    </ul>
-    <input type="submit" name="grant_users_submit" value="{lang:Grant selected users}" />
-  </fieldset>
-
-</form>
diff --git a/template/default/admin/comments.tpl b/template/default/admin/comments.tpl
deleted file mode 100644
index 82c8a9ed5..000000000
--- a/template/default/admin/comments.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1>{lang:User comments validation}</h1>
-
-<form method="post" action="{F_ACTION}">
-
-  <input type="hidden" name="list" value="{LIST}" />
-
-  <!-- BEGIN comment -->
-  <div class="comment">
-    <a class="illustration" href="{comment.U_PICTURE}"><img src="{comment.TN_SRC}" /></a>
-    <p class="commentHeader"><strong>{comment.AUTHOR}</strong> - <em>{comment.DATE}</em></p>
-    <blockquote>{comment.CONTENT}</blockquote>
-    <ul class="actions">
-      <li><label><input type="radio" name="action-{comment.ID}" value="reject" />{lang:Reject}</label></li>
-      <li><label><input type="radio" name="action-{comment.ID}" value="validate" />{lang:Validate}</label></li>
-    </ul>
-  </div>
-  <!-- END comment -->
-
-  <p class="bottomButtons">
-    <input type="submit" name="submit" value="{lang:Submit}" />
-    <input type="submit" name="validate-all" value="{lang:Validate All}" />
-    <input type="submit" name="reject-all" value="{lang:Reject All}" />
-    <input type="reset" value="{lang:Reset}" />
-  </p>
-
-</form>
diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
deleted file mode 100644
index c7835f080..000000000
--- a/template/default/admin/configuration.tpl
+++ /dev/null
@@ -1,202 +0,0 @@
-<h1>{lang:title_configuration}</h1>
-
-<form method="post" action="{F_ACTION}">
-<table width="100%" align="center">
-<!-- BEGIN general -->
-  <tr class="admin">
-    <th colspan="2">{general.L_CONF_TITLE}</th>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="70%"><strong>{general.L_CONF_MAIL}&nbsp;:</strong><br /><span class="small">{general.L_CONF_MAIL_INFO}</span></td>
-	<td class="row1"><input type="text" size="25" maxlength="100" name="mail_webmaster" value="{general.ADMIN_MAIL}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{general.L_CONF_TN_PREFIX}&nbsp;:</strong><br /><span class="small">{general.L_CONF_TN_PREFIX_INFO}</span></td>
-	<td class="row1"><input type="text" size="10" maxlength="10" name="prefix_thumbnail" value="{general.THUMBNAIL_PREFIX}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{general.L_CONF_HISTORY}&nbsp;:</strong><br /><span class="small">{general.L_CONF_HISTORY_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="log" value="true" {general.HISTORY_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="log" value="false" {general.HISTORY_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{general.L_CONF_NOTIFICATION}&nbsp;:</strong><br /><span class="small">{general.L_CONF_NOTIFICATION_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="mail_notification" value="true" {general.NOTIFICATION_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="mail_notification" value="false" {general.NOTIFICATION_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{general.L_CONF_GALLERY_LOCKED}&nbsp;:</strong><br /><span class="small">{general.L_CONF_GALLERY_LOCKED_INFO}</span></td>
-        <td class="row1"><input type="radio" class="radio" name="gallery_locked" value="true" {general.GALLERY_LOCKED_YES} />{L_YES}&nbsp;&nbsp;
-        <input type="radio" class="radio" name="gallery_locked" value="false" {general.GALLERY_LOCKED_NO} />{L_NO}</td>
-  </tr>
-<!-- END general -->
-<!-- BEGIN comments -->
-  <tr class="admin">
-    <th colspan="2">{comments.L_CONF_TITLE}</th>
-  </tr>
-    <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="70%"><strong>{comments.L_CONF_COMMENTS_ALL}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_COMMENTS_ALL_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="comments_forall" value="true" {comments.COMMENTS_ALL_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="comments_forall" value="false" {comments.COMMENTS_ALL_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{comments.L_CONF_NB_COMMENTS_PAGE}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_NB_COMMENTS_PAGE_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="4" name="nb_comment_page" value="{comments.NB_COMMENTS_PAGE}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{comments.L_CONF_VALIDATE}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_VALIDATE_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="comments_validation" value="true" {comments.VALIDATE_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="comments_validation" value="false" {comments.VALIDATE_NO} />{L_NO}</td>
-  </tr>
-<!-- END comments -->
-<!-- BEGIN default -->
-  <tr class="admin">
-    <th colspan="2">{default.L_CONF_TITLE}</th>
-  </tr>
-    <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="70%"><strong>{default.L_CONF_LANG}&nbsp;:</strong><br /><span class="small">{default.L_CONF_LANG_INFO}</span></td>
-	<td class="row1">{default.CONF_LANG_SELECT}</td>
-  </tr>
-  <tr>
-    <td><strong>{default.L_NB_IMAGE_LINE}&nbsp;:</strong><br /><span class="small">{default.L_NB_IMAGE_LINE_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="2" name="nb_image_line" value="{default.NB_IMAGE_LINE}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{default.L_NB_ROW_PAGE}&nbsp;:</strong><br /><span class="small">{default.L_NB_ROW_PAGE_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="2" name="nb_line_page" value="{default.NB_ROW_PAGE}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{default.L_CONF_STYLE}&nbsp;:</strong><br /><span class="small">{default.L_CONF_STYLE_INFO}</span></td>
-	<td class="row1">{default.CONF_STYLE_SELECT}</td>
-  </tr>
-  <tr>
-    <td><strong>{default.L_CONF_RECENT}&nbsp;:</strong><br /><span class="small">{default.L_CONF_RECENT_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="2" name="recent_period" value="{default.CONF_RECENT}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{default.L_CONF_EXPAND}&nbsp;:</strong><br /><span class="small">{default.L_CONF_EXPAND_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="auto_expand" value="true" {default.EXPAND_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="auto_expand" value="false" {default.EXPAND_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{default.L_NB_COMMENTS}&nbsp;:</strong><br /><span class="small">{default.L_NB_COMMENTS_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="show_nb_comments" value="true" {default.SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="show_nb_comments" value="false" {default.SHOW_COMMENTS_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{default.L_MAXWIDTH}&nbsp;:</strong></td>
-	<td><input type="text" size="4" maxlength="4" name="default_maxwidth" value="{default.MAXWIDTH}" />
-	</td>
-  </tr>
-	<tr>
-    <td><strong>{default.L_MAXHEIGHT}&nbsp;:</strong></td>
-	<td><input type="text" size="4" maxlength="4" name="default_maxheight" value="{default.MAXHEIGHT}" />
-	</td>
-  </tr>
-<!-- END default -->
-<!-- BEGIN upload -->
-  <tr class="admin">
-    <th colspan="2">{upload.L_CONF_TITLE}</th>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="70%"><strong>{upload.L_CONF_MAXSIZE}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_MAXSIZE_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxfilesize" value="{upload.UPLOAD_MAXSIZE}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{upload.L_CONF_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_MAXWIDTH_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth" value="{upload.UPLOAD_MAXWIDTH}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{upload.L_CONF_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_MAXHEIGHT_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight" value="{upload.UPLOAD_MAXHEIGHT}" /></td>
-  </tr>
-    <tr>
-    <td><strong>{upload.L_CONF_TN_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_TN_MAXWIDTH_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth_thumbnail" value="{upload.TN_UPLOAD_MAXWIDTH}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{upload.L_CONF_TN_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_TN_MAXHEIGHT_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight_thumbnail" value="{upload.TN_UPLOAD_MAXHEIGHT}" /></td>
-  </tr>
-<!-- END upload -->
-<!-- BEGIN session -->
-  <tr class="admin">
-    <th colspan="2">{session.L_CONF_TITLE}</th>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-    <tr>
-    <td width="70%"><strong>{session.L_CONF_AUTHORIZE_REMEMBERING}&nbsp;:</strong><br /><span class="small">{session.L_CONF_AUTHORIZE_REMEMBERING_INFO}</span></td>
-        <td class="row1"><input type="radio" class="radio" name="authorize_remembering" value="true" {session.AUTHORIZE_REMEMBERING_YES} />{L_YES}&nbsp;&nbsp;
-        <input type="radio" class="radio" name="authorize_remembering" value="false" {session.AUTHORIZE_REMEMBERING_NO} />{L_NO}</td>
-  </tr>
-<!-- END session -->
-<!-- BEGIN metadata -->
-  <tr class="admin">
-    <th colspan="2">{metadata.L_CONF_TITLE}</th>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="70%">
-      <strong>{metadata.L_CONF_EXIF}&nbsp;:</strong>
-      <br /><span class="small">{metadata.L_CONF_EXIF_INFO}</span>
-    </td>
-    <td class="row1">
-      <input type="radio" class="radio" name="use_exif" value="true" {metadata.USE_EXIF_YES} />{L_YES}&nbsp;&nbsp;
-      <input type="radio" class="radio" name="use_exif" value="false" {metadata.USE_EXIF_NO} />{L_NO}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>{metadata.L_CONF_IPTC}&nbsp;:</strong>
-      <br /><span class="small">{metadata.L_CONF_IPTC_INFO}</span>
-    </td>
-    <td class="row1">
-      <input type="radio" class="radio" name="use_iptc" value="true" {metadata.USE_IPTC_YES} />{L_YES}&nbsp;&nbsp;
-      <input type="radio" class="radio" name="use_iptc" value="false" {metadata.USE_IPTC_NO} />{L_NO}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>{metadata.L_CONF_SHOW_EXIF}&nbsp;:</strong>
-      <br /><span class="small">{metadata.L_CONF_SHOW_EXIF_INFO}</span>
-    </td>
-    <td class="row1">
-      <input type="radio" class="radio" name="show_exif" value="true" {metadata.SHOW_EXIF_YES} />{L_YES}&nbsp;&nbsp;
-      <input type="radio" class="radio" name="show_exif" value="false" {metadata.SHOW_EXIF_NO} />{L_NO}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>{metadata.L_CONF_SHOW_IPTC}&nbsp;:</strong>
-      <br /><span class="small">{metadata.L_CONF_SHOW_IPTC_INFO}</span>
-    </td>
-    <td class="row1">
-      <input type="radio" class="radio" name="show_iptc" value="true" {metadata.SHOW_IPTC_YES} />{L_YES}&nbsp;&nbsp;
-      <input type="radio" class="radio" name="show_iptc" value="false" {metadata.SHOW_IPTC_NO} />{L_NO}
-    </td>
-  </tr>
-<!-- END metadata -->
-    <tr>
-      <td colspan="2" align="center">
-        <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}">
-	<input type="reset" name="reset" class="bouton" value="{L_RESET}">
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/template/default/admin/double_select.tpl b/template/default/admin/double_select.tpl
deleted file mode 100644
index 1745c52d3..000000000
--- a/template/default/admin/double_select.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<table class="doubleSelect">
-  <tr>
-    <td>
-      <h3>{L_CAT_OPTIONS_TRUE}</h3>
-      <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
-        <!-- BEGIN category_option_true -->
-        <option {category_option_true.SELECTED} value="{category_option_true.VALUE}">{category_option_true.OPTION}</option>
-        <!-- END category_option_true -->
-      </select>
-      <p><input type="submit" value="&raquo;" name="falsify" style="font-size:15px;"/></p>
-    </td>
-
-    <td>
-      <h3>{L_CAT_OPTIONS_FALSE}</h3>
-      <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
-        <!-- BEGIN category_option_false -->
-        <option {category_option_false.SELECTED} value="{category_option_false.VALUE}">{category_option_false.OPTION}</option>
-        <!-- END category_option_false -->
-      </select>
-      <p><input type="submit" value="&laquo;" name="trueify" style="font-size:15px;" /></p>
-    </td>
-  </tr>
-</table>
diff --git a/template/default/admin/element_set_global.tpl b/template/default/admin/element_set_global.tpl
deleted file mode 100644
index e15baee34..000000000
--- a/template/default/admin/element_set_global.tpl
+++ /dev/null
@@ -1,186 +0,0 @@
-<h1>{lang:Batch management}</h1>
-
-<h2>{CATEGORIES_NAV}</h2>
-
-<p style="text-align:center;">
-  global mode 
-  | <a href="{U_UNIT_MODE}">unit mode</a>
-</p>
-
-<form action="{F_ACTION}" method="post">
-
-<fieldset>
-
-  <legend>Caddie management</legend>
-
-  <ul style="list-style-type:none;">
-
-    <!-- BEGIN in_caddie -->
-    <li><input type="radio" name="caddie_action" value="empty_all" /> Empty caddie</li>
-    <li><input type="radio" name="caddie_action" value="empty_selected" /> Take selected elements out of caddie</li>
-    <!-- END in_caddie -->
-
-    <!-- BEGIN not_in_caddie -->
-    <li><input type="radio" name="caddie_action" value="add_selected" /> Add selected elements to caddie</li>
-    <!-- END not_in_caddie -->
-  
-  </ul>
-
-  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" class="bouton" /></p>
-
-</fieldset>
-
-<fieldset>
-
-  <legend>Display options</legend>
-
-  <p>elements per line :
-      <a href="{U_COLS}&amp;cols=4">4</a>
-    | <a href="{U_COLS}&amp;cols=5">5</a>
-    | <a href="{U_COLS}&amp;cols=6">6</a>
-    | <a href="{U_COLS}&amp;cols=7">7</a>
-    | <a href="{U_COLS}&amp;cols=8">8</a>
-    | <a href="{U_COLS}&amp;cols=9">9</a>
-    | <a href="{U_COLS}&amp;cols=10">10</a>
-  </p>
-
-  <p>elements per page :
-      <a href="{U_DISPLAY}&amp;display=20">20</a>
-    | <a href="{U_DISPLAY}&amp;display=50">50</a>
-    | <a href="{U_DISPLAY}&amp;display=100">100</a>
-    | <a href="{U_DISPLAY}&amp;display=all">all</a>
-  </p>
-
-</fieldset>
-
-<fieldset>
-
-  <legend>Form</legend>
-
-  <table>
-
-    <tr>
-      <td>associate to category</td>
-      <td>
-       <select style="width:400px" name="associate" size="1">
-         <!-- BEGIN associate_option -->
-         <option {associate_option.SELECTED} value="{associate_option.VALUE}">{associate_option.OPTION}</option>
-         <!-- END associate_option -->
-       </select>
-      </td>
-    </tr>
-
-    <tr>
-      <td>dissociate from category</td>
-      <td>
-        <select style="width:400px" name="dissociate" size="1">
-          <!-- BEGIN dissociate_option -->
-          <option {dissociate_option.SELECTED} value="{dissociate_option.VALUE}">{dissociate_option.OPTION}</option>
-          <!-- END dissociate_option -->
-        </select>
-      </td>
-    </tr>
-
-    <tr>
-      <td>add keywords</td>
-      <td><input type="text" name="add_keywords" value="" /></td>
-    </tr>
-
-    <tr>
-      <td>remove keyword</td>
-      <td>
-        <select name="remove_keyword">
-          <!-- BEGIN remove_keyword_option -->
-          <option value="{remove_keyword_option.VALUE}">{remove_keyword_option.OPTION}</option>
-          <!-- END remove_keyword_option -->
-        </select>
-      </td>
-    </tr>
-
-    <tr>
-      <td>author</td>
-      <td>
-        <input type="radio" name="author_action" value="leave" checked="checked" /> leave unchanged
-        <input type="radio" name="author_action" value="unset" /> unset
-        <input type="radio" name="author_action" value="set" id="author_action_set" /> set to
-        <input onmousedown="document.getElementById('author_action_set').checked = true;" type="text" name="author" value="" />
-      </td>
-    </tr>
-
-    <tr>
-      <td>title</td>
-      <td>
-        <input type="radio" name="name_action" value="leave" checked="checked" /> leave unchanged
-        <input type="radio" name="name_action" value="unset" /> unset
-        <input type="radio" name="name_action" value="set" id="name_action_set" /> set to
-        <input onmousedown="document.getElementById('name_action_set').checked = true;" type="text" name="name" value="" />
-      </td>
-    </tr>
-
-    <tr>
-      <td>creation date</td>
-      <td>
-        <input type="radio" name="date_creation_action" value="leave" checked="checked" /> leave unchanged
-        <input type="radio" name="date_creation_action" value="unset" /> unset
-        <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>
-
-  </table>
-
-  <p style="text-align:center;">
-    target
-    <input type="radio" name="target" value="all" /> all
-    <input type="radio" name="target" value="selection" checked="checked" /> selection
-  </p>
-
-    
-  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" /></p>
-
-</fieldset>
-
-<fieldset>
-
-  <legend>Elements</legend>
-
-  <div class="navigationBar">{NAV_BAR}</div>
-
-  <!-- BEGIN thumbnails -->
-  <table valign="top" align="center" class="thumbnail">
-    <!-- BEGIN line -->
-    <tr>
-      <!-- BEGIN thumbnail -->
-      <td class="thumbnail">
-        <label>
-        <img src="{thumbnails.line.thumbnail.SRC}"
-             alt="{thumbnails.line.thumbnail.ALT}"
-             title="{thumbnails.line.thumbnail.TITLE}"
-             class="thumbLink" />
-        <br /><input type="checkbox" name="selection[]" value="{thumbnails.line.thumbnail.ID}" />
-        </label>
-      </td>
-      <!-- END thumbnail -->
-    </tr>
-    <!-- END line -->
-  </table>
-  <!-- END thumbnails -->
-
-</fieldset>
-
-</form>
diff --git a/template/default/admin/element_set_unit.tpl b/template/default/admin/element_set_unit.tpl
deleted file mode 100644
index df1247d2d..000000000
--- a/template/default/admin/element_set_unit.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-<h1>{lang:Batch management}</h1>
-
-<h2>{CATEGORIES_NAV}</h2>
-
-<p style="text-align:center;">
-  <a href="{U_GLOBAL_MODE}">global mode</a>
-  | unit mode
-</p>
-
-<form action="{F_ACTION}" method="POST">
-
-<input type="hidden" name="list" value="{IDS_LIST}" />
-
-<fieldset>
-
-  <legend>Display options</legend>
-
-  <p>elements per page :
-      <a href="{U_ELEMENTS_PAGE}&amp;display=5">5</a>
-    | <a href="{U_ELEMENTS_PAGE}&amp;display=10">10</a>
-    | <a href="{U_ELEMENTS_PAGE}&amp;display=50">50</a>
-    | <a href="{U_ELEMENTS_PAGE}&amp;display=all">all</a>
-  </p>
-
-</fieldset>
-
-<div class="navigationBar">{NAV_BAR}</div>
-
-<!-- BEGIN element -->
-<fieldset class="elementEdit">
-  <legend>{element.LEGEND}</legend>
-
-  <a href="{element.U_EDIT}"><img src="{element.TN_SRC}" alt="" class="miniature" title="{lang:Edit all picture informations}" /></a>
-
-  <table>
-
-    <tr>
-      <td><strong>{lang:Name}</strong></td>
-      <td><input type="text" name="name-{element.ID}" value="{element.NAME}" /></td>
-    </tr>
-
-    <tr>
-      <td><strong>{lang:Author}</strong></td>
-      <td><input type="text" name="author-{element.ID}" value="{element.AUTHOR}" /></td>
-    </tr>
-
-    <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>
-          <!-- END date_creation_day -->
-        </select>
-        <select onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;" name="date_creation_month-{element.ID}">
-          <!-- BEGIN date_creation_month -->
-          <option {element.date_creation_month.SELECTED} value="{element.date_creation_month.VALUE}">{element.date_creation_month.OPTION}</option>
-          <!-- END date_creation_month -->
-        </select>
-        <input onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;"
-               name="date_creation_year-{element.ID}"
-               type="text"
-               size="4"
-               maxlength="4"
-               value="{element.DATE_CREATION_YEAR}" />
-      </td>
-    </tr>
-
-    <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>
-
-</fieldset>
-<!-- END element -->
-
-<p style="text-align:center;">
-  <input type="submit" value="{L_SUBMIT}" name="submit" />
-  <input type="reset" value="{lang:Reset}" />
-</p>
-
-
-</form>
diff --git a/template/default/admin/group_list.tpl b/template/default/admin/group_list.tpl
deleted file mode 100644
index 1bce717ed..000000000
--- a/template/default/admin/group_list.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>{lang:title_groups}</h1>
-
-<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
-  <fieldset>
-    <legend>{lang:Add group}</legend>
-    <label>{lang:Group name} <input type="text" name="groupname" maxlength="50" size="20" /></label>
-    <input type="submit" name="submit_add" value="{lang:Add}" />
-  </fieldset>
-</form>
-
-<table class="table2" style="width:100%;" >
-  <tr class="throw">
-    <th>{lang:Group name}</th>
-    <th>{lang:Members}</th>
-    <th>{lang:Actions}</th>
-  </tr>
-  <!-- BEGIN group -->
-  <tr class="{group.CLASS}">
-    <td>{group.NAME}</td>
-    <td><a href="{group.U_MEMBERS}">{group.MEMBERS}</a></td>
-    <td style="text-align:center;">
-      <a href="{group.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="permissions" title="{lang:permissions}" /></a>
-      <a href="{group.U_DELETE}"><img src="./template/default/theme/delete.png" style="border:none" alt="delete" title="{lang:delete}" /></a>
-    </td>
-  </tr>
-  <!-- END group -->
-</table>
diff --git a/template/default/admin/group_perm.tpl b/template/default/admin/group_perm.tpl
deleted file mode 100644
index ebb4be2e7..000000000
--- a/template/default/admin/group_perm.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>{TITLE}</h1>
-
-<form method="post" action="{F_ACTION}">
-  {DOUBLE_SELECT}
-</form>
-
-<p>{lang:Only private categories are listed}</p>
diff --git a/template/default/admin/help.tpl b/template/default/admin/help.tpl
deleted file mode 100644
index 2a119dcde..000000000
--- a/template/default/admin/help.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>{lang:title_instructions}</h1>
-
-<table style="width:100%;">
-  <!-- BEGIN cat -->
-  <tr class="admin">
-    <th >{cat.NAME}</th>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td>
-      <!-- BEGIN illustration -->
-      <div style="text-align:center;margin:auto;margin-bottom:10px;"><img src="{cat.illustration.SRC_IMG}" style="border:1px solid black;" alt=""/></div>
-      {cat.illustration.CAPTION}
-      <!-- END illustration -->
-      <ul style="text-align:left; margin-right:10px;">
-        <!-- BEGIN item -->
-        <li style="margin-bottom:5px;">{cat.item.CONTENT}</li>
-        <!-- END item -->
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <!-- END cat -->
-</table>
diff --git a/template/default/admin/images/arrow_down.gif b/template/default/admin/images/arrow_down.gif
deleted file mode 100644
index 4adda7a9a..000000000
--- a/template/default/admin/images/arrow_down.gif
+++ /dev/null
diff --git a/template/default/admin/images/arrow_first.gif b/template/default/admin/images/arrow_first.gif
deleted file mode 100644
index aba378384..000000000
--- a/template/default/admin/images/arrow_first.gif
+++ /dev/null
diff --git a/template/default/admin/images/arrow_last.gif b/template/default/admin/images/arrow_last.gif
deleted file mode 100644
index 95e9b33b2..000000000
--- a/template/default/admin/images/arrow_last.gif
+++ /dev/null
diff --git a/template/default/admin/images/arrow_select.gif b/template/default/admin/images/arrow_select.gif
deleted file mode 100644
index 90da978cd..000000000
--- a/template/default/admin/images/arrow_select.gif
+++ /dev/null
diff --git a/template/default/admin/images/arrow_up.gif b/template/default/admin/images/arrow_up.gif
deleted file mode 100644
index 627c2a567..000000000
--- a/template/default/admin/images/arrow_up.gif
+++ /dev/null
diff --git a/template/default/admin/images/collapsed.gif b/template/default/admin/images/collapsed.gif
deleted file mode 100644
index 3084e0877..000000000
--- a/template/default/admin/images/collapsed.gif
+++ /dev/null
diff --git a/template/default/admin/images/delete.gif b/template/default/admin/images/delete.gif
deleted file mode 100644
index 7488b695e..000000000
--- a/template/default/admin/images/delete.gif
+++ /dev/null
diff --git a/template/default/admin/images/errors.png b/template/default/admin/images/errors.png
deleted file mode 100644
index 887ec3d67..000000000
--- a/template/default/admin/images/errors.png
+++ /dev/null
diff --git a/template/default/admin/images/expanded.gif b/template/default/admin/images/expanded.gif
deleted file mode 100644
index a1be9e6e7..000000000
--- a/template/default/admin/images/expanded.gif
+++ /dev/null
diff --git a/template/default/admin/images/icon_folder.gif b/template/default/admin/images/icon_folder.gif
deleted file mode 100644
index cb8e1e69b..000000000
--- a/template/default/admin/images/icon_folder.gif
+++ /dev/null
diff --git a/template/default/admin/images/icon_folder_link.gif b/template/default/admin/images/icon_folder_link.gif
deleted file mode 100644
index 0dd6b7d9a..000000000
--- a/template/default/admin/images/icon_folder_link.gif
+++ /dev/null
diff --git a/template/default/admin/images/icon_folder_lock.gif b/template/default/admin/images/icon_folder_lock.gif
deleted file mode 100644
index 6e03018c8..000000000
--- a/template/default/admin/images/icon_folder_lock.gif
+++ /dev/null
diff --git a/template/default/admin/images/icon_subfolder.gif b/template/default/admin/images/icon_subfolder.gif
deleted file mode 100644
index b96b786d4..000000000
--- a/template/default/admin/images/icon_subfolder.gif
+++ /dev/null
diff --git a/template/default/admin/images/infos.png b/template/default/admin/images/infos.png
deleted file mode 100644
index bf20a2e4c..000000000
--- a/template/default/admin/images/infos.png
+++ /dev/null
diff --git a/template/default/admin/images/moins.gif b/template/default/admin/images/moins.gif
deleted file mode 100644
index 74fa8736f..000000000
--- a/template/default/admin/images/moins.gif
+++ /dev/null
diff --git a/template/default/admin/images/plus.gif b/template/default/admin/images/plus.gif
deleted file mode 100644
index 2fa7116c1..000000000
--- a/template/default/admin/images/plus.gif
+++ /dev/null
diff --git a/template/default/admin/images/puce.gif b/template/default/admin/images/puce.gif
deleted file mode 100644
index b8494bb77..000000000
--- a/template/default/admin/images/puce.gif
+++ /dev/null
diff --git a/template/default/admin/images/stat_left.gif b/template/default/admin/images/stat_left.gif
deleted file mode 100644
index 269088b81..000000000
--- a/template/default/admin/images/stat_left.gif
+++ /dev/null
diff --git a/template/default/admin/images/stat_middle.gif b/template/default/admin/images/stat_middle.gif
deleted file mode 100644
index 99473151e..000000000
--- a/template/default/admin/images/stat_middle.gif
+++ /dev/null
diff --git a/template/default/admin/images/stat_right.gif b/template/default/admin/images/stat_right.gif
deleted file mode 100644
index f9584e23a..000000000
--- a/template/default/admin/images/stat_right.gif
+++ /dev/null
diff --git a/template/default/admin/infos_images.tpl b/template/default/admin/infos_images.tpl
deleted file mode 100644
index 6d5be6404..000000000
--- a/template/default/admin/infos_images.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
-
-<form action="{F_ACTION}" method="POST">
-<div class="admin">{L_INFOS_TITLE} &quot;{CATEGORY}&quot;</div>
-  <table width="100%">
-    <tr>
-      <td><div style="margin-left:50px;">{L_AUTHOR}</div></td>
-      <td style="row1">
-        <input type="text" name="author_cat" value="" maxlength="255" />
-      </td>
-      <td style="text-align:left;">
-        <input type="checkbox" name="use_common_author" value="1" />
-        {L_INFOS_OVERALL_USE}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <div style="margin-left:50px;">{L_INFOS_CREATION_DATE} [DD/MM/YYYY]</div>
-      </td>
-      <td style="row1">
-        <input type="text" name="date_creation_cat" value="" size="12" maxlength="10"/>
-      </td>
-      <td style="text-align:left;">
-        <input type="checkbox" name="use_common_date_creation" value="1" />
-        {L_INFOS_OVERALL_USE}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <div style="margin-left:50px;">{L_KEYWORD} {L_KEYWORD_SEPARATION}</div>
-      </td>
-      <td style="row1">
-        <input type="text" name="keywords_cat" value="" maxlength="255" />
-      </td>
-      <td style="text-align:left;">
-        <input type="radio" name="common_keywords" value="add" />
-        {L_INFOS_ADDTOALL}
-        <input type="radio" name="common_keywords" value="remove" />
-        {L_INFOS_REMOVEFROMALL}
-      </td>
-    </tr>
-  </table>
-  <br />
-  <div class="admin">{L_INFOS_DETAIL}</div>
-  <div class="navigationBar">{NAV_BAR}</div>
-  <table width="100%">
-    <tr>
-      <td style="width:0px;">&nbsp;</td>
-      <td class="row2" style="text-align:center;">{L_THUMBNAIL}</td>
-      <td class="row2" style="text-align:center;">{L_INFOS_IMG}</td>
-      <td class="row2" style="text-align:center;">{L_AUTHOR}</td>
-      <td class="row2" style="text-align:center;">{L_INFOS_COMMENT}</td>
-      <td class="row2" style="text-align:center;">{L_INFOS_CREATION_DATE}</td>
-      <td class="row2" style="text-align:center;">{L_KEYWORD}</td>
-    </tr>
-    <!-- BEGIN picture -->
-    <tr>
-      <td style="width:0px;">
-        <div style="margin-left:2px;margin-right:2px;">
-          <input type="checkbox" name="check-{picture.ID_IMG}" value="1" />
-        </div>
-      </td>
-      <td style="text-align:center;"><a name="{picture.DEFAULTNAME_IMG}" href="{picture.URL_IMG}"><img src="{picture.TN_URL_IMG}" alt="" class="miniature" title="{picture.FILENAME_IMG}" /></a></td>
-      <td style="text-align:center;">{picture.DEFAULTNAME_IMG}<br /><input type="text" name="name-{picture.ID_IMG}" value="{picture.NAME_IMG}" maxlength="255"/></td>
-      <td style="text-align:center;"><input type="text" name="author-{picture.ID_IMG}" value="{picture.AUTHOR_IMG}" maxlength="255" size="12" /></td>
-      <td style="text-align:center;"><textarea name="comment-{picture.ID_IMG}" rows="5" cols="30" style="overflow:auto">{picture.COMMENT_IMG}</textarea></td>
-      <td style="text-align:center;"><input type="text" name="date_creation-{picture.ID_IMG}" value="{picture.DATE_IMG}" maxlength="10" size="10" /></td>
-      <td style="text-align:center;"><input type="text" name="keywords-{picture.ID_IMG}" value="{picture.KEYWORDS_IMG}" length="255" /></td>
-    </tr>
-    <!-- END picture -->
-    <tr>
-      <td colspan="7">
-        <img src="./template/default/admin/images/arrow_select.gif" alt="&uarr;" />
-        {L_INFOS_ASSOCIATE}
-        <select style="width:400px" name="associate" size="1">
-          <!-- BEGIN associate_option -->
-          <option {associate_option.SELECTED} value="{associate_option.VALUE}">{associate_option.OPTION}</option>
-          <!-- END associate_option -->
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="7" style="text-align:center;">
-        <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/template/default/admin/intro.tpl b/template/default/admin/intro.tpl
deleted file mode 100644
index f42e9caae..000000000
--- a/template/default/admin/intro.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<h1>{lang:title_default}</h1>
-
-<dl>
-  <dt>{lang:PhpWebGallery version}</dt>
-  <dd>
-    <ul>
-      <li>PhpWebGallery {PWG_VERSION}</li>
-      <li><a href="{U_CHECK_UPGRADE}">{lang:Check for upgrade}</a></li>
-    </ul>
-  </dd>
-
-  <dt>{lang:Environment}</dt>
-  <dd>
-    <ul>
-      <li>{lang:Operating system}: {OS}</li>
-      <li>PHP: {PHP_VERSION} (<a href="{U_PHPINFO}">{lang:Show info}</a>)</li>
-      <li>MySQL: {MYSQL_VERSION}</li>
-    </ul>
-  </dd>
-
-  <dt>{lang:Database}</dt>
-  <dd>
-    <ul>
-      <li>
-        {DB_ELEMENTS}
-        <!-- BEGIN waiting -->
-        (<a href="{waiting.URL}">{waiting.INFO}</a>)
-        <!-- END waiting -->
-      </li>
-      <li>{DB_CATEGORIES}</li>
-      <li>{DB_USERS}</li>
-      <li>{DB_GROUPS}</li>
-      <li>
-        {DB_COMMENTS}
-        <!-- BEGIN unvalidated -->
-        (<a href="{unvalidated.URL}">{unvalidated.INFO}</a>)
-        <!-- END unvalidated -->
-      </li>
-      <li>{DB_DATE}</li>
-    </ul>
-  </dd>
-
-</dl>
diff --git a/template/default/admin/maintenance.tpl b/template/default/admin/maintenance.tpl
deleted file mode 100644
index 53d8f47cb..000000000
--- a/template/default/admin/maintenance.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>{lang:Maintenance}</h1>
-
-<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_MAINT_FEEDS}">{lang:purge never used notification feeds}</a></li>
-</ul>
diff --git a/template/default/admin/picture_modify.tpl b/template/default/admin/picture_modify.tpl
deleted file mode 100644
index 90a5b7751..000000000
--- a/template/default/admin/picture_modify.tpl
+++ /dev/null
@@ -1,181 +0,0 @@
-<h1>{lang:title_picmod}</h1>
-
-<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>
-
-<form action="{F_ACTION}" method="post">
-
-  <fieldset>
-    <legend>{lang:Informations}</legend>
-
-    <table>
-
-      <tr>
-        <td><strong>{lang:Path}</strong></td>
-        <td>{PATH}</td>
-      </tr>
-
-      <tr>
-        <td><strong>{lang:Registration date}</strong></td>
-        <td>{REGISTRATION_DATE}</td>
-      </tr>
-
-      <tr>
-        <td><strong>{lang:Dimensions}</strong></td>
-        <td>{DIMENSIONS}</td>
-      </tr>
-
-      <tr>
-        <td><strong>{lang:Filesize}</strong></td>
-        <td>{FILESIZE}</td>
-      </tr>
-
-      <tr>
-        <td><strong>{lang:Storage category}</strong></td>
-        <td>{STORAGE_CATEGORY}</td>
-      </tr>
-
-      <!-- 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 id="associations" method="post" action="{F_ACTION}#associations">
-  <fieldset>
-    <legend>{lang:Association to categories}</legend>
-
-    <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>
-
-        <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/default/admin/remote_site.tpl b/template/default/admin/remote_site.tpl
deleted file mode 100644
index 4458bf01c..000000000
--- a/template/default/admin/remote_site.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-<h1>{lang:remote_sites}</h1>
-
-{REMOTE_SITE_TITLE}
-
-<!-- BEGIN update -->
-<div class="admin">{L_RESULT_UPDATE}</div>
-<ul style="text-align:left;">
-  <li class="update_summary_new">{update.NB_NEW_CATEGORIES} {L_NB_NEW_CATEGORIES}</li>
-  <li class="update_summary_new">{update.NB_NEW_ELEMENTS} {L_NB_NEW_ELEMENTS}</li>
-  <li class="update_summary_del">{update.NB_DEL_CATEGORIES} {L_NB_DEL_CATEGORIES}</li>
-  <li class="update_summary_del">{update.NB_DEL_ELEMENTS} {L_NB_DEL_ELEMENTS}</li>
-</ul>
-<!-- BEGIN removes -->
-{L_REMOTE_SITE_REMOVED_TITLE}
-<ul style="text-align:left;">
-  <!-- BEGIN remote_remove -->
-  <li>{update.removes.remote_remove.NAME} {L_REMOTE_SITE_REMOVED}</li>
-  <!-- END remote_remove -->
-</ul>
-<!-- END removes -->
-<!-- END update -->
-
-<!-- BEGIN remote_output -->
-<div class="remoteOutput">
-  <ul>
-    <!-- BEGIN remote_line -->
-    <li class="{remote_output.remote_line.CLASS}">{remote_output.remote_line.CONTENT}</li>
-    <!-- END remote_line -->
-  </ul>
-</div>
-<!-- END remote_output -->
-
-<!-- BEGIN local -->
-<div class="remoteLocal">
-  {L_REMOTE_SITE_LOCAL_FOUND} {local.URL}
-  <!-- BEGIN new_site -->
-  {L_REMOTE_SITE_LOCAL_NEW}
-  <!-- END new_site -->
-  [<a href="{local.U_UPDATE}">{L_REMOTE_SITE_LOCAL_UPDATE}</a>]
-</div>
-<!-- END local -->
-
-<form action="{F_ACTION}" method="post">
-  {L_REMOTE_SITE_CREATE} 
-  <input type="text" name="galleries_url" value="{F_GALLERIES_URL}" />
-  <input class="bouton" type="submit" name="submit" value="{L_SUBMIT}" />
-</form>
-
-<table>
-  <!-- BEGIN site -->
-  <tr>
-    <td>{site.NAME}</td>
-    <td>[<a href="{site.U_GENERATE}" title="{L_REMOTE_SITE_GENERATE_HINT}">{L_REMOTE_SITE_GENERATE}</a>]</td>
-    <td>[<a href="{site.U_UPDATE}" title="{L_REMOTE_SITE_UPDATE_HINT}">{L_REMOTE_SITE_UPDATE}</a>]</td>
-    <td>[<a href="{site.U_CLEAN}" title="{L_REMOTE_SITE_CLEAN_HINT}">{L_REMOTE_SITE_CLEAN}</a>]</td>
-    <td>[<a href="{site.U_DELETE}" title="{L_REMOTE_SITE_DELETE_HINT}">{L_REMOTE_SITE_DELETE}</a>]</td>
-  </tr>
-  <!-- END site -->
-</table>
diff --git a/template/default/admin/search_username.tpl b/template/default/admin/search_username.tpl
deleted file mode 100644
index f3e676f8d..000000000
--- a/template/default/admin/search_username.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<script language="javascript" type="text/javascript">
-<!--
-function refresh_username(selected_username)
-{
-	opener.document.forms['post'].username.value = selected_username;
-	opener.focus();
-	window.close();
-}
-//-->
-</script>
-<div class="titrePage">{L_SEARCH_USERNAME}</div>
-<form method="post" name="search" action="{F_SEARCH_ACTION}">
-  <input type="text" name="search_username" value="{USERNAME}" class="post" />&nbsp; 
-  <input type="submit" name="search" value="{L_SEARCH}" class="bouton" /><br />
-  <span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
-  <!-- BEGIN switch_select_name -->
-  <span class="genmed">{L_UPDATE_USERNAME}<br />
-  <select name="username_list">{switch_select_name.F_USERNAME_OPTIONS}</select>&nbsp; 
-  <input type="submit" class="bouton" onClick="refresh_username(this.form.username_list.options[this.form.username_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br />
-  <!-- END switch_select_name -->
-  <br /><a href="javascript:window.close();" class="adminMenu">{L_CLOSE_WINDOW}</a>
-</form>
diff --git a/template/default/admin/stats.tpl b/template/default/admin/stats.tpl
deleted file mode 100644
index c858c504e..000000000
--- a/template/default/admin/stats.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<h1>{lang:title_history}</h1>
-
-<div class="admin">{L_STAT_TITLE}</div>
-<img class="image" src="{IMG_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />
-<div class="admin">{L_STAT_MONTH_TITLE}</div>
-<table class="table2" width="60%">
-<tr class="throw">
-    <th>{L_VALUE}</th>
-	<th>{L_PAGES_SEEN}</th>
-    <th>{L_VISITORS}</th>
-    <th>{L_PICTURES}</th>
-</tr>
-<!-- BEGIN statrow -->
-  <tr class="{statrow.T_CLASS}">
-    <td>{statrow.VALUE}</td>
-    <td>{statrow.PAGES}</td>
-    <td>{statrow.VISITORS}</td>
-	<td>{statrow.IMAGES}</td>
-  </tr>
-<!-- END statrow -->
-</table>
-<br />
diff --git a/template/default/admin/thumbnail.tpl b/template/default/admin/thumbnail.tpl
deleted file mode 100644
index c99190050..000000000
--- a/template/default/admin/thumbnail.tpl
+++ /dev/null
@@ -1,131 +0,0 @@
-<h1>{lang:title_thumbnails}</h1>
-
-<!-- BEGIN results -->
-<div class="admin">{L_RESULTS}</div>
-<table style="width:100%;">
-  <tr class="throw">
-    <th>{L_PATH}</td>
-    <th>{L_THUMBNAIL}</td>
-    <th>{L_GENERATED}</th>
-    <th>{L_FILESIZE}</td>
-    <th>{L_WIDTH}</td>
-    <th>{L_HEIGHT}</td>
-  </tr>
-  <!-- BEGIN picture -->
-  <tr class="{results.picture.T_CLASS}">
-    <td>{results.picture.PATH}</td>
-    <td><img src="{results.picture.TN_FILE_IMG}" /></td>
-    <td style="text-align:right;" class="{results.picture.T_CLASS}">{results.picture.GEN_TIME}</td>
-    <td style="text-align:right;">{results.picture.TN_FILESIZE_IMG}</td>
-    <td style="text-align:right;">{results.picture.TN_WIDTH_IMG}</td>
-    <td style="text-align:right;">{results.picture.TN_HEIGHT_IMG}</td>
-  </tr>
-  <!-- END picture -->
-</table>
-
-<table class="table2">
-  <tr class="throw">
-    <th colspan="2">{L_TN_STATS}</td>
-  </tr>
-  <tr>
-    <td>{L_TN_NB_STATS}</td>
-    <td style="text-align:center;">{results.TN_NB}</td>
-  </tr>
-  <tr>
-    <td>{L_TN_TOTAL}</td>
-    <td style="text-align:right;">{results.TN_TOTAL}</td>
-  </tr>
-  <tr>
-    <td>{L_TN_MAX}</td>
-    <td style="text-align:right;" class="worst_gen_time">{results.TN_MAX}</td>
-  </tr>
-  <tr>
-    <td>{L_TN_MIN}</td>
-    <td style="text-align:right;" class="best_gen_time">{results.TN_MIN}</td>
-  </tr>
-  <tr>
-    <td>{L_TN_AVERAGE}</td>
-    <td style="text-align:right;">{results.TN_AVERAGE}</td>
-  </tr>
-</table>
-<br />
-<!-- END results -->
-
-<!-- BEGIN params -->
-<form method="post" action="{params.F_ACTION}">
-  <table style="width:100%;">
-    <tr>
-      <th class="admin" colspan="3">{L_PARAMS}</th>
-    </tr>
-    <tr><td colspan="3">&nbsp;</td></tr>
-    <tr>
-      <td><div class="key">{L_GD}</div></td>
-      <td class="choice">
-        <input type="radio" name="gd" value="2" {params.GD2_CHECKED} />2.x
-        <input type="radio" name="gd" value="1" {params.GD1_CHECKED} />1.x
-      </td>
-      <td style="width:50%;" class="row2">{L_GD_INFO}</td>
-    </tr>
-    <tr>
-      <td><div class="key">{L_WIDTH}</div></td>
-      <td class="choice">
-        <input type="text" name="width" value="{params.WIDTH_TN}"/>
-      </td>
-      <td>{L_WIDTH_INFO}</td>
-    </tr>
-    <tr>
-      <td><div class="key">{L_HEIGHT}</div></td>
-      <td class="choice">
-        <input type="text" name="height" value="{params.HEIGHT_TN}"/>
-      </td>
-      <td>{L_HEIGHT_INFO}</td>
-    </tr>
-    <tr>
-      <td><div class="key">{L_CREATE}</div></td>
-      <td class="choice">
-        <input type="radio" name="n" value="5"   {params.n_5_CHECKED} /> 5
-        <input type="radio" name="n" value="10"  {params.n_10_CHECKED} /> 10
-        <input type="radio" name="n" value="20"  {params.n_20_CHECKED} /> 20
-        <input type="radio" name="n" value="all" {params.n_all_CHECKED} /> {L_ALL}
-      </td>
-      <td>{L_CREATE_INFO}</td>
-    </tr>
-    <tr>
-      <td><div class="key">{L_FORMAT}</div></td>
-      <td class="choice"><span style="font-weight:bold;">jpeg</span></td>
-      <td>{L_FORMAT_INFO}</td>
-    </tr>
-    <tr>
-      <td colspan="3" style="text-align:center;">
-        <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}"/>
-      </td>
-    </tr>
-  </table>
-</form>
-<!-- END params -->
-
-<!-- BEGIN warning -->
-<div style="text-align:center;font-weight:bold;margin:10px;"> [ {L_UNLINK} ]</div>
-<!-- END warning -->
-
-<!-- BEGIN remainings -->
-<div class="admin">{remainings.TOTAL_IMG} {L_REMAINING}</div>
-<table style="width:100%;">
-  <tr class="throw">
-    <th>&nbsp;</td>
-    <th style="width:60%;">{L_PATH}</td>
-    <th>{L_FILESIZE}</td>
-    <th>{L_WIDTH}</td>
-    <th>{L_HEIGHT}</td>
-  </tr>
-  <!-- BEGIN remaining -->
-  <tr class="{remainings.remaining.T_CLASS}">
-    <td>{remainings.remaining.NB_IMG}</td>
-    <td><div style="margin-left:10px;">{remainings.remaining.PATH}</div></td>
-    <td><div style="margin-left:10px;">{remainings.remaining.FILESIZE_IMG}</div></td>
-    <td><div style="margin-left:10px;">{remainings.remaining.WIDTH_IMG}</div></td>
-    <td><div style="margin-left:10px;">{remainings.remaining.HEIGHT_IMG}</div></td>
-  </tr>
-  <!-- END remaining -->
-</table>
-<!-- END remainings -->
diff --git a/template/default/admin/update.tpl b/template/default/admin/update.tpl
deleted file mode 100644
index ef47d47e0..000000000
--- a/template/default/admin/update.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-<h1>{lang:title_update}</h1>
-
-<!-- BEGIN update -->
-<div class="admin">{L_RESULT_UPDATE}</div>
-<ul style="text-align:left;">
-  <li class="update_summary_new">{update.NB_NEW_CATEGORIES} {L_NB_NEW_CATEGORIES}</li>
-  <li class="update_summary_new">{update.NB_NEW_ELEMENTS} {L_NB_NEW_ELEMENTS}</li>
-  <li class="update_summary_del">{update.NB_DEL_CATEGORIES} {L_NB_DEL_CATEGORIES}</li>
-  <li class="update_summary_del">{update.NB_DEL_ELEMENTS} {L_NB_DEL_ELEMENTS}</li>
-  <li class="update_summary_err">{update.NB_ERRORS} {L_UPDATE_NB_ERRORS}</li>
-</ul>
-<!-- BEGIN update_errors -->
-<div class="admin">{L_UPDATE_ERROR_LIST_TITLE}</div>
-<ul style="text-align:left;">
-  <!-- BEGIN update_error -->
-  <li>[{update.update_errors.update_error.ELEMENT}] {update.update_errors.update_error.LABEL}</li>
-  <!-- END update_error -->
-</ul>
-<div class="admin">{L_UPDATE_ERRORS_CAPTION}</div>
-<ul style="text-align:left;">
-  <li><strong>PWG-UPDATE-1</strong> : {L_UPDATE_WRONG_DIRNAME_INFO}</li>
-  <li><strong>PWG-UPDATE-2</strong> : {L_UPDATE_MISSING_TN_INFO} {{PICTURE_EXT_LIST}}</li>
-</ul>
-<!-- END update_errors -->
-<!-- BEGIN update_infos -->
-<div class="admin">{L_UPDATE_INFOS_TITLE}</div>
-<ul style="text-align:left;">
-  <!-- BEGIN update_info -->
-  <li>[{update.update_infos.update_info.ELEMENT}] {update.update_infos.update_info.LABEL}</li>
-  <!-- END update_info -->
-</ul>
-<!-- END update_infos -->
-<!-- END update -->
-
-<!-- BEGIN metadata_result -->
-<div class="admin">{L_RESULT_METADATA}</div>
-<ul style="text-align:left;">
-  <li>{metadata_result.NB_ELEMENTS} {L_ELEMENTS_METADATA_SYNC}</li>
-  <li>{L_USED_METADATA} : {METADATA_LIST}</li>
-</ul>
-<!-- END metadata_result -->
-
-<!-- BEGIN introduction -->
-<div class="admin">{L_UPDATE_TITLE}</div>
-<form action="{F_ACTION}" method="post">
-  <ul class="menu">
-    <li>
-      {L_UPDATE_SYNC_FILES}
-      <ul class="menu">
-        <li><input type="radio" name="sync" value="dirs" {SYNC_DIRS_CHECKED} /> {L_UPDATE_SYNC_DIRS}</li>
-        <li><input type="radio" name="sync" value="files" {SYNC_ALL_CHECKED} /> {L_UPDATE_SYNC_ALL}</li>
-        <li><input type="checkbox" name="display_info" value="1" {DISPLAY_INFO_CHECKED} /> {L_UPDATE_DISPLAY_INFO}</li>
-        <li><input type="checkbox" name="simulate" value="1" checked="checked" /> {L_UPDATE_SIMULATE}</li>
-      </ul>
-    </li>
-    <li>
-      {L_UPDATE_SYNC_METADATA}. {L_USED_METADATA} : {METADATA_LIST}.
-      <ul class="menu">
-        <li><input type="radio" name="sync" value="metadata_new" /> {L_UPDATE_SYNC_METADATA_NEW}</li>
-        <li><input type="radio" name="sync" value="metadata_all" /> {L_UPDATE_SYNC_METADATA_ALL}</li>
-      </ul>
-    </li>
-    <li>
-      {L_UPDATE_CATS_SUBSET}<br />
-      <select style="width:500px" name="cat" size="10">
-        <!-- BEGIN category_option -->
-        <option {introduction.category_option.SELECTED} value="{introduction.category_option.VALUE}">{introduction.category_option.OPTION}</option>
-        <!-- END category_option -->
-      </select>
-      <input type="checkbox" name="subcats-included" value="1" {SUBCATS_INCLUDED_CHECKED} /> {L_SEARCH_SUBCATS_INCLUDED}
-    </li>
-  </ul>
-  <p style="text-align:center;">
-    <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
-    <input type="reset"  value="{L_RESET}"  name="reset"  class="bouton" />
-  </p>
-</form>
-<!-- END introduction -->
diff --git a/template/default/admin/user_list.tpl b/template/default/admin/user_list.tpl
deleted file mode 100644
index a66c6f4ba..000000000
--- a/template/default/admin/user_list.tpl
+++ /dev/null
@@ -1,270 +0,0 @@
-<h1>{lang:title_liste_users}</h1>
-
-<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
-  <fieldset>
-    <legend>{lang:Add a user}</legend>
-    <label>{L_USERNAME} <input type="text" name="login" maxlength="50" size="20" /></label>
-    <label>{L_PASSWORD} <input type="text" name="password" /></label>
-    <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" />
-  </fieldset>
-</form>
-
-<form class="filter" method="get" name="filter" action="{F_FILTER_ACTION}">
-
-  <input type="hidden" name="page" value="user_list" />
-  
-  <!-- BEGIN session -->
-  <input type="hidden" name="id" value="{session.ID}" />
-  <!-- END session -->
-
-<fieldset>
-
-  <legend>{lang:Filter}</legend>
-
-
-  <label>{lang:username} <input type="text" name="username" value="{F_USERNAME}" /></label>
-
-  <label>
-  {lang:status}
-  <select name="status">
-    <!-- BEGIN status_option -->
-    <option value="{status_option.VALUE}" {status_option.SELECTED} > {status_option.CONTENT}</option>
-    <!-- END status_option -->
-  </select>
-  </label>
-
-  <label>
-  {lang:group}
-  <select name="group">
-    <!-- BEGIN group_option -->
-    <option value="{group_option.VALUE}" {group_option.SELECTED} > {group_option.CONTENT}</option>
-    <!-- END group_option -->
-  </select>
-  </label>
-
-  <label>
-  {lang:Order by}
-  <select name="order_by">
-    <!-- BEGIN order_by -->
-    <option value="{order_by.VALUE}" {order_by.SELECTED} >{order_by.CONTENT}</option>
-    <!-- END order_by -->
-  </select>
-  </label>
-
-  <label>
-  {lang:Sort order}
-  <select name="direction">
-    <!-- BEGIN direction -->
-    <option value="{direction.VALUE}" {direction.SELECTED} >{direction.CONTENT}</option>
-    <!-- END direction -->
-  </select>
-  </label>
-
-  <input type="submit" name="submit_filter" value="{L_SUBMIT}" class="bouton" />
-
-</fieldset>
-
-</form>
-
-<form method="post" name="preferences" action="{F_PREF_ACTION}">
-
-<table class="table2" style="width:100%;" >
-  <tr class="throw">
-    <th style="width:1%;"></th>
-    <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 class="{user.CLASS}">
-    <td><input type="checkbox" name="selection[]" value="{user.ID}" {user.CHECKED} id="selection-{user.ID}" /></td>
-    <td><label for="selection-{user.ID}">{user.USERNAME}</label></td>
-    <td>{user.STATUS}</td>
-    <td>{user.EMAIL}</td>
-    <td>{user.GROUPS}</td>
-    <td style="text-align:center;">
-      <a href="{user.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
-    </td>
-  </tr>
-  <!-- END user -->
-</table>
-<div class="navigationBar">{NAVBAR}</div>
-
-<!-- delete the selected users ? -->
-<fieldset>
-  <legend>{lang:Deletions}</legend>
-  <input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}
-  <input type="submit" value="{lang:Delete selected users}" name="delete" class="bouton" />
-</fieldset>
-
-<!-- form to set properties for many users at once -->
-<fieldset>
-  <legend>{lang:Groups}</legend>
-
-<table>
-
-  <tr>
-    <td>{lang:associate to group}</td>
-    <td>
-      <select name="associate" size="1">
-        <!-- BEGIN associate_option -->
-        <option {associate_option.SELECTED} value="{associate_option.VALUE}">{associate_option.CONTENT}</option>
-        <!-- END associate_option -->
-      </select>
-    </td>
-  </tr>
-
-  <tr>
-    <td>{lang:dissociate from group}</td>
-    <td>
-      <select name="dissociate" size="1">
-        <!-- BEGIN dissociate_option -->
-        <option {dissociate_option.SELECTED} value="{dissociate_option.VALUE}">{dissociate_option.CONTENT}</option>
-        <!-- END dissociate_option -->
-      </select>
-    </td>
-  </tr>
-
-</table>
-
-</fieldset>
-
-<fieldset>
-  <legend>{lang:Preferences}</legend>
-
-<table>
-
-  <tr>
-    <td>{L_NB_IMAGE_LINE}</td>
-    <td>
-      <input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> set to
-      <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
-             size="3" maxlength="2" type="text" name="nb_image_line" value="{NB_IMAGE_LINE}" />
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_NB_LINE_PAGE}</td>
-    <td>
-      <input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> set to
-      <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
-             size="3" maxlength="2" type="text" name="nb_line_page" value="{NB_LINE_PAGE}" />
-    <td>
-  </tr>
-
-  <tr>
-    <td>{L_TEMPLATE}</td>
-    <td>
-      <input type="radio" name="template_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="template_action" value="set" id="template_action_set" /> set to
-      <select onmousedown="document.getElementById('template_action_set').checked = true;" name="template" size="1">
-        <!-- BEGIN template_option -->
-        <option {template_option.SELECTED} value="{template_option.VALUE}">{template_option.CONTENT}</option>
-        <!-- END template_option -->
-      </select>
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_LANGUAGE}</td>
-    <td>
-      <input type="radio" name="language_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="language_action" value="set" id="language_action_set" /> set to
-      <select onmousedown="document.getElementById('language_action_set').checked = true;" name="language" size="1">
-        <!-- BEGIN language_option -->
-        <option {language_option.SELECTED} value="{language_option.VALUE}">{language_option.CONTENT}</option>
-        <!-- END language_option -->
-      </select>
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_RECENT_PERIOD}</td>
-    <td>
-      <input type="radio" name="recent_period_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> set to
-      <input onmousedown="document.getElementById('recent_period_action_set').checked = true;"
-             type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" />
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_EXPAND}</td>
-    <td>
-      <input type="radio" name="expand_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="expand_action" value="set" id="expand_action_set" /> set to
-      <input onmousedown="document.getElementById('expand_action_set').checked = true;" 
-             type="radio" class="radio" name="expand" value="true"  {EXPAND_YES} />{L_YES}
-      <input onmousedown="document.getElementById('expand_action_set').checked = true;"
-             type="radio" class="radio" name="expand" value="false" {EXPAND_NO}  />{L_NO}
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_SHOW_NB_COMMENTS}</td>
-    <td>
-      <input type="radio" name="show_nb_comments_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="show_nb_comments_action" value="set" id="show_nb_comments_action_set" /> set to
-      <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;"
-             type="radio" class="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}
-      <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;"
-             type="radio" class="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_MAXWIDTH}</td>
-    <td>
-      <input type="radio" name="maxwidth_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="maxwidth_action" value="unset" /> unset
-      <input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> set to 
-      <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
-             type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
-    </td>
-  </tr>
-
-
-  <tr>
-    <td>{L_MAXHEIGHT}</td>
-    <td>
-      <input type="radio" name="maxheight_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="maxheight_action" value="unset" /> unset
-      <input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> set to 
-      <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
-             type="text" size="4" maxlength="4" name="maxheight" value="{maxheight}" />
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_STATUS}</td>
-    <td>
-      <input type="radio" name="status_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="status_action" value="set" id="status_action_set" /> set to
-      <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1">
-        <!-- BEGIN pref_status_option -->
-        <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option>
-        <!-- END pref_status_option -->
-      </select>
-    </td>
-  </tr>
-
-</table>
-
-</fieldset>
-
-<p style="text-align:center;">
-  target  
-  <input type="radio" name="target" value="all" /> all
-  <input type="radio" name="target" value="selection" checked="checked" /> selection
-</p>
-
-<p style="text-align:center;">
-  <input type="submit" value="{L_SUBMIT}" name="pref_submit" class="bouton" />
-  <input type="reset" value="{L_RESET}" name="pref_reset" class="bouton" />
-</p>
-
-</form>
diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl
deleted file mode 100644
index 108885d1e..000000000
--- a/template/default/admin/user_perm.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<h1>{TITLE}</h1>
-
-<!-- BEGIN groups -->
-<fieldset>
-  <legend>{lang:Categories authorized thanks to group associations}</legend>
-
-  <ul>
-    <!-- BEGIN category -->
-    <li>{groups.category.NAME}</li>
-    <!-- END category -->
-  </ul>
-</fieldset>
-<!-- END groups -->
-
-<fieldset>
-  <legend>{lang:Other private categories}</legend>
-
-  <form method="post" action="{F_ACTION}">
-    {DOUBLE_SELECT}
-  </form>
-</fieldset>
diff --git a/template/default/admin/waiting.tpl b/template/default/admin/waiting.tpl
deleted file mode 100644
index 9daf2c75d..000000000
--- a/template/default/admin/waiting.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<h1>{lang:title_waiting}</h1>
-
-<form action="{F_ACTION}" method="post">
-  <table style="width:100%;" >
-    <tr class="throw">
-      <th style="width:20%;">{L_CATEGORY}</th>
-      <th style="width:20%;">{L_DATE}</th>
-      <th style="width:20%;">{L_FILE}</th>
-      <th style="width:20%;">{L_THUMBNAIL}</th>
-      <th style="width:20%;">{L_AUTHOR}</th>
-      <th style="width:1px;">&nbsp;</th>
-    </tr>
-    <!-- BEGIN picture -->
-    <tr>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.CATEGORY_IMG}</td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.DATE_IMG}</td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <a target="_blank" href="{picture.PREVIEW_URL_IMG}">{picture.FILE_IMG}</a>
-      </td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <!-- BEGIN thumbnail -->
-        <a target="_blank" href="{picture.thumbnail.PREVIEW_URL_TN_IMG}">{picture.thumbnail.FILE_TN_IMG}</a>
-        <!-- END thumbnail -->
-      </td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <a href="mailto:{picture.UPLOAD_EMAIL}">{picture.UPLOAD_USERNAME}</a>
-      </td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <input type="radio" name="validate-{picture.ID_IMG}" value="true" />{L_SUBMIT}
-        <input type="radio" name="validate-{picture.ID_IMG}" value="false" />{L_DELETE}
-      </td>
-    </tr>
-    <!-- END picture -->
-    <tr>
-      <td colspan="6" 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>
diff --git a/template/default/category.tpl b/template/default/category.tpl
deleted file mode 100644
index fb5352443..000000000
--- a/template/default/category.tpl
+++ /dev/null
@@ -1,148 +0,0 @@
-<div style="padding:3px;"><img src="template/default/images/logo.jpg"></div>
-<table style="width:100%;">
-  <tr>
-    <td valign="top" style="padding:0px 10px 0px 10px;width:1%;">
-      <div class="table1">
-        <!-- BEGIN links -->
-        <div class="titreMenu">{lang:Links}</div>
-        <div class="menu">
-          <ul class="menu">
-            <!-- BEGIN link -->
-            <li><a href="{links.link.URL}">{links.link.LABEL}</a></li>
-            <!-- END link -->
-          </ul>
-        </div>
-        <!-- END links -->
-        <div class="titreMenu">
-          <a href="{U_HOME}">{L_CATEGORIES}</a>
-        </div>
-        <div class="menu">
-            {MENU_CATEGORIES_CONTENT}
-        <div class="totalImages">[&nbsp;{NB_PICTURE}&nbsp;{L_TOTAL}&nbsp;]</div>
-		</div>
-		<div class="titreMenu">{L_SPECIAL_CATEGORIES}</div>
-		<div class="menu">
-		    <ul class="menu">
-                      <!-- BEGIN special_cat -->
-                      <li><a href="{special_cat.URL}" title="{special_cat.TITLE}">{special_cat.NAME}</a></li>
-                      <!-- END special_cat -->
-		    </ul>
-		</div>
-		<div class="titreMenu">{L_SUMMARY}</div>
-		<div class="menu">
-		<ul class="menu">
-		  <!-- BEGIN summary -->
-		  <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}">{summary.NAME}</a></li>
-		  <!-- END summary -->
-		  <!-- BEGIN upload -->
-		  <li><a href="{upload.U_UPLOAD}">{L_UPLOAD}</a></li>
-		  <!-- END upload -->
-		</ul>
-		</div>
-		<div class="titreMenu">{L_IDENTIFY}</div>
-		 <div class="menu">
-                 <!-- BEGIN hello -->
-                 <p>{L_HELLO}&nbsp;{USERNAME}&nbsp;!</p>
-                 <!-- END hello -->
-		<ul class="menu">
-
-                  <!-- BEGIN register -->
-		  <li><a href="{U_REGISTER}">{L_REGISTER}</a></li>
-                  <!-- END register -->
-
-		  <!-- BEGIN login -->
-		  <li><a href="{F_IDENTIFY}">{L_LOGIN}</a></li>
-                  <!-- END login -->
-
-                  <!-- BEGIN logout -->
-                  <li><a href="{U_LOGOUT}">{L_LOGOUT}</a></li>
-                  <!-- END logout -->
-                  
-                  <!-- BEGIN profile -->
-                  <li><a href="{U_PROFILE}" title="{L_PROFILE_HINT}">{L_PROFILE}</a></li>
-                  <!-- END profile -->
-
-                  <!-- BEGIN admin -->
-                  <li><a href="{U_ADMIN}" title="{L_ADMIN_HINT}">{L_ADMIN}</a></li>
-                  <!-- END admin -->
-
-                </ul>
-
-                <!-- BEGIN quickconnect -->
-                <hr />
-                <form method="post" action="{F_IDENTIFY}">
-	          <input type="hidden" name="redirect" value="{U_REDIRECT}">
-		  {L_USERNAME}<br />
-		  <input type="text" name="username" size="15" value="" /><br />
-		  {L_PASSWORD}<br />
-		  <input type="password" name="password" size="15"><br />
-                  <!-- BEGIN remember_me -->
-                  <input type="checkbox" name="remember_me" value="1" /> {L_REMEMBER_ME}<br />
-                  <!-- END remember_me -->
-		  <input type="submit" name="login" value="{L_SUBMIT}" class="bouton" />
-		</form>
-		<!-- END quickconnect -->
-
-		</div>
-      </div>
-	</td>
-	<td style="padding:0px 10px 0px 10px; width:99%;" valign="top">
-	  <div class="home">
-            <div class="titrePage">
-              <ul class="categoryActions">
-                <!-- BEGIN caddie -->
-                <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>
-              {TITLE}
-            </div>
-			<!-- BEGIN calendar -->
-               <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
-			  <div class="navigationBar">{calendar.MONTHS_NAV_BAR}</div>
-			<!-- END calendar -->
-			<!-- BEGIN thumbnails -->
-			<table valign="top" align="center" class="thumbnail">
-			  <!-- BEGIN line -->
-			  <tr>
-				<!-- BEGIN thumbnail -->
-				<td class="thumbnail">
-				  <a href="{thumbnails.line.thumbnail.U_IMG_LINK}">
-				  <img src="{thumbnails.line.thumbnail.IMAGE}"
-					   alt="{thumbnails.line.thumbnail.IMAGE_ALT}"
-					   title="{thumbnails.line.thumbnail.IMAGE_TITLE}"
-					   class="thumbLink" />
-                                  <!-- BEGIN element_name -->
-				  <br />
-				  <span class="thumb_picture">{thumbnails.line.thumbnail.element_name.NAME}</span>
-                                  <!-- END element_name -->
-                                  <!-- BEGIN category_name -->
-                                  <br />
-                                  <span class="thumb_category">[{thumbnails.line.thumbnail.category_name.NAME}]</span>
-                                  <!-- END ategory_name -->
-                                  </a>
-				  {thumbnails.line.thumbnail.IMAGE_TS}
-				  <!-- BEGIN nb_comments -->
-				  <br />{thumbnails.line.thumbnail.nb_comments.NB_COMMENTS} {L_COMMENT}
-				  <!-- END nb_comments -->
-				</td>
-				<!-- END thumbnail -->
-			  </tr>
-			  <!-- END line -->
-			</table>
-			<!-- END thumbnails -->
-			<!-- BEGIN cat_infos -->
-			  <!-- BEGIN navigation -->
-			  <div class="navigationBar">{cat_infos.navigation.NAV_BAR}</div>
-			  <!-- END navigation -->
-			  <!-- BEGIN comment -->
-			  <div class="info">{cat_infos.comment.COMMENTS}</div>
-			  <!-- END comment -->
-			<!-- END cat_infos -->
-      </div>
-	</td>
-  </tr>
-</table>
diff --git a/template/default/comments.tpl b/template/default/comments.tpl
deleted file mode 100644
index 5aa668499..000000000
--- a/template/default/comments.tpl
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- BEGIN title -->
-<div class="titrePage">{L_COMMENT_TITLE}</div>
-<!-- END title -->
-
-<form class="filter" action="{F_ACTION}" method="get">
-
-  <fieldset>
-    <legend>{lang:Filter}</legend>
-
-    <label>{lang:Keyword}<input type="text" name="keyword" value="{F_KEYWORD}" /></label>
-
-    <label>{lang:Author}<input type="text" name="author" value="{F_AUTHOR}" /></label>
-
-    <label>
-      {lang:Category}
-      <select name="cat">
-        <!-- BEGIN category -->
-        <option class="{category.CLASS}" {category.SELECTED} value="{category.VALUE}">{category.OPTION}</option>
-        <!-- END category -->
-      </select>
-    </label>
-
-    <label>
-      {lang:Since}
-      <select name="since">
-        <!-- BEGIN since_option -->
-        <option {since_option.SELECTED} value="{since_option.VALUE}">{since_option.CONTENT}</option>
-        <!-- END since_option -->
-      </select>
-    </label>
-
-  </fieldset>
-
-  <fieldset>
-
-    <legend>{lang:Display}</legend>
-
-    <label>
-      {lang:Sort by}
-      <select name="sort_by">
-        <!-- BEGIN sort_by_option -->
-        <option value="{sort_by_option.VALUE}" {sort_by_option.SELECTED} >{sort_by_option.CONTENT}</option>
-        <!-- END sort_by_option -->
-      </select>
-    </label>
-
-    <label>
-      {lang:Sort order}
-      <select name="sort_order">
-        <!-- BEGIN sort_order_option -->
-        <option value="{sort_order_option.VALUE}" {sort_order_option.SELECTED} >{sort_order_option.CONTENT}</option>
-        <!-- END sort_order_option -->
-      </select>
-    </label>
-
-    <label>
-      {lang:Number of items}
-      <select name="items_number">
-        <!-- BEGIN items_number_option -->
-        <option value="{items_number_option.VALUE}" {items_number_option.SELECTED} >{items_number_option.CONTENT}</option>
-        <!-- END items_option -->
-      </select>
-    </label>
-
-  </fieldset>
-
-  <input type="submit" name="submit" value="{lang:Filter and display}" />
-
-</form>
-
-<div class="navigationBar">{NAVBAR}</div>
-<a class="admin" href="{U_HOME}" title="{lang:return to homepage}">{lang:home}</a>
-
-<!-- BEGIN validation -->
-<form action="{F_ACTION}" method="post">
-<!-- END validation -->
-<table class="table2">
-<!-- BEGIN picture -->
-<tr class="row1">
-<td >
-<a href="{picture.U_THUMB}" title="{picture.TITLE_IMG}">
-<img src="{picture.I_THUMB}" class="thumbLink" alt="{picture.THUMB_ALT_IMG}"/>
-</a>
-</td>
-<td class="tablecompact">
-  <div class="commentTitle">{picture.TITLE_IMG}</div>
-  <div class="commentsNavigationBar">{picture.NAV_BAR}</div>
-  <table class="tablecompact">
-  <!-- BEGIN comment -->
-	<tr class="throw">
-	  <td class="throw">
-	  {picture.comment.COMMENT_AUTHOR}
-	  </td>
-	  <td class="commentDate">
-	  {picture.comment.COMMENT_DATE}
-	<!-- BEGIN validation -->
-	<input type="checkbox" name="comment_id[]" value="{picture.comment.validation.ID}" {picture.comment.validation.CHECKED} />
-	<!-- END validation -->
-	  </td>
-	</tr>
-	<tr class="row1">
-	  <td class="comment" colspan="2">{picture.comment.COMMENT}</td>
-	</tr>
-	<!-- END comment -->
-  </table>
-</td>
-</tr>
-<!-- END picture -->
-</table>
-<!-- BEGIN validation -->
-<div align="center">
-<input type="submit" name="validate" class="bouton" value="{lang:submit}" />
-<input type="submit" name="delete" class="bouton" value="{lang:delete}" />
-</div>
-</form>
-<!-- END validation -->
diff --git a/template/default/default.css b/template/default/default.css
deleted file mode 100644
index 72914717e..000000000
--- a/template/default/default.css
+++ /dev/null
@@ -1,668 +0,0 @@
-/* BACKGROUND */
-
-body { background-color:#000000;} /*General background color*/
-.main, .throw, .admin, .radio {	background-color:#3F3F3F;} /*Main background color*/
-.row1,input,select,textarea, .table1, .home { background-color:#5F5F5F;} /* Tables & forms */
-.table2, .commentTitle { background-color: #797979;} /* Alternate table & comments  */
-.errors { background-color:red;} /* Errors display */
-.titreMenu,.titrePage,.imgMenu a:hover { background-image: url(theme/tableh1_bg.gif);} /* Titles background image  */
-.bouton, .imgMenu a, #imgBarMenu { background-image: url(theme/button_bg.gif);} /* Buttons background image */
-
-/* FONT COLORS */
-
-body { color:#E0E0E0;} /* General font color */
-input,select,textarea { color:#FFFFCC;} /* Forms font color */
-.titreMenu, .titreMenu a, .info, .admin{ color:#FFF48E;} /* Menu & sections titles */
-.titrePage, .titreMenu a:hover { color:#E0E0E0;} /* Page title */
-.comment{ color:#C6B78E;} /* Comments */
-.commentDate { color:#999999;} /* Comments date */
-.throw { color:#FFFFCC;} /* First line of tables */
-.bouton, .errors { color:#FFFFFF;} /* Buttons & errors */
-
-/* FONT COLORS (admin side) */
-
-.update_summary_new, .best_gen_time { color:#9cb4ce;}
-.update_summary_del,.worst_gen_time { color:#ffe1e1;}
-
-/* ANCHORS */
-
-a {
-  text-decoration: none;
-  color: #F6B620;
-}
-
-a:hover {
-  text-decoration:none;
-  color: #ffee40;
-}
-
-a.none:hover { text-decoration:none;}
-a.image:hover { text-decoration:none;}
-a.thumbLink:hover { text-decoration:none;}
-
-/* FONT STYLES */
-
-body /* Main font style */
-{
-  font-family: Verdana, Geneva, Arial, sans-serif;
-  font-size:12px;
-  margin:5px;
-}
-
-h1 /* H1 tag style (admin side only) */
-{
-	font-family: 'Trebuchet MS', Verdana, sans-serif;
-	text-decoration:none; 
-	line-height:	120%;
-	font-size:18px;
-	font-weight: bold;
-}
-
-.titreMenu /* Menu titles */
-{
-  font-size:12px;
-  font-weight:600;
-}
-
-.titrePage /* Page titles */
-{
-  font-family: 'Trebuchet MS', Verdana, sans-serif;
-  font-weight:600;
-  font-size:16px;
-}
-
-.commentTitle /* Comments title */
-{
-  font-family: Arial, Helvetica, sans-serif;
-  font-size:12px;
-  font-weight:bold;
-}
-
-.menu, .thumbnail, .totalImages { font-size:11px;}
-.small{ font-size:10px;}
-.menuCategorySelected, .throw, .admin, .errors { font-weight:bold;}
-.menuCategoryNotSelected, .dateSelected, .pageNumberSelected, .thumb_picture, .thumb_category  { font-weight:normal;}
-.commentDate, .bouton  { font-weight:lighter;}
-.commentImage { font-style:italic; font-size:16px;}
-.nameImage { font-size:20px;}
-.info { font-size:16px;}
-.copyright { font-size:10px; text-align:center; letter-spacing:-1px;}
-div.information {  font-size:14px; font-weight:bold;}
-
-/*----------------------------------------------*/
-/* A good understanding of the CSS mechanism    */
-/* is required below.                           */
-/*                                              */
-/* Do not modify the valuesunless you are aware */
-/* of what you are doing!                       */
-/*----------------------------------------------*/
-
-/* POSITION */
-
-div#pictureTitle {
-  float:left;
-  text-align:left;
-}
-
-div#pictureNumber {
-  float:right;
-  text-align:right;
-}
-
-#gauche,#droite
-{
-  float:left;
-  width:30%;
-  text-align:left;
-  white-space:nowrap;
-}
-
-#centre
-{
-  float:left;
-  width:39%;
-  text-align:center;
-}
-
-#droite{text-align:right;}
-#left {float:left; }
-#right{float:right; }
-
-/* GENERAL LAYOUT STYLES */
-
-.main 
-{
-	border: 1px solid #E0E0E0; 
-	width:100%;
-	padding-bottom:30px;
-	text-align:center;
-	display:block;
-}
-
-.home
-{
-  border: 1px solid #000000;
-  display:block;
-  text-align:center;
-  width:100%;
-}
-
-.navigationBar 
-{
-  text-align:center;
-  margin-top:10px;
-  margin-bottom:10px;
-}
-
-.info 
-{
-  margin:5px 0px 5px 0px;
-  /* white-space:nowrap; */
-  text-align:center;
-}
-
-.errors 
-{
-  text-align:left;
-  margin-top:5px;
-  margin-bottom:5px;
-  border:1px solid black;
-}
-
-div.information {
-  text-align:left;
-  margin:10px;
-  padding:5px;
-}
-
-span.dateSelected, span.pageNumberSelected {
-  text-decoration:underline;
-}
-/* MENU LAYOUT STYLES */
-
-.titreMenu,.titrePage
-{
-  padding-right: 10px;
-  padding-left: 10px;
-  border-bottom: 1px solid #000000;
-  border-right: 1px solid #000000;
-  height: 25px;
-  line-height: 25px;
-  text-align:center;
-}
-.titrePage {text-align:left;}
-
-.menu 
-{
-  margin:10px 5px 10px 5px;
-  white-space:nowrap;
-  text-align:left;
-}
-
-ul.menu 
-{
-  text-align:left;
-  list-style-type: square ;
-  padding-left:15px;
-  margin:5px;
-}
-
-.totalImages {
-  text-align:center;
-  margin-top:5px;
-}
-
- /* IMAGE LAYOUT STYLES */
- 
-.image 
-{
-	border : 3px solid #FFFFFF;
-	margin : 10px 4px 10px 4px;
-}
-
-#imgBarMenu
-{
-  width:100%;
-  display:block;
-  height:25px;
-  border-bottom: 1px solid #000000;
-}
-  
-.imgMenu
-{
-  width:48px;
-  border:none;
-  float:left;
-}
-
-.imgMenu img
-{
- border:none;
- text-align:center;
- margin-top:4px;
-}
-  
-.imgMenu a
-{
-  display:block;
-  height: 25px;
-  border-bottom: 1px solid #000000;
-  border-left: 1px solid #838383;
-  border-right: 1px solid #000000;
-}
-
-.imgMenu a:hover
-{
-  border-bottom: 1px solid #3F3F3F;
-  border-left: 1px solid #3F3F3F;
-  border-right: 1px solid #3F3F3F;
-}
-
-.commentImage {
-  text-align:justify;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-/* TABLE LAYOUT STYLES */
-
-.table1
-{
-  border: 1px solid #000000;
-  display:block;
-}
-  
-.table2 {
-	border: 1px solid #000000; 
-	margin:	0px 10px 0px 0px;
-	padding:0px;
-}
-
-.tablecompact{
-  width:100%;
-  border-collapse:collapse;
-}
-
-.row1,.row2 {
-  text-align:left;
-  padding:5px 0px 5px 0px;
-  height:20px;
-} 
-
-.throw {
-  text-align:center;
-  border-top: 1px solid #000000; 
-  border-bottom: 1px solid #000000; 
-  height:20px;
-}
-
-td.throw{
-  text-align:left;
-  width:auto;
-}
-
-/* THUMBNAILS LAYOUT STYLES */
-
-.thumbnail {
-	text-align:center;
-	vertical-align: baseline;
-	white-space: nowrap;
-}
-
-table.thumbnail {
-  border-collapse:separate;
-  display:inline-table;
-}
-
-.thumbLink {
-	border-style: solid;
-	border-width:1px;
-	border-color: #A0A0A0;
-	margin: 2px;
-}
-
-/* COMMENTS LAYOUT STYLES */
-
-.commentTitle {  padding: 15px 5px 10px 5px; }
-.commentDate {
-  text-align:right;
-  border-top: 1px solid #000000; 
-  border-bottom: 1px solid #000000;
-}
-
-/* FORM LAYOUT STYLES */
-
-form
-{
-  text-align:left;
-  padding:10px;
-}
-
-.bouton
-{
-  border: 1px solid #404750;
-  padding-left: 3px;
-  padding-right: 3px;
-  background-position : bottom;
-  margin-top:10px;
-}
-
-input,select,textarea 
-{
- text-indent:2px;
- border: 1px solid #797979;
- padding: 0;
-}
-
-.radio{  border:0px ;}
-
-/* ADMIN LAYOUT STYLES */
-
-.adminMenu 
-{
-  text-align:center;
-  font-size:12px;
-}
-
-div#adminMain {
-  text-align: left;
-  background-color: #5f5f5f;
-  border: 1px solid black;
-  display: block;
-  width: 100%;
-}
-
-div#adminMain h2 {
-  background-color: #3f3f3f;
-  text-align: center;
-  font-size: 120%;
-}
-
-div.adminMenu{ margin:10px 50px 10px 50px; }
-
-.admin 
-{
-margin:0px 0px 12px 0px;
-text-align: center;
-padding:0px;
-}
-
-div.remoteOutput, div.remoteLocal {
-  border:1px solid black;
-  margin:10px;
-  text-align:left;
-  padding:5px;
-}
-
-div.remoteLocal {
-  text-align:center;
-}
-
-/* for debugging purpose */
-pre { text-align:left; }
-
-label:hover {
-  cursor: pointer;
-}
-
-/**
- * Categories management
- */
-
-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;
-}
-
-ul.categoryActions {
-  margin: 5px;
-  padding: 5px;
-}
-
-div.titrePage ul.categoryActions {
-  float: right;
-  margin: 0;
-}
-
-div#adminMain>ul.categoryActions {
-  text-align: center;
-}
-
-ul.categoryActions>li {
-  display: inline;
-}
-
-ul.categoryActions a img {
-  border: none;
-}
-
-/**
- * Errors box in administration
- */
-#errors {
-  text-align: left;
-  background-color: red;
-  background-image: url(admin/images/errors.png);
-  background-repeat: no-repeat;
-  background-position: top right;
-  color: white;
-  font-weight: bold;
-  margin: 5px;
-  border:1px solid black;
-  padding: 10px 50px 10px 10px;
-}
-
-/**
- * Informations box in administration
- */
-#infos {
-  text-align: left;
-  background-color: #eee;
-  background-image: url(admin/images/infos.png);
-  background-repeat: no-repeat;
-  background-position: top right;
-  color: black;
-  font-weight: bold;
-  margin: 5px;
-  border:1px solid gray;
-  padding: 10px 50px 10px 10px;
-}
-
-/**
- * Filter forms are displayed label by label with the input (or select...)
- * below the label
- */
-form.filter FIELDSET {
-  padding: 10px;
-}
-
-form.filter FIELDSET LABEL {
-  display: block;
-  float: left;
-  width: auto;
-  margin-right: 10px;
-  padding: 0;
-}
-
-form.filter>FIELDSET>LABEL>INPUT, form.filter>FIELDSET>LABEL>SELECT {
-  display: block;
-}
-
-form.filter FIELDSET P, form.filter FIELDSET>INPUT {
-  clear: left;
-  display: block;
-}
-
-form.filter FIELDSET {
-  border: 1px solid gray;
-}
-
-form.filter FIELDSET + INPUT {
-  margin-top: 10px;
-}
-
-FORM#categoryPermissions LI {
-  display:inline;
-  white-space: nowrap;
-}
-
-fieldset {
-  border: 1px solid gray;
-}
-
-fieldset>legend {
-  margin: 5px;
-}
-
-select.categoryList {
-  width: 400px;
-}
-
-table.doubleSelect {
-  text-align: center;
-  margin: 0 auto;
-}
-
-table.doubleSelect td {
-  padding: 0 5px;
-}
-
-div#adminMain h1 {
-  margin-top: 0;
-  background-image: url(theme/tableh1_bg.gif);
-  color: #e0e0e0;
-  font-family: 'Trebuchet MS', Verdana, sans-serif;
-  font-weight: 600;
-  font-size: 16px;
-  padding-right: 10px;
-  padding-left: 10px;
-  border-bottom: 1px solid black;
-  border-right: 1px solid black;
-  height: 25px;
-  line-height: 25px;
-  text-align: left;
-}
-
-div#adminMain dl {
-  margin: 10px;
-}
-
-div#adminMain dl>dd {
-  margin-bottom: 10px;
-}
-
-div#adminMain dl>dt {
-  margin-bottom: 5px;
-  font-style: italic;
-  font-size: 110%;
-}
-
-div#theNavbar {
-  background-color: #5f5f5f;
-  border: 1px solid black;
-  text-align: left;
-}
-
-div#theNavbar>dl,
-div#theNavbar>dl>dd
-{
-  margin: 0;
-}
-
-div#theNavbar>dl>dt {
-  background-image: url(theme/tableh1_bg.gif);
-  color: #fff48e;
-  font-size: 12px;
-  font-weight: 600;
-  padding-top: 0;
-  padding-right: 10px;
-  padding-left: 10px;
-  border-bottom: 1px solid black;
-  border-right: 1px solid black;
-  height: 25px;
-  line-height: 25px;
-  text-align: center;
-}
-
-div#theNavbar>dl>dd>ul {
-  white-space: nowrap;
-  list-style-type: square;
-  padding-left: 15px;
-  margin: 5px;
-}
-
-div#adminMain>fieldset {
-  margin: 10px;
-}
-
-fieldset>legend {
-  font-style: italic;
-}
-
-div#adminMain img.thumbnail {
-  border: 1px solid white;
-  margin: 0 auto;
-  display: block;
-}
-
-textarea.description {
-  height: 100px;
-  width: 500px;
-  overflow: auto;
-}
-
-fieldset.elementEdit>a {
-  display: block;
-  float: right;
-}
-
-/* Administration comments */
-div#adminMain div.comment {
-  margin: 5px;
-  border: 1px solid gray;
-  clear: both;
-}
-
-div#adminMain div.comment > a.illustration {
-  display: block;
-  float: left;
-  margin: 5px;
-}
-
-div#adminMain div.comment p.commentHeader {
-  text-align: right;
-  margin: 0.5em 0.5em 0 0;
-}
-
-div#adminMain div.comment ul.actions {
-  text-align: center;
-  margin: 0.2em;
-  clear: both;
-}
-
-div#adminMain div.comment > ul.actions > li {
-  display: inline;
-}
-
-div#adminMain div.comment blockquote {
-  margin: 15px;
-  border: 1px dashed gray;
-  padding: 0.5em;
-}
-
-/* */
-form p.bottomButtons {
-  text-align: center;
-}
\ No newline at end of file
diff --git a/template/default/footer.tpl b/template/default/footer.tpl
deleted file mode 100644
index 708525797..000000000
--- a/template/default/footer.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
- <div class="copyright">
- <!-- BEGIN debug -->
- {L_GEN_TIME} {debug.TIME} ({debug.NB_QUERIES} {L_SQL_QUERIES_IN} {debug.SQL_TIME}) -
- <!-- END debug -->
-
- <!-- Please, do not remove this copyright. If you really want to,
-	  contact me pierrick@phpwebgallery.net to find a solution on how
-	  to show the origin of the script...-->
-
-  {L_POWERED_BY} <a href="http://www.phpwebgallery.net" class="back">PhpWebGallery</a>
-  {VERSION} - 
-
-  {L_SEND_MAIL}
-  <a href="mailto:{MAIL}?subject={L_TITLE_MAIL}">
-   <span style="font-weight:bold;">{L_WEBMASTER}</span>
-  </a>
-
- </div>
- </div>
- </body>
-</html>
diff --git a/template/default/header.tpl b/template/default/header.tpl
deleted file mode 100644
index 9c4d355e8..000000000
--- a/template/default/header.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{LANG}" lang="{LANG}" dir="{DIR}">
-
- <head>
-  <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}" />
-  <meta http-equiv="Content-Style-Type" content="text/css" />
-  <!-- BEGIN refresh -->
-  <meta http-equiv="refresh" content="{REFRESH_TIME};url={U_REFRESH}">
-  <!-- END refresh -->
-  <title>{PAGE_TITLE}</title>
-  <link rel="stylesheet" href="{T_STYLE}" type="text/css" />
-  <script type="text/javascript" src="include/scripts.js"></script>
- </head>
-
- <body>
- <div class="main">
\ No newline at end of file
diff --git a/template/default/identification.tpl b/template/default/identification.tpl
deleted file mode 100644
index c048e0d0f..000000000
--- a/template/default/identification.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="titrePage">{L_TITLE}</div>
-<div style="margin-top:15px;text-align:center;">
-<table width="60%" cellpadding="4" cellspacing="1" border="0" align="center">
-<form action="{F_LOGIN_ACTION}" method="post">
-<!-- BEGIN errors -->
-  <tr>
-	<td colspan="2">
-	  <div class="errors">
-		<ul>
-		  <!-- BEGIN error -->
-		  <li>{errors.error.ERROR}</li>
-		  <!-- END error -->
-		</ul>
-	  </div>
-	</td>
-  </tr>
-  <!-- END errors -->
-  <tr> 
-	<td colspan="2" align="center">&nbsp;</td>
-  </tr>
-  <tr> 
-	<td width="45%" align="right"><span class="gentbl">{L_USERNAME}:</span></td>
-	<td> 
-	  <input class="login" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" />
-	</td>
-  </tr>
-  <tr> 
-	<td align="right"><span class="gentbl">{L_PASSWORD}:</span></td>
-	<td> 
-	  <input class="login" type="password" name="password" size="25" maxlength="25" />
-	</td>
-  </tr>
-  <!-- BEGIN remember_me -->
-  <tr>
-        <td align="right"><span class="gentbl">{L_REMEMBER_ME}:</span></td>
-        <td>
-          <input type="checkbox" name="remember_me" value="1" />
-        </td>
-  </tr>
-  <!-- END remember_me -->
-  <tr align="center"> 
-	<td colspan="2"><input type="submit" name="login" value="{L_LOGIN}" class="bouton" /></td>
-  </tr>
-</form>
-</table>
-
-<table style="width:80%;margin-left:auto;margin-right:auto;">
-<tr>
-  <td colspan="3" align="center">
-	<!-- BEGIN free_access -->
-	  <p><a href="./category.php">[ {L_GUEST} ]</a></p>
-	  <a href="register.php"><img src="template/default/theme/register.gif" style="border:0;" alt=""/>&nbsp;{L_REGISTER}</a>&nbsp;&nbsp;-&nbsp;&nbsp;
-	<!-- END free_access -->
-	  <a href="mailto:{MAIL_ADMIN}?subject=[PhpWebGallery] {L_FORGET}"><img src="template/default/theme/lost.gif" style="border:0;" alt=""/>&nbsp;{L_FORGET}</a>
-  </td>
-</tr>
-</table>
-</div>
diff --git a/template/default/images/logo.jpg b/template/default/images/logo.jpg
deleted file mode 100644
index 73c8011ea..000000000
--- a/template/default/images/logo.jpg
+++ /dev/null
diff --git a/template/default/images/php_sqreuil_artistes.gif b/template/default/images/php_sqreuil_artistes.gif
deleted file mode 100755
index 88cff0c01..000000000
--- a/template/default/images/php_sqreuil_artistes.gif
+++ /dev/null
diff --git a/template/default/install.tpl b/template/default/install.tpl
deleted file mode 100644
index 78b9e1836..000000000
--- a/template/default/install.tpl
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset={T_CONTENT_ENCODING}"  />
-<meta http-equiv="Content-script-type" content="text/javascript" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<title>PhpWebGallery {RELEASE}</title>
-<style type="text/css">
-a, a:hover {
-color:#006699;
-}
-
-body,table,input,form,select {
-font-family:arial,verdana,sans-serif;
-font-size:12px;
-color:#000000;
-text-align:left;
-}
-table 
-{
-border-collapse:separate;
-}
-body {
-background-color:#E5E5E5;
-margin:5px;
-}
-
-.contenucellule {
-background-color:#EEEEEE;
-border:2px solid #006699;
-}
-
-th {
-font-weight:bold;
-background-color:#D3DCE3;
-margin-bottom:10px;
-text-align: center;
-}
-td.row1 {
-background-color:#E6E4E4;
-}
-td.row2
-{
-background-color:#E8E8E8;
-}
-
-.info {
-color:darkblue;
-text-align:center;
-}
-.errors {
-  text-align:left;
-  margin:25px;
-  background-color:#ffe1e1;
-  border:1px solid red;
-  color:black;
-}
-.grostitre {
-  text-align : center;
-  font-size : 20px;
-   margin-bottom : 20px;
-}
-</style>
-</head>
-<body>
-    <table style="width:100%;height:100%">
-      <tr align="center" valign="middle">
-        <td>
-	  <div class="grostitre">PhpWebGallery {RELEASE}</div>
-          <table class="table1">
-		  <!-- BEGIN errors -->
-		  <tr>
-			<td class="contenucellule" colspan="3">
-			  <div class="errors">
-				<ul>
-				  <!-- BEGIN error -->
-				  <li>{errors.error.ERROR}</li>
-				  <!-- END error -->
-				</ul>
-			  </div>
-			</td>
-		  </tr>
-		  <!-- END errors -->
-		  <!-- BEGIN infos -->
-		  <tr>
-			<td class="contenucellule" colspan="3">
-			  <div class="infos">
-				<ul>
-				  <!-- BEGIN info -->
-				  <li>{infos.info.INFO}</li>
-				  <!-- END info -->
-				</ul>
-			  </div>
-			</td>
-		  </tr>
-		  <!-- END infos -->
-			 <tr>
-              <td class="contenucellule">
-
-<!-- BEGIN error_copy -->
-{L_ERR_COPY} :
-<br />-----------------------------------------------------<br />
-<div style="color:blue;">{error_copy.FILE_CONTENT}</div>
------------------------------------------------------<br />
-<!-- END error_copy -->
-<!-- BEGIN install -->
-<form method="POST" action="{F_ACTION}" name="install_form">
-  <table width="100%">
-  	<tr>
-      <th colspan="3">{L_BASE_TITLE}</th>
-    </tr>
-    <tr>
-  	  <td width="30%">{L_LANG_TITLE}</td>
-      <td colspan="2" align="left">
-	  {F_LANG_SELECT}
-      </td>
-    </tr>
-    <tr>
-      <th colspan="3">{L_DB_TITLE}</th>
-    </tr>
-    <tr>
-      <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-      <td>{L_DB_HOST}</td>
-      <td align=center><input type="text" name="dbhost" value="{F_DB_HOST}" /></td>
-      <td class="row2">{L_DB_HOST_INFO}</td>
-    </tr>
-    <tr>
-      <td>{L_DB_USER}</td>
-      <td align=center><input type="text" name="dbuser" value="{F_DB_USER}" /></td>
-      <td class="row2">{L_DB_USER_INFO}</td>
-    </tr>
-    <tr>
-      <td>{L_DB_PASS}</td>
-      <td align=center><input type="password" name="dbpasswd" value="" /></td>
-      <td class="row2">{L_DB_PASS_INFO}</td>
-    </tr>
-    <tr>
-      <td>{L_DB_NAME}</td>
-      <td align=center><input type="text" name="dbname" value="{F_DB_NAME}" /></td>
-      <td class="row2">{L_DB_NAME_INFO}</td>
-    </tr>
-    <tr>
-      <td>{L_DB_PREFIX}</td>
-      <td align=center><input type="text" name="prefix" value="{F_DB_PREFIX}" /></td>
-      <td class="row2">{L_DB_PREFIX_INFO}</td>
-    </tr>
-    <tr>
-     <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-      <th colspan="3">{L_ADMIN_TITLE}</th>
-    </tr>
-    <tr>
-      <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-      <td>{L_ADMIN}</td>
-      <td align="center"><input type="text" name="admin_name" value="{F_ADMIN}" /></td>
-      <td class="row2">{L_ADMIN_INFO}</td>
-    </tr>
-    <tr>
-      <td>{L_ADMIN_PASSWORD}</td>
-      <td align="center"><input type="password" name="admin_pass1" value="" /></td>
-      <td class="row2">{L_ADMIN_PASSWORD_INFO}</td>
-    </tr>
-    <tr>
-      <td>{L_ADMIN_CONFIRM_PASSWORD}</td>
-      <td align="center"><input type="password" name="admin_pass2" value="" /></td>
-      <td class="row2">{L_ADMIN_CONFIRM_PASSWORD_INFO}</td>
-    </tr>
-    <tr>
-      <td>{L_ADMIN_EMAIL}</td>
-      <td align="center"><input type="text" name="admin_mail" value="{F_ADMIN_EMAIL}" /></td>
-      <td class="row2">{L_ADMIN_EMAIL_INFO}</td>
-    </tr>
-    <tr>
-      <td colspan="3">&nbsp;</th>
-    </tr>
-    <tr>
-      <td colspan="3" align="center">
-        <input type="submit" name="install" value="{L_SUBMIT}" />
-      </td>
-    </tr>
-  </table>
-</form>
-<!-- END install -->
-
-<!-- BEGIN install_end -->
-<div class="infos_title">{L_END_TITLE}</div>
-<div style="padding:5px;">{L_END_MESSAGE}</div>
-<!-- END install_end -->
-
-              </td>
-            </tr>
-          </table>
-          <div style="text-align:center;margin:20px;">{L_INSTALL_HELP}</div>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
\ No newline at end of file
diff --git a/template/default/mimetypes/avi.png b/template/default/mimetypes/avi.png
deleted file mode 100644
index 065f0b282..000000000
--- a/template/default/mimetypes/avi.png
+++ /dev/null
diff --git a/template/default/mimetypes/mp3.png b/template/default/mimetypes/mp3.png
deleted file mode 100644
index afb7e1b0a..000000000
--- a/template/default/mimetypes/mp3.png
+++ /dev/null
diff --git a/template/default/mimetypes/mpg.png b/template/default/mimetypes/mpg.png
deleted file mode 100644
index f7dbd2388..000000000
--- a/template/default/mimetypes/mpg.png
+++ /dev/null
diff --git a/template/default/mimetypes/ogg.png b/template/default/mimetypes/ogg.png
deleted file mode 100644
index ead3f62c3..000000000
--- a/template/default/mimetypes/ogg.png
+++ /dev/null
diff --git a/template/default/mimetypes/zip.png b/template/default/mimetypes/zip.png
deleted file mode 100644
index 1f08fe1a3..000000000
--- a/template/default/mimetypes/zip.png
+++ /dev/null
diff --git a/template/default/notification.tpl b/template/default/notification.tpl
deleted file mode 100644
index ac50a7d8f..000000000
--- a/template/default/notification.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{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/default/picture.tpl b/template/default/picture.tpl
deleted file mode 100644
index e43fe7b14..000000000
--- a/template/default/picture.tpl
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- BEGIN information -->
-<div class="information">{information.INFORMATION}</div>
-<!-- END information -->
-
-<div class="titrePage">
-  <div id="pictureTitle">
-    <a href="{U_HOME}">{L_HOME}</a>{LEVEL_SEPARATOR}{CATEGORY}
-    <!-- BEGIN title -->
-    {LEVEL_SEPARATOR}{TITLE}
-    <!-- END title -->
-  </div>
-  <div id="pictureNumber">{PHOTO}</div>
-</div>
-
-<div id="imgBarMenu">
-<div class="imgMenu" id="left">
-  <a href="{U_UP}" title="{L_UP_HINT}">
-	<img src="template/default/theme/categories.gif" alt="{L_UP_ALT}" />
-  </a>
-</div>
-<div class="imgMenu" id="left">
-  <a href="{U_SLIDESHOW}" title="{L_SLIDESHOW}">
-	<img src="template/default/theme/slideshow.gif" alt="{L_SLIDESHOW}" />
-  </a>
-</div>
-<div class="imgMenu" id="left">
-  <a href="{U_METADATA}" title="{L_PICTURE_METADATA}">
-	<img src="template/default/theme/metadata.gif" alt="{L_PICTURE_METADATA}" />
-  </a>
-</div>
-
-<!-- BEGIN representative -->
-<div class="imgMenu" id="left">
-  <a href="{representative.URL}" title="{lang:set as category representative}">
-        <img src="template/default/theme/representative.png" alt="{lang:representative}" />
-  </a>
-</div>
-<!-- END representative -->
-
-<!-- BEGIN favorite -->
-<div class="imgMenu" id="right">
-  <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}">
-	<img src="{favorite.FAVORITE_IMG}" alt="{favorite.FAVORITE_ALT}" />
-  </a>
-</div>
-<!-- END favorite -->
-<!-- BEGIN download -->
-<div class="imgMenu" id="right">
-  <a href="{download.U_DOWNLOAD}" title="{L_DOWNLOAD}">
-	<img src="template/default/theme/download.gif" alt="{L_DOWNLOAD}" />
-  </a>
-</div>
-<!-- END download -->
-<!-- BEGIN admin -->
-<div class="imgMenu" id="right">
-  <a href="{U_ADMIN}" title="{L_ADMIN}">
-	<img src="template/default/theme/properties.gif" alt="{L_ADMIN}" />
-  </a>
-</div>
-<!-- END admin -->
-</div>
-<!-- BEGIN high -->
-<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=yes,status=yes,resizable=yes,width={high.WIDTH_IMG},height={high.HEIGHT_IMG}')">
-<!-- END high -->
-  <img class="image" src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}"/>
-<!-- BEGIN high -->
-</a>
-<div style="text-align:center;font-weight:bold;">{L_PICTURE_HIGH}</div>
-<!-- END high -->
-<!-- BEGIN legend -->
-<div class="commentImage">{legend.COMMENT_IMG}</div>
-<!-- END legend -->
-
-<!-- BEGIN stop_slideshow -->
-<div style="text-align:center;margin-bottom:5px;">
-  [ <a href="{stop_slideshow.U_SLIDESHOW}" class="back" style="font-weight:bold;">{L_STOP_SLIDESHOW}</a> ]
-</div>
-<!-- END stop_slideshow -->
-<div style="clear:both;"></div>
-<div style="white-space:nowrap;">
-<div id="gauche">
-&nbsp;
-  <!-- BEGIN previous -->
-	<a class="none" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}">
-	<img style="border:none;" width="30" height="100" src="template/default/theme/left-arrow.gif" alt="" />
-	  <img src="{previous.IMG}" class="thumbLink" style="margin-right:10px;margin-left:5px;" alt="{previous.TITLE_IMG}"/>
-	  </a>
-  <!-- END previous -->
-</div>
-<div id="centre">
-  <table style="margin:auto;margin-top:5px;margin-bottom:5px;">
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{L_AUTHOR} : </td>
-	 <td class="menu" style="text-align:right;">{AUTHOR}</td>
-    </tr>
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{L_CREATION_DATE} : </td>
-	 <td class="menu" style="text-align:right;">{CREATION_DATE}</td>
-    </tr>
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{L_AVAILABILITY_DATE} : </td>
-	 <td class="menu" style="text-align:right;">{AVAILABILITY_DATE}</td>
-    </tr>
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{L_SIZE} : </td>
-	 <td class="menu" style="text-align:right;">{SIZE}</td>
-    </tr>
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{L_FILE} : </td>
-	 <td class="menu" style="text-align:right;">{ALT_IMG}</td>
-    </tr>
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{L_FILE_SIZE} : </td>
-	 <td class="menu" style="text-align:right;">{FILE_SIZE} Ko</td>
-    </tr>
-    <!-- BEGIN keywords -->
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{keywords.INFO} : </td>
-	 <td class="menu" style="text-align:right;">{keywords.VALUE}</td>
-    </tr>
-    <!-- END keywords -->
-    <!-- BEGIN associated -->
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{associated.INFO} : </td>
-	 <td class="menu" style="text-align:right;">{associated.VALUE}</td>
-    </tr>
-    <!-- END associated -->
-    <!-- BEGIN rate -->
-    <tr>
-	 <td class="menu" style="font-weight:bold;">{rate.INFO} : </td>
-	 <td class="menu" style="text-align:right;">{rate.VALUE}</td>
-    </tr>
-    <!-- END rate -->
-  </table>
-</div>
-<div id="droite">
-  <!-- BEGIN next -->
-  <a  class="none" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}">
-	  <img class="thumbLink" src="{next.IMG}" style="margin-right:10px;margin-left:5px;" alt="{next.TITLE_IMG}"/>
-	  <img style="border:none;" class="thumbLink" width="30" height="100" src="template/default/theme/right-arrow.gif" alt="" />
-	  </a>
-  <!-- END next -->
-  &nbsp;
-</div>
-</div>
-<div style="clear:both;"></div>
-<!-- BEGIN metadata -->
- <table class="tablecompact">
-  <!-- BEGIN headline -->
-  <tr>
-    <th colspan="2">{metadata.headline.TITLE}</th>
-  </tr>
-  <!-- END headline -->
-  <!-- BEGIN line -->
-  <tr>
-    <td>{metadata.line.KEY}</td>
-    <td>{metadata.line.VALUE}</td>
-  </tr>
-  <!-- END line -->
-  </table>
-<!-- END metadata -->
-
-<!-- BEGIN rate -->
-<div>{rate.SENTENCE} :
-  <!-- BEGIN rate_option -->
-  {rate.rate_option.SEPARATOR} <a href="{rate.rate_option.URL}">{rate.rate_option.OPTION}</a>
-  <!-- END rate_option -->
-</div>
-<!-- END rate -->
-         
-<table class="tablecompact">
-  <!-- BEGIN comments -->
-  <tr align="center" valign="middle">
-    <td colspan="3" class="table2">
-    <div class="commentTitle">
-                    [{comments.NB_COMMENT}] {L_COMMENT_TITLE}
-                  </div>
-                  <div class="commentsNavigationBar">{comments.NAV_BAR}</div>
-				  <table class="tablecompact">
-                  <!-- BEGIN comment -->
-				    <tr class="throw">
-					  <td class="throw">
-					  {comments.comment.COMMENT_AUTHOR}
-					  </td>
-					  <td colspan="2" class="commentDate">
-					  {comments.comment.COMMENT_DATE}
-					<!-- BEGIN delete -->
-					  <a href="{comments.comment.delete.U_COMMENT_DELETE}" title="{L_DELETE_COMMENT}"><img src="template/default/theme/delete.gif" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{L_DELETE}]"/></a>
-					<!-- END delete -->
-					  </td>
-					</tr>
-					<tr class="row1">
-					  <td class="comment" colspan="3">{comments.comment.COMMENT}</td>
-					</tr>
-                  <!-- END comment -->
-            <!-- BEGIN add_comment -->
-			<tr class="throw">
-			  <td colspan="3">{L_ADD_COMMENT}</td>
-			</tr>
-			<form  method="post" action="{U_ADD_COMMENT}">
-  		    <tr class="row1">
-			  <td class="comment" >
-                    <!-- BEGIN author_field -->
-                    {L_AUTHOR}</td><td colspan="2"><input type="text" name="author" />
-					</td></tr>
-					<tr class="row1">
-					<td class="comment" >
-                    <!-- END author_field -->
-                    <!-- BEGIN author_known -->
-                    <input type="hidden" name="author"  value="{comments.add_comment.author_known.KNOWN_AUTHOR}" />
-                    <!-- END author_known -->
-                    {L_COMMENT}</td>
-					<td style="width:100%;">
-					<textarea name="content" rows="2" style="width:100%;"></textarea>
-					</td><td>
-					<input type="submit" value="{L_SUBMIT}" class="bouton" />
-			  </td>
-			 </tr>
-			 </form>
-           	</table>
-            <!-- END add_comment -->
-        </td>
-      </tr>
-      <!-- END comments -->
-    </table>
diff --git a/template/default/profile.tpl b/template/default/profile.tpl
deleted file mode 100644
index 6bb881891..000000000
--- a/template/default/profile.tpl
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- BEGIN errors -->
-<div class="errors">
-  <ul>
-    <!-- BEGIN error -->
-    <li>{errors.error.ERROR}</li>
-    <!-- END error -->
-  </ul>
-</div>
-<!-- END errors -->
-
-<div class="titrePage">{L_TITLE}</div>
-
-<form method="post" name="profile" action="{F_ACTION}">
-
-<input type="hidden" name="userid" value="{USERID}" />
-
-<table width="70%" align="center">
-  <tr class="admin">
-    <th colspan="2">{L_REGISTRATION_INFO}</th>
-  </tr>
-	<tr>
-	  <td width="50%">{L_USERNAME}</td>
-	  <td>{USERNAME}</td>
-  </tr>
-	<tr>
-	  <td>{L_EMAIL}</td>
-	  <td><input type="text" name="mail_address" value="{EMAIL}" /></td>
-  </tr>
-  <tr>
-	<td>{L_CURRENT_PASSWORD} : <br /><span class="small">{L_CURRENT_PASSWORD_HINT}</span></td>
-	<td><input type="password" name="password" value="" /></td>
-  </tr>
-	<tr>
-	<td>{L_NEW_PASSWORD} : <br /><span class="small">{L_NEW_PASSWORD_HINT}</span></td>
-	<td><input type="password" name="use_new_pwd" value="" /></td>
-  </tr>
-  <tr>
-	<td>{L_CONFIRM_PASSWORD} : <br /><span class="small">{L_CONFIRM_PASSWORD_HINT}</span></td>
-	<td><input type="password" name="passwordConf" value="" /></td>
-  </tr>
-  <tr class="admin">
-    <th colspan="2">{L_PREFERENCES}</th>
-  </tr>
-  <tr>
-    <td width="60%">{L_NB_IMAGE_LINE}</td>
-	<td width="40%"><input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" /></td>
-  </tr>
-  <tr>
-    <td>{L_NB_ROW_PAGE}</td>
-	<td><input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" /></td>
-  </tr>
-  <tr>
-    <td>{L_STYLE_SELECT}</td>
-	<td>{STYLE_SELECT}</td>
-  </tr>
-  <tr>
-    <td>{L_LANG_SELECT}</td>
-	<td>{LANG_SELECT}</td>
-  </tr>
-   <tr>
-    <td>{L_RECENT_PERIOD}</td>
-	<td><input type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" /></td>
-  </tr>
-  <tr>
-    <td>{L_EXPAND_TREE}</td>
-	<td><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}</td>
-  </tr>
-  <tr>
-    <td>{L_NB_COMMENTS}</td>
-	<td><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}</td>
-  </tr>
-  <tr>
-    <td>{L_MAXWIDTH}</td>
-	<td><input type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
-	</td>
-  </tr>
-  <tr>
-    <td>{L_MAXHEIGHT}</td>
-    <td><input type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" />
-    </td>
-  </tr>
-  <tr>
-	<td colspan="2" align="center">
-	  <input type="submit" name="validate" value="{L_SUBMIT}" class="bouton" />
-        <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-	</td>
-  </tr>
-</table>
-</form>
-
-<div style="text-align:center;margin:5px;">
-<a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a>
-</div>
diff --git a/template/default/redirect.tpl b/template/default/redirect.tpl
deleted file mode 100644
index d3c485c3d..000000000
--- a/template/default/redirect.tpl
+++ /dev/null
@@ -1 +0,0 @@
-redirection
\ No newline at end of file
diff --git a/template/default/register.tpl b/template/default/register.tpl
deleted file mode 100644
index 22011103f..000000000
--- a/template/default/register.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="titrePage">{L_TITLE}</div>
-<form method="post" action="{F_ACTION}">
-  <table style="width:60%;" align="center">
-	<!-- BEGIN errors -->
-  <tr>
-	<td colspan="2">
-	  <div class="errors">
-		<ul>
-		  <!-- BEGIN error -->
-		  <li>{errors.error.ERROR}</li>
-		  <!-- END error -->
-		</ul>
-	  </div>
-	</td>
-  </tr>
-  <!-- END errors -->
-	<tr>
-	  <td width="60%">{L_USERNAME}</td>
-	  <td width="40%">
-		<input type="text" name="login" value="{F_LOGIN}" />
-	  </td>
-	</tr>
-	<tr>
-	  <td >{L_PASSWORD}</td>
-	  <td >
-		<input type="password" name="password" />
-	  </td>
-	</tr>
-	<tr>
-	  <td >{L_CONFIRM_PASSWORD}</td>
-	  <td >
-		<input type="password" name="password_conf" />
-	  </td>
-	</tr>
-	<tr>
-	  <td >{L_EMAIL}</td>
-	  <td >
-		<input type="text" name="mail_address" value="{F_EMAIL}" />
-	  </td>
-	</tr>
-	<tr>
-	  <td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-	<tr>
-	  <td colspan="2" align="center">
-		<input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
-	  </td>
-	</tr>
-	<tr>
-	  <td colspan="2" align="center">
-		<a href="./category.php">[ {L_GUEST} ]</a>
-	  </td>
-	</tr>
-  </table>
-</form>
\ No newline at end of file
diff --git a/template/default/search.tpl b/template/default/search.tpl
deleted file mode 100644
index 95812b7e9..000000000
--- a/template/default/search.tpl
+++ /dev/null
@@ -1,131 +0,0 @@
-<div class="titrePage">{L_SEARCH_TITLE}</div>
-<form method="post" name="post" action="{S_SEARCH_ACTION}">
-<!-- BEGIN errors -->
-<div class="errors">
-  <ul>
-    <!-- BEGIN error -->
-    <li>{errors.error.ERROR}</li>
-    <!-- END error -->
-  </ul>
-</div>
-<!-- END errors -->
-<table width="100%" align="center" cellpadding="2">
-  <tr class="admin">
-    <th colspan="4">{L_SEARCH_TITLE}</th>
-  </tr>
-  <tr> 
-    <td width="50%" colspan="2"><b>{L_SEARCH_KEYWORDS} : </b><br /><span class="small">{L_SEARCH_KEYWORDS_HINT}</span></td>
-    <td colspan="2" valign="top">
-	  <input type="text" style="width: 300px" name="search_allwords" size="30" />
-	  <br />
-	  <input class ="radio" type="radio" name="mode" value="AND" checked="checked" /> {L_SEARCH_ALL_TERMS}<br />
-	  <input class ="radio" type="radio" name="mode" value="OR" /> {L_SEARCH_ANY_TERMS}
-	</td>
-  </tr>
-  <tr> 
-    <td colspan="2"><b>{L_SEARCH_AUTHOR} :</b><br /><span class="small">{L_SEARCH_AUTHOR_HINT}</span></td>
-    <td colspan="2" valign="middle">
-	  <input type="text" style="width: 300px" name="search_author" size="30" />
-	</td>
-  </tr>
-  <tr> 
-    <td colspan="2"><b>{L_SEARCH_DATE} :</b><br /><span class="small">{L_SEARCH_DATE_HINT}</span></td>
-    <td colspan="2" valign="middle">
-      <table>
-        <tr>
-          <td>{L_SEARCH_DATE_FROM} :</td>
-          <td>
-            <select name="start_day">
-              <!-- BEGIN start_day -->
-              <option {start_day.SELECTED} value="{start_day.VALUE}">{start_day.OPTION}</option>
-              <!-- END start_day -->
-            </select>
-            <select name="start_month">
-              <!-- BEGIN start_month -->
-              <option {start_month.SELECTED} value="{start_month.VALUE}">{start_month.OPTION}</option>
-              <!-- END start_month -->
-            </select>
-	    <input name="start_year" type="text" size="4" maxlength="4">&nbsp;
-	    <a href="#" name="#" onClick="document.post.start_day.value={TODAY_DAY};document.post.start_month.value={TODAY_MONTH};document.post.start_year.value={TODAY_YEAR};" />{L_TODAY}</a>
-          </td>
-        </tr>
-        <tr>
-          <td>{L_SEARCH_DATE_TO} :</td>
-          <td>
-            <select name="end_day">
-              <!-- BEGIN end_day -->
-              <option {end_day.SELECTED} value="{end_day.VALUE}">{end_day.OPTION}</option>
-              <!-- END end_day -->
-            </select>
-            <select name="end_month">
-              <!-- BEGIN end_month -->
-              <option {end_month.SELECTED} value="{end_month.VALUE}">{end_month.OPTION}</option>
-              <!-- END end_month -->
-            </select>
-            <input name="end_year" type="text" size="4" maxlength="4">&nbsp;
-	    <a href="#" name="#" onClick="document.post.end_day.value={TODAY_DAY};document.post.end_month.value={TODAY_MONTH};document.post.end_year.value={TODAY_YEAR};" />{L_TODAY}</a>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr class="admin"> 
-    <th colspan="4">{L_SEARCH_OPTIONS}</th>
-  </tr>
-  <tr> 
-    <td width="25%" ><b>{L_SEARCH_CATEGORIES} : </b><br /><span class="small">{L_SEARCH_CATEGORIES_HINT}</span></td>
-    <td width="25%" nowrap="nowrap">
-	  <select style="width:200px" name="cat[]" multiple="multiple" size="8">
-      <!-- BEGIN category_option -->
-        <option value="{category_option.VALUE}">{category_option.OPTION}</option>
-      <!-- END category_option -->
-      </select>
-	</td>
-    <td width="25%" nowrap="nowrap"><b>{L_SEARCH_SUBFORUMS} : </b></td>
-    <td width="25%" nowrap="nowrap">
-	  <input class ="radio" type="radio" name="subcats-included" value="1" checked="checked" />{L_YES}&nbsp;&nbsp;
-	  <input class ="radio" type="radio" name="subcats-included" value="0" />{L_NO}
-	</td>
-   </tr>
-   <tr> 
-    <td width="25%" nowrap="nowrap"><b>{L_SEARCH_DATE_TYPE} : </b></td>
-    <td width="25%" nowrap="nowrap">
-	  <input class ="radio" type="radio" name="date_type" value="date_creation" checked="checked" />{L_SEARCH_CREATION}<br />
-	  <input class ="radio" type="radio" name="date_type" value="date_available" />{L_SEARCH_AVAILABILITY}
-	</td>
-	<td><b>{L_RESULT_SORT} : </b></td>
-    <td nowrap="nowrap">
-	  <input class ="radio" type="radio" name="sd" value="AND" />{L_SORT_ASCENDING}<br />
-	  <input class ="radio" type="radio" name="sd" value="d" checked="checked" />{L_SORT_DESCENDING}
-	</td>
-  </tr>
-<!--  <tr> 
-    <td width="25%" nowrap="nowrap"><b>{L_SEARCH_WITHIN} : </b></td>
-    <td width="25%" nowrap="nowrap">
-	  <input class ="radio" type="radio" name="search_fields" value="all" checked="checked" />{L_SEARCH_ALL}<br />
-	  <input class ="radio" type="radio" name="search_fields" value="imgonly" />{L_SEARCH_IMG_ONLY}<br />
-	  <input class ="radio" type="radio" name="search_fields" value="commentsonly" />{L_SEARCH_COMMENTS_ONLY}
-	</td>
-  </tr>
-  <tr>
-    <td><b>{L_RESULT_SORT} : </b></td>
-    <td nowrap="nowrap">
-	  {S_SELECT_SORT_KEY}<br />
-	  <input class ="radio" type="radio" name="sd" value="a" />{L_SORT_ASCENDING}<br />
-	  <input class ="radio" type="radio" name="sd" value="d" checked="checked" />{L_SORT_DESCENDING}
-	</td>
-    <td nowrap="nowrap"><b>{L_DISPLAY_RESULTS} : </b></td>
-    <td nowrap="nowrap">
-	  <input class ="radio" type="radio" name="show_results" value="images" checked="checked" />{L_IMAGES}&nbsp;&nbsp;
-	  <input class ="radio" type="radio" name="show_results" value="comments" /> {L_COMMENTS}
-	</td>
-  </tr>  
-  -->
-<tr> 
-<td align="center" valign="bottom" colspan="4" height="38">
-<input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />&nbsp;&nbsp;
-<input type="reset" value="{L_RESET}" class="bouton" />
-</td>
-</table>
-</form>
-<a href="{U_HOME}" title="{L_RETURN_HINT}">[ {L_RETURN} ]</a>
diff --git a/template/default/theme/button_bg.gif b/template/default/theme/button_bg.gif
deleted file mode 100644
index 442f2469c..000000000
--- a/template/default/theme/button_bg.gif
+++ /dev/null
diff --git a/template/default/theme/caddie_add.png b/template/default/theme/caddie_add.png
deleted file mode 100644
index 425109697..000000000
--- a/template/default/theme/caddie_add.png
+++ /dev/null
diff --git a/template/default/theme/categories.gif b/template/default/theme/categories.gif
deleted file mode 100644
index cd3084434..000000000
--- a/template/default/theme/categories.gif
+++ /dev/null
diff --git a/template/default/theme/category_children.png b/template/default/theme/category_children.png
deleted file mode 100644
index c8d9b36b0..000000000
--- a/template/default/theme/category_children.png
+++ /dev/null
diff --git a/template/default/theme/category_delete.png b/template/default/theme/category_delete.png
deleted file mode 100644
index abedfe810..000000000
--- a/template/default/theme/category_delete.png
+++ /dev/null
diff --git a/template/default/theme/category_edit.png b/template/default/theme/category_edit.png
deleted file mode 100644
index 57bd43af0..000000000
--- a/template/default/theme/category_edit.png
+++ /dev/null
diff --git a/template/default/theme/category_elements.png b/template/default/theme/category_elements.png
deleted file mode 100644
index 9b5229a41..000000000
--- a/template/default/theme/category_elements.png
+++ /dev/null
diff --git a/template/default/theme/category_jump-to.png b/template/default/theme/category_jump-to.png
deleted file mode 100644
index 1763b90aa..000000000
--- a/template/default/theme/category_jump-to.png
+++ /dev/null
diff --git a/template/default/theme/category_permissions.png b/template/default/theme/category_permissions.png
deleted file mode 100644
index df0459893..000000000
--- a/template/default/theme/category_permissions.png
+++ /dev/null
diff --git a/template/default/theme/category_representant_random.png b/template/default/theme/category_representant_random.png
deleted file mode 100644
index df0151535..000000000
--- a/template/default/theme/category_representant_random.png
+++ /dev/null
diff --git a/template/default/theme/del_favorite.gif b/template/default/theme/del_favorite.gif
deleted file mode 100644
index 493a6077f..000000000
--- a/template/default/theme/del_favorite.gif
+++ /dev/null
diff --git a/template/default/theme/delete.gif b/template/default/theme/delete.gif
deleted file mode 100644
index 7488b695e..000000000
--- a/template/default/theme/delete.gif
+++ /dev/null
diff --git a/template/default/theme/delete.png b/template/default/theme/delete.png
deleted file mode 100644
index 9e678c7a2..000000000
--- a/template/default/theme/delete.png
+++ /dev/null
diff --git a/template/default/theme/download.gif b/template/default/theme/download.gif
deleted file mode 100644
index bf44419dd..000000000
--- a/template/default/theme/download.gif
+++ /dev/null
diff --git a/template/default/theme/eCard.gif b/template/default/theme/eCard.gif
deleted file mode 100644
index 480872c4e..000000000
--- a/template/default/theme/eCard.gif
+++ /dev/null
diff --git a/template/default/theme/favorite.gif b/template/default/theme/favorite.gif
deleted file mode 100644
index 2d527ba70..000000000
--- a/template/default/theme/favorite.gif
+++ /dev/null
diff --git a/template/default/theme/left-arrow.gif b/template/default/theme/left-arrow.gif
deleted file mode 100644
index 2ef28ad68..000000000
--- a/template/default/theme/left-arrow.gif
+++ /dev/null
diff --git a/template/default/theme/lost.gif b/template/default/theme/lost.gif
deleted file mode 100644
index 02f789fbb..000000000
--- a/template/default/theme/lost.gif
+++ /dev/null
diff --git a/template/default/theme/metadata.gif b/template/default/theme/metadata.gif
deleted file mode 100644
index 69b77ec44..000000000
--- a/template/default/theme/metadata.gif
+++ /dev/null
diff --git a/template/default/theme/permissions.png b/template/default/theme/permissions.png
deleted file mode 100644
index 5758896de..000000000
--- a/template/default/theme/permissions.png
+++ /dev/null
diff --git a/template/default/theme/profile.png b/template/default/theme/profile.png
deleted file mode 100644
index d04cb347b..000000000
--- a/template/default/theme/profile.png
+++ /dev/null
diff --git a/template/default/theme/properties.gif b/template/default/theme/properties.gif
deleted file mode 100644
index f843e0636..000000000
--- a/template/default/theme/properties.gif
+++ /dev/null
diff --git a/template/default/theme/recent.gif b/template/default/theme/recent.gif
deleted file mode 100644
index cd7b2240a..000000000
--- a/template/default/theme/recent.gif
+++ /dev/null
diff --git a/template/default/theme/register.gif b/template/default/theme/register.gif
deleted file mode 100644
index a5f51c374..000000000
--- a/template/default/theme/register.gif
+++ /dev/null
diff --git a/template/default/theme/representative.png b/template/default/theme/representative.png
deleted file mode 100644
index ea8a07233..000000000
--- a/template/default/theme/representative.png
+++ /dev/null
diff --git a/template/default/theme/right-arrow.gif b/template/default/theme/right-arrow.gif
deleted file mode 100644
index 095273d41..000000000
--- a/template/default/theme/right-arrow.gif
+++ /dev/null
diff --git a/template/default/theme/slideshow.gif b/template/default/theme/slideshow.gif
deleted file mode 100644
index 79712c3ad..000000000
--- a/template/default/theme/slideshow.gif
+++ /dev/null
diff --git a/template/default/theme/sync_metadata.png b/template/default/theme/sync_metadata.png
deleted file mode 100644
index 36050cf3d..000000000
--- a/template/default/theme/sync_metadata.png
+++ /dev/null
diff --git a/template/default/theme/tableh1_bg.gif b/template/default/theme/tableh1_bg.gif
deleted file mode 100644
index 9f0ef65bd..000000000
--- a/template/default/theme/tableh1_bg.gif
+++ /dev/null
diff --git a/template/default/upgrade.tpl b/template/default/upgrade.tpl
deleted file mode 100644
index 40b2ede4c..000000000
--- a/template/default/upgrade.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"  />
-    <title>PhpWebGallery : Upgrade to {RELEASE}</title>
-  </head>
-
-  <body>
-    <!-- BEGIN choices -->
-    <h1>Welcome to PhpWebGallery upgrade page.</h1>
-    <p>This page proposes to upgrade your database corresponding to your old version
-      of PhpWebGallery to the current version. Select the version you wish to upgrade
-      :</p>
-
-    <ul>
-      <!-- BEGIN choice -->
-      <li><a href="{choices.choice.URL}">{choices.choice.VERSION}</a></li>
-      <!-- END choice -->
-    </ul>
-    <!-- END choices -->
-
-    <!-- BEGIN upgrade -->
-    <h1>Upgrade from version {upgrade.VERSION} to {RELEASE}</h1>
-
-    <p>Statistics</p>
-    <ul>
-      <li>total upgrade time : {upgrade.TOTAL_TIME}</li>
-      <li>total SQL time : {upgrade.SQL_TIME}</li>
-      <li>SQL queries : {upgrade.NB_QUERIES}</li>
-    </ul>
-
-    <!-- BEGIN infos -->
-    <p>Upgrade informations</p>
-
-    <ul>
-      <!-- BEGIN info -->
-      <li>{upgrade.infos.info.CONTENT}</li>
-      <!-- END info -->
-    </ul>
-    <!-- END infos -->
-    <!-- END upgrade -->
-  </body>
-
-</html>
diff --git a/template/default/upload.tpl b/template/default/upload.tpl
deleted file mode 100644
index b82537218..000000000
--- a/template/default/upload.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<div class="titrePage">{L_TITLE}</div>
-<!-- BEGIN upload_not_successful -->
-<form enctype="multipart/form-data" method="post" action="{F_ACTION}">
-  <table style="width:80%;margin-left:auto;margin-right:auto;">
-	<!-- BEGIN errors -->
-		  <tr>
-			<td colspan="2">
-			  <div class="errors">
-				<ul>
-				  <!-- BEGIN error -->
-				  <li>{upload_not_successful.errors.error.ERROR}</li>
-				  <!-- END error -->
-				</ul>
-			  </div>
-			</td>
-		  </tr>
-		  <!-- END errors -->
-	<tr>
-	  <td colspan="2" class="menu">
-		<div style="text-align:center;">{ADVISE_TITLE}</div>
-		<ul>
-		  <!-- BEGIN advise -->
-		  <li>{upload_not_successful.advise.ADVISE}</li>
-		  <!-- END advise -->
-		</ul>
-	  </td>
-	</tr>
-	<tr>
-	  <td colspan="2" align="center" style="padding:10px;">
-		<input name="picture" type="file" value="" />
-	  </td>
-	</tr>
-	<!-- BEGIN fields -->
-	<!-- username  -->
-	<tr>
-	  <td class="menu">{L_USERNAME} <span style="color:red;">*</span></td>
-	  <td align="center" style="padding:10px;">
-		<input name="username" type="text" value="{NAME}" />
-	  </td>
-	</tr>
-	<!-- mail address  -->
-	<tr>
-	  <td class="menu">{L_EMAIL} <span style="color:red;">*</span></td>
-	  <td align="center" style="padding:10px;">
-		<input name="mail_address" type="text" value="{EMAIL}" />
-	  </td>
-	</tr>
-	<!-- name of the picture  -->
-	<tr>
-	  <td class="menu">{L_NAME_IMG}</td>
-	  <td align="center" style="padding:10px;">
-		<input name="name" type="text" value="{NAME_IMG}" />
-	  </td>
-	</tr>
-	<!-- author  -->
-	<tr>
-	  <td class="menu">{L_AUTHOR}</td>
-	  <td align="center" style="padding:10px;">
-		<input name="author" type="text" value="{AUTHOR_IMG}" />
-	  </td>
-	</tr>
-	<!-- date of creation  -->
-	<tr>
-	  <td class="menu">{L_CREATION_DATE}</td>
-	  <td align="center" style="padding:10px;">
-		<input name="date_creation" type="text" value="{DATE_IMG}" />
-	  </td>
-	</tr>
-	<!-- comment  -->
-	<tr>
-	  <td class="menu">{L_COMMENT}</td>
-	  <td align="center" style="padding:10px;">
-	   <textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea>
-	  </td>
-	</tr>
-	<!-- END fields -->
-	<tr>
-	  <td colspan="2" align="center">
-		<input name="submit" type="submit" value="{L_SUBMIT}" class="bouton" />
-	  </td>
-	</tr>
-  </table>
-</form>
-<!-- END upload_not_successful -->
-<!-- BEGIN upload_successful -->
-{L_UPLOAD_DONE}<br />
-<!-- END upload_successful -->
-<div style="text-align:center;">
-  <a href="{U_RETURN}">[ {L_RETURN} ]</a>
-</div>
-<!-- BEGIN note -->
-<div style="text-align:left;"><span style="color:red;">*</span> : {L_MANDATORY}</div>
-<!-- END note -->
diff --git a/template/cclear/about.tpl b/template/yoga/about.tpl
index c3a94539c..68d505c01 100644
--- a/template/cclear/about.tpl
+++ b/template/yoga/about.tpl
@@ -2,7 +2,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
+      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:About}</h2>
   </div>
diff --git a/template/cclear/admin.tpl b/template/yoga/admin.tpl
index 70c0f2042..70c0f2042 100644
--- a/template/cclear/admin.tpl
+++ b/template/yoga/admin.tpl
diff --git a/template/cclear/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index 6b59afb03..6b59afb03 100644
--- a/template/cclear/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
diff --git a/template/cclear/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index 678bef349..678bef349 100644
--- a/template/cclear/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
diff --git a/template/cclear/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl
index 7ee2a945e..7ee2a945e 100644
--- a/template/cclear/admin/cat_options.tpl
+++ b/template/yoga/admin/cat_options.tpl
diff --git a/template/cclear/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl
index 39374d5ed..39374d5ed 100644
--- a/template/cclear/admin/cat_perm.tpl
+++ b/template/yoga/admin/cat_perm.tpl
diff --git a/template/cclear/admin/comments.tpl b/template/yoga/admin/comments.tpl
index d903c332a..d903c332a 100644
--- a/template/cclear/admin/comments.tpl
+++ b/template/yoga/admin/comments.tpl
diff --git a/template/cclear/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index 6129c032c..25cdc91b0 100644
--- a/template/cclear/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -1,7 +1,7 @@
 <!-- $Id$ -->
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/cclear/theme/help.png" alt="(?)"></a></li>
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
   </ul>
   <h2>{lang:title_configuration}</h2>
 </div>
diff --git a/template/cclear/admin/double_select.tpl b/template/yoga/admin/double_select.tpl
index 1745c52d3..1745c52d3 100644
--- a/template/cclear/admin/double_select.tpl
+++ b/template/yoga/admin/double_select.tpl
diff --git a/template/cclear/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index 7cd8d1ec5..7cd8d1ec5 100644
--- a/template/cclear/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
diff --git a/template/cclear/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl
index b71130efd..b71130efd 100644
--- a/template/cclear/admin/element_set_unit.tpl
+++ b/template/yoga/admin/element_set_unit.tpl
diff --git a/template/cclear/admin/group_list.tpl b/template/yoga/admin/group_list.tpl
index 4344c10da..4344c10da 100644
--- a/template/cclear/admin/group_list.tpl
+++ b/template/yoga/admin/group_list.tpl
diff --git a/template/cclear/admin/group_perm.tpl b/template/yoga/admin/group_perm.tpl
index 91c2f637a..91c2f637a 100644
--- a/template/cclear/admin/group_perm.tpl
+++ b/template/yoga/admin/group_perm.tpl
diff --git a/template/cclear/admin/help.tpl b/template/yoga/admin/help.tpl
index d2f59b811..d2f59b811 100644
--- a/template/cclear/admin/help.tpl
+++ b/template/yoga/admin/help.tpl
diff --git a/template/cclear/admin/images/arrow_down.gif b/template/yoga/admin/images/arrow_down.gif
index 4adda7a9a..4adda7a9a 100644
--- a/template/cclear/admin/images/arrow_down.gif
+++ b/template/yoga/admin/images/arrow_down.gif
diff --git a/template/cclear/admin/images/arrow_first.gif b/template/yoga/admin/images/arrow_first.gif
index aba378384..aba378384 100644
--- a/template/cclear/admin/images/arrow_first.gif
+++ b/template/yoga/admin/images/arrow_first.gif
diff --git a/template/cclear/admin/images/arrow_last.gif b/template/yoga/admin/images/arrow_last.gif
index 95e9b33b2..95e9b33b2 100644
--- a/template/cclear/admin/images/arrow_last.gif
+++ b/template/yoga/admin/images/arrow_last.gif
diff --git a/template/cclear/admin/images/arrow_select.gif b/template/yoga/admin/images/arrow_select.gif
index 90da978cd..90da978cd 100644
--- a/template/cclear/admin/images/arrow_select.gif
+++ b/template/yoga/admin/images/arrow_select.gif
diff --git a/template/cclear/admin/images/arrow_up.gif b/template/yoga/admin/images/arrow_up.gif
index 25d857944..25d857944 100644
--- a/template/cclear/admin/images/arrow_up.gif
+++ b/template/yoga/admin/images/arrow_up.gif
diff --git a/template/cclear/admin/images/collapsed.gif b/template/yoga/admin/images/collapsed.gif
index 3084e0877..3084e0877 100644
--- a/template/cclear/admin/images/collapsed.gif
+++ b/template/yoga/admin/images/collapsed.gif
diff --git a/template/cclear/admin/images/delete.gif b/template/yoga/admin/images/delete.gif
index 88c8d55fa..88c8d55fa 100644
--- a/template/cclear/admin/images/delete.gif
+++ b/template/yoga/admin/images/delete.gif
diff --git a/template/cclear/admin/images/errors.png b/template/yoga/admin/images/errors.png
index 3c8a37df5..3c8a37df5 100644
--- a/template/cclear/admin/images/errors.png
+++ b/template/yoga/admin/images/errors.png
diff --git a/template/cclear/admin/images/expanded.gif b/template/yoga/admin/images/expanded.gif
index 8d2dc2e2a..8d2dc2e2a 100644
--- a/template/cclear/admin/images/expanded.gif
+++ b/template/yoga/admin/images/expanded.gif
diff --git a/template/cclear/admin/images/icon_folder.gif b/template/yoga/admin/images/icon_folder.gif
index cb8e1e69b..cb8e1e69b 100644
--- a/template/cclear/admin/images/icon_folder.gif
+++ b/template/yoga/admin/images/icon_folder.gif
diff --git a/template/cclear/admin/images/icon_folder_link.gif b/template/yoga/admin/images/icon_folder_link.gif
index 0dd6b7d9a..0dd6b7d9a 100644
--- a/template/cclear/admin/images/icon_folder_link.gif
+++ b/template/yoga/admin/images/icon_folder_link.gif
diff --git a/template/cclear/admin/images/icon_folder_lock.gif b/template/yoga/admin/images/icon_folder_lock.gif
index 6e03018c8..6e03018c8 100644
--- a/template/cclear/admin/images/icon_folder_lock.gif
+++ b/template/yoga/admin/images/icon_folder_lock.gif
diff --git a/template/cclear/admin/images/icon_subfolder.gif b/template/yoga/admin/images/icon_subfolder.gif
index b96b786d4..b96b786d4 100644
--- a/template/cclear/admin/images/icon_subfolder.gif
+++ b/template/yoga/admin/images/icon_subfolder.gif
diff --git a/template/cclear/admin/images/infos.png b/template/yoga/admin/images/infos.png
index dc8c8a457..dc8c8a457 100644
--- a/template/cclear/admin/images/infos.png
+++ b/template/yoga/admin/images/infos.png
diff --git a/template/cclear/admin/images/moins.gif b/template/yoga/admin/images/moins.gif
index 74fa8736f..74fa8736f 100644
--- a/template/cclear/admin/images/moins.gif
+++ b/template/yoga/admin/images/moins.gif
diff --git a/template/cclear/admin/images/plus.gif b/template/yoga/admin/images/plus.gif
index 982dcf665..982dcf665 100644
--- a/template/cclear/admin/images/plus.gif
+++ b/template/yoga/admin/images/plus.gif
diff --git a/template/cclear/admin/images/puce.gif b/template/yoga/admin/images/puce.gif
index 3c9171845..3c9171845 100644
--- a/template/cclear/admin/images/puce.gif
+++ b/template/yoga/admin/images/puce.gif
diff --git a/template/cclear/admin/images/stat_left.gif b/template/yoga/admin/images/stat_left.gif
index 269088b81..269088b81 100644
--- a/template/cclear/admin/images/stat_left.gif
+++ b/template/yoga/admin/images/stat_left.gif
diff --git a/template/cclear/admin/images/stat_middle.gif b/template/yoga/admin/images/stat_middle.gif
index 99473151e..99473151e 100644
--- a/template/cclear/admin/images/stat_middle.gif
+++ b/template/yoga/admin/images/stat_middle.gif
diff --git a/template/cclear/admin/images/stat_right.gif b/template/yoga/admin/images/stat_right.gif
index f9584e23a..f9584e23a 100644
--- a/template/cclear/admin/images/stat_right.gif
+++ b/template/yoga/admin/images/stat_right.gif
diff --git a/template/cclear/admin/intro.tpl b/template/yoga/admin/intro.tpl
index ac50d986a..ac50d986a 100644
--- a/template/cclear/admin/intro.tpl
+++ b/template/yoga/admin/intro.tpl
diff --git a/template/cclear/admin/maintenance.tpl b/template/yoga/admin/maintenance.tpl
index 6cc11816c..7fe6c8ab5 100644
--- a/template/cclear/admin/maintenance.tpl
+++ b/template/yoga/admin/maintenance.tpl
@@ -1,7 +1,7 @@
 <!-- $Id$ -->
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/cclear/theme/help.png" alt="(?)"></a></li>
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
   </ul>
   <h2>{lang:Maintenance}</h2>
 </div>
diff --git a/template/cclear/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index 46abed7b0..46abed7b0 100644
--- a/template/cclear/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
diff --git a/template/cclear/admin/remote_site.tpl b/template/yoga/admin/remote_site.tpl
index 776d08a1a..1da98cab7 100644
--- a/template/cclear/admin/remote_site.tpl
+++ b/template/yoga/admin/remote_site.tpl
@@ -1,7 +1,7 @@
 <!-- $Id$ -->
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/cclear/theme/help.png" alt="(?)"></a></li>
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
   </ul>
   <h2>{lang:remote_sites}</h2>
 </div>
diff --git a/template/cclear/admin/stats.tpl b/template/yoga/admin/stats.tpl
index dbfa667a6..dbfa667a6 100644
--- a/template/cclear/admin/stats.tpl
+++ b/template/yoga/admin/stats.tpl
diff --git a/template/cclear/admin/thumbnail.tpl b/template/yoga/admin/thumbnail.tpl
index aa8bbcd0f..aa8bbcd0f 100644
--- a/template/cclear/admin/thumbnail.tpl
+++ b/template/yoga/admin/thumbnail.tpl
diff --git a/template/cclear/admin/update.tpl b/template/yoga/admin/update.tpl
index ee58e3da9..a095573d1 100644
--- a/template/cclear/admin/update.tpl
+++ b/template/yoga/admin/update.tpl
@@ -2,7 +2,7 @@
 
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/cclear/theme/help.png" alt="(?)"></a></li>
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
   </ul>
   <h2>{lang:title_update}</h2>
 </div>
diff --git a/template/cclear/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index ad6b18678..ad6b18678 100644
--- a/template/cclear/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
diff --git a/template/cclear/admin/user_perm.tpl b/template/yoga/admin/user_perm.tpl
index a24fd9096..a24fd9096 100644
--- a/template/cclear/admin/user_perm.tpl
+++ b/template/yoga/admin/user_perm.tpl
diff --git a/template/cclear/admin/waiting.tpl b/template/yoga/admin/waiting.tpl
index d011e9984..d011e9984 100644
--- a/template/cclear/admin/waiting.tpl
+++ b/template/yoga/admin/waiting.tpl
diff --git a/template/cclear/category.tpl b/template/yoga/category.tpl
index 96744606d..96744606d 100644
--- a/template/cclear/category.tpl
+++ b/template/yoga/category.tpl
diff --git a/template/cclear/comments.tpl b/template/yoga/comments.tpl
index 29af69aac..bb4b7726b 100644
--- a/template/cclear/comments.tpl
+++ b/template/yoga/comments.tpl
@@ -3,7 +3,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
+      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:User comments}</h2>
   </div>
diff --git a/template/cclear/content.css b/template/yoga/content.css
index ec060a3a0..ec060a3a0 100644
--- a/template/cclear/content.css
+++ b/template/yoga/content.css
diff --git a/template/cclear/dclear.css b/template/yoga/dclear.css
index e69de29bb..e69de29bb 100644
--- a/template/cclear/dclear.css
+++ b/template/yoga/dclear.css
diff --git a/template/cclear/default-colors.css b/template/yoga/default-colors.css
index 0e52b2eba..0e52b2eba 100644
--- a/template/cclear/default-colors.css
+++ b/template/yoga/default-colors.css
diff --git a/template/cclear/default-layout.css b/template/yoga/default-layout.css
index 7f1a856ec..7f1a856ec 100644
--- a/template/cclear/default-layout.css
+++ b/template/yoga/default-layout.css
diff --git a/template/cclear/footer.tpl b/template/yoga/footer.tpl
index d4c18aff8..d4c18aff8 100644
--- a/template/cclear/footer.tpl
+++ b/template/yoga/footer.tpl
diff --git a/template/cclear/header.tpl b/template/yoga/header.tpl
index f89d405cb..5f9b51c30 100644
--- a/template/cclear/header.tpl
+++ b/template/yoga/header.tpl
@@ -4,9 +4,9 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
 <!-- BIG FIX ME BELOW (paths) -->
-<link rel="stylesheet" type="text/css" href="template/cclear/default-layout.css">
-<link rel="stylesheet" type="text/css" href="template/cclear/default-colors.css">
-<link rel="stylesheet" type="text/css" media="print" href="template/cclear/print.css">
+<link rel="stylesheet" type="text/css" href="template/yoga/default-layout.css">
+<link rel="stylesheet" type="text/css" href="template/yoga/default-colors.css">
+<link rel="stylesheet" type="text/css" media="print" href="template/yoga/print.css">
 <!-- AN OTHER FIX ME -->
 <style type="text/css">
 .notDoneYet {
diff --git a/template/cclear/identification.tpl b/template/yoga/identification.tpl
index 233b338de..d120524d0 100644
--- a/template/cclear/identification.tpl
+++ b/template/yoga/identification.tpl
@@ -3,8 +3,8 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="./template/cclear/theme/register.png" alt="{lang:register}"/></a></li>
-      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
+      <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="./template/yoga/theme/register.png" alt="{lang:register}"/></a></li>
+      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:Identification}</h2>
   </div>
@@ -47,7 +47,7 @@
 </form>
  
   <p>
-    <a href="{U_REGISTER}"><img src="template/cclear/theme/register.png" alt=""> {L_REGISTER}</a>
+    <a href="{U_REGISTER}"><img src="template/yoga/theme/register.png" alt=""> {L_REGISTER}</a>
   </p>
 
 </div> <!-- content -->
diff --git a/template/cclear/image.css b/template/yoga/image.css
index 74f9e1a66..74f9e1a66 100644
--- a/template/cclear/image.css
+++ b/template/yoga/image.css
diff --git a/template/cclear/images/logo.jpg b/template/yoga/images/logo.jpg
index 73c8011ea..73c8011ea 100644
--- a/template/cclear/images/logo.jpg
+++ b/template/yoga/images/logo.jpg
diff --git a/template/cclear/images/php_sqreuil_artistes.gif b/template/yoga/images/php_sqreuil_artistes.gif
index 32fffc90b..32fffc90b 100755
--- a/template/cclear/images/php_sqreuil_artistes.gif
+++ b/template/yoga/images/php_sqreuil_artistes.gif
diff --git a/template/cclear/install.tpl b/template/yoga/install.tpl
index 78b9e1836..78b9e1836 100644
--- a/template/cclear/install.tpl
+++ b/template/yoga/install.tpl
diff --git a/template/cclear/menubar.css b/template/yoga/menubar.css
index 9f2b9c2a3..9f2b9c2a3 100644
--- a/template/cclear/menubar.css
+++ b/template/yoga/menubar.css
diff --git a/template/cclear/mimetypes/avi.png b/template/yoga/mimetypes/avi.png
index 065f0b282..065f0b282 100644
--- a/template/cclear/mimetypes/avi.png
+++ b/template/yoga/mimetypes/avi.png
diff --git a/template/cclear/mimetypes/mp3.png b/template/yoga/mimetypes/mp3.png
index afb7e1b0a..afb7e1b0a 100644
--- a/template/cclear/mimetypes/mp3.png
+++ b/template/yoga/mimetypes/mp3.png
diff --git a/template/cclear/mimetypes/mpg.png b/template/yoga/mimetypes/mpg.png
index f7dbd2388..f7dbd2388 100644
--- a/template/cclear/mimetypes/mpg.png
+++ b/template/yoga/mimetypes/mpg.png
diff --git a/template/cclear/mimetypes/ogg.png b/template/yoga/mimetypes/ogg.png
index ead3f62c3..ead3f62c3 100644
--- a/template/cclear/mimetypes/ogg.png
+++ b/template/yoga/mimetypes/ogg.png
diff --git a/template/cclear/mimetypes/zip.png b/template/yoga/mimetypes/zip.png
index 1f08fe1a3..1f08fe1a3 100644
--- a/template/cclear/mimetypes/zip.png
+++ b/template/yoga/mimetypes/zip.png
diff --git a/template/cclear/notification.tpl b/template/yoga/notification.tpl
index cc4a0ee9f..974967e62 100644
--- a/template/cclear/notification.tpl
+++ b/template/yoga/notification.tpl
@@ -2,7 +2,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
+      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:Notification}</h2>
   </div>
diff --git a/template/cclear/picture.tpl b/template/yoga/picture.tpl
index e05b4ddd1..98704466c 100644
--- a/template/cclear/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -11,19 +11,19 @@
 <div id="imageToolBar">
 
 <div class="randomButtons">
-  <a href="{U_SLIDESHOW}" title="{L_SLIDESHOW}"><img src="template/cclear/theme/slideshow.png" alt="{L_SLIDESHOW}"></a>
-  <a href="{U_METADATA}" title="{L_PICTURE_METADATA}"><img src="template/cclear/theme/metadata.png" alt="{L_PICTURE_METADATA}"></a>
+  <a href="{U_SLIDESHOW}" title="{L_SLIDESHOW}"><img src="template/yoga/theme/slideshow.png" alt="{L_SLIDESHOW}"></a>
+  <a href="{U_METADATA}" title="{L_PICTURE_METADATA}"><img src="template/yoga/theme/metadata.png" alt="{L_PICTURE_METADATA}"></a>
 <!-- BEGIN representative -->
-  <a href="{representative.URL}" title="{lang:set as category representative}"><img src="template/cclear/theme/representative.png" alt="{lang:representative}" /></a>
+  <a href="{representative.URL}" title="{lang:set as category representative}"><img src="template/yoga/theme/representative.png" alt="{lang:representative}" /></a>
 <!-- END representative -->
 <!-- BEGIN favorite -->
   <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" alt="{favorite.FAVORITE_ALT}"></a>
 <!-- END favorite -->
 <!-- BEGIN download -->
-  <a href="{download.U_DOWNLOAD}" title="{L_DOWNLOAD}"><img src="template/cclear/theme/save.png" alt="{L_DOWNLOAD}"></a>
+  <a href="{download.U_DOWNLOAD}" title="{L_DOWNLOAD}"><img src="template/yoga/theme/save.png" alt="{L_DOWNLOAD}"></a>
 <!-- END download -->
 <!-- BEGIN admin -->
-  <a href="{U_ADMIN}" title="{L_ADMIN}"><img src="template/cclear/theme/preferences.png" alt="{L_ADMIN}"></a>
+  <a href="{U_ADMIN}" title="{L_ADMIN}"><img src="template/yoga/theme/preferences.png" alt="{L_ADMIN}"></a>
 <!-- END admin -->
 <!-- BEGIN caddie -->
   <a href="{caddie.URL}" title="{lang:add to caddie}"><img src="./template/default/theme/caddie_add.png" alt="{lang:caddie}"/></a>
@@ -32,11 +32,11 @@
 
 <div class="navButtons">
 <!-- BEGIN next -->
-  <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}"><img src="template/cclear/theme/right.png" alt="next"></a>
+  <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}"><img src="template/yoga/theme/right.png" alt="next"></a>
 <!-- END next -->
-  <a class="navButton up" href="{U_UP}" title="{L_UP_HINT}"><img src="template/cclear/theme/up.png" alt="{L_UP_ALT}"></a>
+  <a class="navButton up" href="{U_UP}" title="{L_UP_HINT}"><img src="template/yoga/theme/up.png" alt="{L_UP_ALT}"></a>
 <!-- BEGIN previous -->
-  <a class="navButton prev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}"><img src="template/cclear/theme/left.png" alt="previous"></a>
+  <a class="navButton prev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}"><img src="template/yoga/theme/left.png" alt="previous"></a>
 <!-- END previous -->
 </div>
 
diff --git a/template/cclear/popuphelp.css b/template/yoga/popuphelp.css
index 4c73d212d..4c73d212d 100644
--- a/template/cclear/popuphelp.css
+++ b/template/yoga/popuphelp.css
diff --git a/template/cclear/popuphelp.tpl b/template/yoga/popuphelp.tpl
index 60e8c3ddc..23390c936 100644
--- a/template/cclear/popuphelp.tpl
+++ b/template/yoga/popuphelp.tpl
@@ -2,4 +2,4 @@
 {HELP_CONTENT}
 </div> <!-- content -->
 
-<p id="pageBottomActions"><a href="#" onclick="window.close();" title="{lang:Close this window}"><img src="template/cclear/theme/exit.png" alt="close"></a></p>
+<p id="pageBottomActions"><a href="#" onclick="window.close();" title="{lang:Close this window}"><img src="template/yoga/theme/exit.png" alt="close"></a></p>
diff --git a/template/cclear/print.css b/template/yoga/print.css
index 79a0aaa2e..79a0aaa2e 100644
--- a/template/cclear/print.css
+++ b/template/yoga/print.css
diff --git a/template/cclear/profile.tpl b/template/yoga/profile.tpl
index 08983b91b..400078474 100644
--- a/template/cclear/profile.tpl
+++ b/template/yoga/profile.tpl
@@ -12,7 +12,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_RETURN}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
+      <li><a href="{U_RETURN}" title="{lang:return to homepage}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:Profile}</h2>
   </div>
diff --git a/template/cclear/redirect.tpl b/template/yoga/redirect.tpl
index d3c485c3d..d3c485c3d 100644
--- a/template/cclear/redirect.tpl
+++ b/template/yoga/redirect.tpl
diff --git a/template/cclear/register.tpl b/template/yoga/register.tpl
index 3b39fcbf2..09740e881 100644
--- a/template/cclear/register.tpl
+++ b/template/yoga/register.tpl
@@ -4,7 +4,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
+      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:Registration}</h2>
   </div>
diff --git a/template/cclear/search.tpl b/template/yoga/search.tpl
index 75147cffa..bb2cf08a5 100644
--- a/template/cclear/search.tpl
+++ b/template/yoga/search.tpl
@@ -2,7 +2,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
+      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:Search}</h2>
   </div>
diff --git a/template/cclear/theme/button_bg.gif b/template/yoga/theme/button_bg.gif
index 442f2469c..442f2469c 100644
--- a/template/cclear/theme/button_bg.gif
+++ b/template/yoga/theme/button_bg.gif
diff --git a/template/cclear/theme/caddie_add.png b/template/yoga/theme/caddie_add.png
index eb20f4e06..eb20f4e06 100644
--- a/template/cclear/theme/caddie_add.png
+++ b/template/yoga/theme/caddie_add.png
diff --git a/template/cclear/theme/categories.gif b/template/yoga/theme/categories.gif
index cd3084434..cd3084434 100644
--- a/template/cclear/theme/categories.gif
+++ b/template/yoga/theme/categories.gif
diff --git a/template/cclear/theme/category_children.png b/template/yoga/theme/category_children.png
index 7205c3f61..7205c3f61 100644
--- a/template/cclear/theme/category_children.png
+++ b/template/yoga/theme/category_children.png
diff --git a/template/cclear/theme/category_delete.png b/template/yoga/theme/category_delete.png
index da796da11..da796da11 100644
--- a/template/cclear/theme/category_delete.png
+++ b/template/yoga/theme/category_delete.png
diff --git a/template/cclear/theme/category_edit.png b/template/yoga/theme/category_edit.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/cclear/theme/category_edit.png
+++ b/template/yoga/theme/category_edit.png
diff --git a/template/cclear/theme/category_elements.png b/template/yoga/theme/category_elements.png
index 1d367b38f..1d367b38f 100644
--- a/template/cclear/theme/category_elements.png
+++ b/template/yoga/theme/category_elements.png
diff --git a/template/cclear/theme/category_jump-to.png b/template/yoga/theme/category_jump-to.png
index 62db1f4ee..62db1f4ee 100644
--- a/template/cclear/theme/category_jump-to.png
+++ b/template/yoga/theme/category_jump-to.png
diff --git a/template/cclear/theme/category_permissions.png b/template/yoga/theme/category_permissions.png
index 4780841ae..4780841ae 100644
--- a/template/cclear/theme/category_permissions.png
+++ b/template/yoga/theme/category_permissions.png
diff --git a/template/cclear/theme/category_representant_random.png b/template/yoga/theme/category_representant_random.png
index dfa69846f..dfa69846f 100644
--- a/template/cclear/theme/category_representant_random.png
+++ b/template/yoga/theme/category_representant_random.png
diff --git a/template/cclear/theme/del_favorite.gif b/template/yoga/theme/del_favorite.gif
index bc7a83037..bc7a83037 100644
--- a/template/cclear/theme/del_favorite.gif
+++ b/template/yoga/theme/del_favorite.gif
diff --git a/template/cclear/theme/delete.gif b/template/yoga/theme/delete.gif
index 077b41ca8..077b41ca8 100644
--- a/template/cclear/theme/delete.gif
+++ b/template/yoga/theme/delete.gif
diff --git a/template/cclear/theme/delete.png b/template/yoga/theme/delete.png
index af10be03e..af10be03e 100644
--- a/template/cclear/theme/delete.png
+++ b/template/yoga/theme/delete.png
diff --git a/template/cclear/theme/download.gif b/template/yoga/theme/download.gif
index bf44419dd..bf44419dd 100644
--- a/template/cclear/theme/download.gif
+++ b/template/yoga/theme/download.gif
diff --git a/template/cclear/theme/eCard.gif b/template/yoga/theme/eCard.gif
index 480872c4e..480872c4e 100644
--- a/template/cclear/theme/eCard.gif
+++ b/template/yoga/theme/eCard.gif
diff --git a/template/yoga/theme/exit.png b/template/yoga/theme/exit.png
new file mode 100644
index 000000000..2aafbb4cb
--- /dev/null
+++ b/template/yoga/theme/exit.png
diff --git a/template/cclear/theme/favorite.gif b/template/yoga/theme/favorite.gif
index 6b103cd8c..6b103cd8c 100644
--- a/template/cclear/theme/favorite.gif
+++ b/template/yoga/theme/favorite.gif
diff --git a/template/yoga/theme/help.png b/template/yoga/theme/help.png
new file mode 100644
index 000000000..c76f68292
--- /dev/null
+++ b/template/yoga/theme/help.png
diff --git a/template/yoga/theme/home.png b/template/yoga/theme/home.png
new file mode 100644
index 000000000..cce450d85
--- /dev/null
+++ b/template/yoga/theme/home.png
diff --git a/template/cclear/theme/left-arrow.gif b/template/yoga/theme/left-arrow.gif
index c60eb07c1..c60eb07c1 100644
--- a/template/cclear/theme/left-arrow.gif
+++ b/template/yoga/theme/left-arrow.gif
diff --git a/template/cclear/theme/left.png b/template/yoga/theme/left.png
index 63d306c9c..63d306c9c 100644
--- a/template/cclear/theme/left.png
+++ b/template/yoga/theme/left.png
diff --git a/template/cclear/theme/lost.gif b/template/yoga/theme/lost.gif
index b8b873d15..b8b873d15 100644
--- a/template/cclear/theme/lost.gif
+++ b/template/yoga/theme/lost.gif
diff --git a/template/cclear/theme/metadata.gif b/template/yoga/theme/metadata.gif
index 69b77ec44..69b77ec44 100644
--- a/template/cclear/theme/metadata.gif
+++ b/template/yoga/theme/metadata.gif
diff --git a/template/cclear/theme/metadata.png b/template/yoga/theme/metadata.png
index d5d8fa6dc..d5d8fa6dc 100644
--- a/template/cclear/theme/metadata.png
+++ b/template/yoga/theme/metadata.png
diff --git a/template/cclear/theme/permissions.png b/template/yoga/theme/permissions.png
index 33091eb85..33091eb85 100644
--- a/template/cclear/theme/permissions.png
+++ b/template/yoga/theme/permissions.png
diff --git a/template/cclear/theme/preferences.png b/template/yoga/theme/preferences.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/cclear/theme/preferences.png
+++ b/template/yoga/theme/preferences.png
diff --git a/template/cclear/theme/profile.png b/template/yoga/theme/profile.png
index 397cd73a1..397cd73a1 100644
--- a/template/cclear/theme/profile.png
+++ b/template/yoga/theme/profile.png
diff --git a/template/cclear/theme/properties.gif b/template/yoga/theme/properties.gif
index f843e0636..f843e0636 100644
--- a/template/cclear/theme/properties.gif
+++ b/template/yoga/theme/properties.gif
diff --git a/template/cclear/theme/recent.gif b/template/yoga/theme/recent.gif
index ad91b9126..ad91b9126 100644
--- a/template/cclear/theme/recent.gif
+++ b/template/yoga/theme/recent.gif
diff --git a/template/cclear/theme/register.gif b/template/yoga/theme/register.gif
index 11b8f3171..11b8f3171 100644
--- a/template/cclear/theme/register.gif
+++ b/template/yoga/theme/register.gif
diff --git a/template/yoga/theme/register.png b/template/yoga/theme/register.png
new file mode 100644
index 000000000..d1dd3c834
--- /dev/null
+++ b/template/yoga/theme/register.png
diff --git a/template/cclear/theme/representative.png b/template/yoga/theme/representative.png
index f1141d91b..f1141d91b 100644
--- a/template/cclear/theme/representative.png
+++ b/template/yoga/theme/representative.png
diff --git a/template/cclear/theme/right-arrow.gif b/template/yoga/theme/right-arrow.gif
index 1a2162688..1a2162688 100644
--- a/template/cclear/theme/right-arrow.gif
+++ b/template/yoga/theme/right-arrow.gif
diff --git a/template/cclear/theme/right.png b/template/yoga/theme/right.png
index f998098e4..f998098e4 100644
--- a/template/cclear/theme/right.png
+++ b/template/yoga/theme/right.png
diff --git a/template/cclear/theme/save.png b/template/yoga/theme/save.png
index b4b9da08b..b4b9da08b 100644
--- a/template/cclear/theme/save.png
+++ b/template/yoga/theme/save.png
diff --git a/template/cclear/theme/slideshow.gif b/template/yoga/theme/slideshow.gif
index 79712c3ad..79712c3ad 100644
--- a/template/cclear/theme/slideshow.gif
+++ b/template/yoga/theme/slideshow.gif
diff --git a/template/cclear/theme/slideshow.png b/template/yoga/theme/slideshow.png
index 455d73fdf..455d73fdf 100644
--- a/template/cclear/theme/slideshow.png
+++ b/template/yoga/theme/slideshow.png
diff --git a/template/cclear/theme/sync_metadata.png b/template/yoga/theme/sync_metadata.png
index 03570ead6..03570ead6 100644
--- a/template/cclear/theme/sync_metadata.png
+++ b/template/yoga/theme/sync_metadata.png
diff --git a/template/cclear/theme/tableh1_bg.gif b/template/yoga/theme/tableh1_bg.gif
index 9f0ef65bd..9f0ef65bd 100644
--- a/template/cclear/theme/tableh1_bg.gif
+++ b/template/yoga/theme/tableh1_bg.gif
diff --git a/template/cclear/theme/up.png b/template/yoga/theme/up.png
index 0c9cda5b1..0c9cda5b1 100644
--- a/template/cclear/theme/up.png
+++ b/template/yoga/theme/up.png
diff --git a/template/cclear/upgrade.tpl b/template/yoga/upgrade.tpl
index 40b2ede4c..40b2ede4c 100644
--- a/template/cclear/upgrade.tpl
+++ b/template/yoga/upgrade.tpl
diff --git a/template/cclear/upload.tpl b/template/yoga/upload.tpl
index fcf27b543..fcf27b543 100644
--- a/template/cclear/upload.tpl
+++ b/template/yoga/upload.tpl