issue 426 step 1 reverted:

svn merge -r1466:1465 .
svn merge -r1463:1462 .


git-svn-id: http://piwigo.org/svn/trunk@1376 68402e56-0260-453c-a942-63ccdbb3a9ee

212 files changed, 25 insertions, 5110 deletions

diff --git a/template/admin/yoga/admin.tpl b/template/admin/yoga/admin.tpl
deleted file mode 100644
index a47410ff9..000000000
--- a/template/admin/yoga/admin.tpl
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- $Id: admin.tpl 1168 2006-04-14 18:17:31Z chrisaga $ -->
-<div id="menubar">
-  <dl>
-    <dt>{lang:links}</dt>
-    <dd>
-      <ul>
-	<li><a href="{U_RETURN}">{lang:home}</a></li>
-        <li><a href="{U_ADMIN}" title="{L_ADMIN_HINT}">{L_ADMIN}</a></li>
-      </ul>
-    </dd>
-  </dl>
-  <dl>
-    <dt>{lang:general}</dt>
-    <dd>
-      <ul>
-	<li><a href="{U_FAQ}">{lang:instructions}</a></li>
-	<li><a href="{U_SITE_MANAGER}">{lang:Site manager}</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>
-	<li><a href="{U_NOTIFICATION_BY_MAIL}">{lang:nbm_item_notification}</a></li>
-      </ul>
-    </dd>
-  </dl>
-  <dl>
-    <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>
-      </ul>
-    </dd>
-  </dl>
-  <dl>
-    <dt>{lang:Categories}</dt>
-    <dd>
-      <ul>
-	<li><a href="{U_CATEGORIES}">{lang:manage}</a></li>
-	<li><a href="{U_MOVE}">{lang:Move}</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>
-  </dl>
-  <dl>
-    <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_RATING}">{lang:Rating}</a></li>
-	<li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
-	<li><a href="{U_TAGS}">{lang:Tags}</a></li>
-      </ul>
-    </dd>
-  </dl>
-  <dl>
-    <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> <!-- menubar -->
-
-<div id="content">
-  <!-- BEGIN errors -->
-  <div class="errors">
-    <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
-    </ul>
-  </div>
-  <!-- END errors -->
-
-  <!-- BEGIN infos -->
-  <div class="infos">
-    <ul>
-      <!-- BEGIN info -->
-      <li>{infos.info.INFO}</li>
-      <!-- END info -->
-    </ul>
-  </div>
-  <!-- END infos -->
-
-  {ADMIN_CONTENT}
-</div>
diff --git a/template/admin/yoga/admin/cat_list.tpl b/template/admin/yoga/admin/cat_list.tpl
deleted file mode 100644
index 356c47b3f..000000000
--- a/template/admin/yoga/admin/cat_list.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- $Id: cat_list.tpl 1348 2006-06-13 20:39:49Z plg $ -->
-<h2>{lang:title_categories}</h2>
-
-<h3>{CATEGORIES_NAV}</h3>
-
-<!-- BEGIN categories -->
-<form id="categoryOrdering" action="{F_ACTION}" method="post">
-
-  <ul class="categoryUl">
-
-    <!-- BEGIN category -->
-    <li class="categoryLi"> <!-- category {category.ID} -->
-
-      <ul class="categoryActions">
-        <li><a href="{categories.category.U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to}" /></a></li> 
-        <li><a href="{categories.category.U_EDIT}" title="{lang:edit category informations}"><img src="{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
-        <!-- BEGIN elements -->
-        <li><a href="{categories.category.elements.URL}" title="{lang:manage category elements}"><img src="{themeconf:icon_dir}/category_elements.png" class="button" alt="{lang:elements}" /></a></li>
-        <!-- END elements -->
-        <li><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}"><img src="{themeconf:icon_dir}/category_children.png" class="button" alt="{lang:sub-categories}" /></a></li> 
-        <!-- BEGIN permissions -->
-        <li><a href="{categories.category.permissions.URL}" title="{lang:edit category permissions}" ><img src="{themeconf:icon_dir}/category_permissions.png" class="button" alt="{lang:permissions}" /></a></li>
-        <!-- END permissions -->
-        <!-- BEGIN delete -->
-        <li><a href="{categories.category.delete.URL}" title="{lang:delete category}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/category_delete.png" class="button" alt="{lang:delete}" /></a></li>
-        <!-- END delete -->
-      </ul>
-
-      <p><strong><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}">{categories.category.NAME}</a></strong></p>
-
-      <p>
-        <label>
-          {lang:Position} :
-          <input type="text" size="4" name="catOrd[{categories.category.ID}]" maxlength="4" value="{categories.category.RANK}" />
-        </label>
-      </p>
-
-    </li>
-    <!-- END category -->
-
-  </ul>
-  <p>
-    <input name="submitOrder" type="submit" value="{lang:Save order}" {TAG_INPUT_ENABLED} />
-    <input name="submitOrderAlphaNum" type="submit" value="{lang:Order alphanumerically}" {TAG_INPUT_ENABLED} />
-  </p>
-
-</form>
-<!-- END categories -->
-
-<form id="addVirtual" action="{F_ACTION}" method="post">
-  <p>
-    {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
-    <input type="submit" value="{L_SUBMIT}" name="submitAdd" {TAG_INPUT_ENABLED} />
-  </p>
-</form>
diff --git a/template/admin/yoga/admin/cat_modify.tpl b/template/admin/yoga/admin/cat_modify.tpl
deleted file mode 100644
index 8b4c0f9c4..000000000
--- a/template/admin/yoga/admin/cat_modify.tpl
+++ /dev/null
@@ -1,193 +0,0 @@
-<!-- $Id: cat_modify.tpl 1199 2006-04-18 22:41:56Z chrisaga $ -->
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:title_edit_cat}</h2>
-</div>
-
-<h3>{CATEGORIES_NAV}</h3>
-
-<ul class="categoryActions">
-  <li><a href="{U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to}" /></a></li>
-  <!-- BEGIN elements -->
-  <li><a href="{elements.URL}" title="{lang:manage category elements}"><img src="{themeconf:icon_dir}/category_elements.png" class="button" alt="{lang:elements}" /></a></li>
-  <!-- END elements -->
-  <li><a href="{U_CHILDREN}" title="{lang:manage sub-categories}"><img src="{themeconf:icon_dir}/category_children.png" class="button" alt="{lang:sub-categories}" /></a></li>
-  <!-- BEGIN permissions -->
-  <li><a href="{permissions.URL}" title="{lang:edit category permissions}" ><img src="{themeconf:icon_dir}/category_permissions.png" class="button" alt="{lang:permissions}" /></a></li>
-  <!-- END permissions -->
-  <!-- BEGIN delete -->
-  <li><a href="{delete.URL}" title="{lang:delete category}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/category_delete.png" class="button" alt="{lang:delete}" /></a></li>
-  <!-- END delete -->
-</ul>
-
-<form action="{F_ACTION}" method="POST" id="cat_modify">
-
-<fieldset>
-  <legend>{lang:Informations}</legend>
-  <table>
-    <!-- BEGIN server -->
-    <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 cols="50" rows="5" 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>
-      <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>
-      <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>
-      <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>
-      <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" {TAG_INPUT_ENABLED}/>
-  <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="{themeconf:icon_dir}/category_representant_random.png" class="button" 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}" {TAG_INPUT_ENABLED}/></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>
-
-<form action="{F_ACTION}" method="POST" id="links">
-  
-<fieldset>
-  <legend>{lang:Link all category elements to a new category}</legend>
-
-  <table>
-    <tr>
-      <td>{lang:Virtual category name}</td>
-      <td><input type="text" name="virtual_name"></td>
-    </tr>
-
-    <tr>
-      <td>{lang:Parent category}</td>
-      <td>
-        <select class="categoryList" name="parent">
-          <!-- BEGIN category_option_parent -->
-          <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
-          <!-- END category_option_parent -->
-        </select>
-      </td>
-    </tr>
-  </table>
-
-  <p>
-    <input type="submit" value="{lang:Submit}" name="submitAdd" {TAG_INPUT_ENABLED}/>
-    <input type="reset" value="{lang:Reset}" name="reset" />
-  </p>  
-
-</fieldset>
-
-<fieldset>
-  <legend>{lang:Link all category elements to some existing categories}</legend>
-
-  <table>
-    <tr>
-      <td>{lang:Categories}</td>
-      <td>
-        <select class="categoryList" name="destinations[]" multiple="multiple" size="5">
-          <!-- BEGIN category_option_destination -->
-          <option {category_option_destination.SELECTED} value="{category_option_destination.VALUE}">{category_option_destination.OPTION}</option>
-          <!-- END category_option_destination -->
-        </select>
-      </td>
-    </tr>
-  </table>
-
-  <p>
-    <input type="submit" value="{lang:Submit}" name="submitDestinations" {TAG_INPUT_ENABLED}/>
-    <input type="reset" value="{lang:Reset}" name="reset" />
-  </p>  
-
-</fieldset>
-
-</form>
diff --git a/template/admin/yoga/admin/cat_move.tpl b/template/admin/yoga/admin/cat_move.tpl
deleted file mode 100644
index 1010acbf1..000000000
--- a/template/admin/yoga/admin/cat_move.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- $Id: cat_move.tpl 1085 2006-03-16 22:58:16Z rub $ -->
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:Move categories}</h2>
-</div>
-
-<form method="post" action="{F_ACTION}">
-  <fieldset>
-    <legend>{lang:Virtual categories movement}</legend>
-
-    <label>
-      {lang:Virtual categories to move}
-
-      <select class="categoryList" name="selection[]" multiple="multiple" size="30">
-        <!-- BEGIN category_option_selection -->
-        <option {category_option_selection.SELECTED} value="{category_option_selection.VALUE}">{category_option_selection.OPTION}</option>
-        <!-- END category_option_selection -->
-      </select>
-    </label>
-
-    <label>
-      {lang:New parent category}
-
-      <select class="categoryList" name="parent">
-        <!-- BEGIN category_option_parent -->
-        <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
-        <!-- END category_option_parent -->
-      </select>
-    </label>
-
-  </fieldset>
-
-  <p>
-    <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}>
-    <input type="reset" name="reset" value="{lang:Reset}">
-  </p>
-
-</form>
diff --git a/template/admin/yoga/admin/cat_options.tpl b/template/admin/yoga/admin/cat_options.tpl
deleted file mode 100644
index 56e12ae27..000000000
--- a/template/admin/yoga/admin/cat_options.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- $Id: cat_options.tpl 1244 2006-04-21 21:07:19Z nikrou $ -->
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:title_cat_options}</h2>
-</div>
-
-<form method="post" action="{F_ACTION}" id="cat_options">
-  <fieldset>
-    <legend>{L_SECTION}</legend>
-    {DOUBLE_SELECT}
-  </fieldset>
-</form>
-
-<p class="information">{L_CAT_OPTIONS_INFO}</p>
-
diff --git a/template/admin/yoga/admin/configuration.tpl b/template/admin/yoga/admin/configuration.tpl
deleted file mode 100644
index 82a9977c7..000000000
--- a/template/admin/yoga/admin/configuration.tpl
+++ /dev/null
@@ -1,167 +0,0 @@
-<!-- $Id: configuration.tpl 1129 2006-04-05 21:01:05Z plg $ -->
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:title_configuration}</h2>
-</div>
-
-<form method="post" action="{F_ACTION}" class="properties">
-
-<fieldset>
-<!-- BEGIN general -->
-  <legend>{lang:conf_general_title}</legend>
-
-  <ul>
-    <li>
-      <span class="property">
-        <label for="gallery_title">{lang:Gallery title}</label>
-      </span>
-      <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{general.CONF_GALLERY_TITLE}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="page_banner">{lang:Page banner}</label>
-      </span>
-      <textarea cols="50" rows="5" name="page_banner" id="page_banner" onfocus="this.className='focus';" onblur="this.className='nofocus';">{general.CONF_PAGE_BANNER}</textarea>
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="gallery_url">{lang:Gallery URL}</label>
-      </span>
-      <input type="text" maxlength="255" size="50" name="gallery_url" id="gallery_url" value="{general.CONF_GALLERY_URL}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-    </li>
-
-    <li>
-      <span class="property">{lang:History}</span>
-      <label><input type="radio" class="radio" name="log" value="true" {general.HISTORY_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="log" value="false" {general.HISTORY_NO} />{lang:No}</label>
-    </li>
-
-    <li>
-      <span class="property">{lang:Lock gallery}</span>
-      <label><input type="radio" class="radio" name="gallery_locked" value="true" {general.GALLERY_LOCKED_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="gallery_locked" value="false" {general.GALLERY_LOCKED_NO} />{lang:No}</label>
-    </li>
-    
-    <li>
-      <span class="property">{lang:Rating}</span>
-      <label><input type="radio" class="radio" name="rate" value="true" {general.RATE_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="rate" value="false" {general.RATE_NO} />{lang:No}</label>
-    </li>
-
-    <li>
-      <span class="property">{lang:Rating by guests}</span>
-      <label><input type="radio" class="radio" name="rate_anonymous" value="true" {general.RATE_ANONYMOUS_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="rate_anonymous" value="false" {general.RATE_ANONYMOUS_NO} />{lang:No}</label>
-    </li>
-  </ul>
-<!-- END general -->
-
-<!-- BEGIN comments -->
-  <legend>{lang:conf_comments_title}</legend>
-
-  <ul>
-    <li>
-      <span class="property">{lang:Comments for all}</span>
-      <label><input type="radio" class="radio" name="comments_forall" value="true" {comments.COMMENTS_ALL_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="comments_forall" value="false" {comments.COMMENTS_ALL_NO} />{lang:No}</label>
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="nb_comment_page">{lang:Number of comments per page}</label>
-      </span>
-      <input type="text" size="3" maxlength="4" name="nb_comment_page" id="nb_comment_page" value="{comments.NB_COMMENTS_PAGE}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-    </li>
-
-    <li>
-      <span class="property">{lang:Validation}</span>
-      <label><input type="radio" class="radio" name="comments_validation" value="true" {comments.VALIDATE_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="comments_validation" value="false" {comments.VALIDATE_NO} />{lang:No}</label>
-    </li>
-  </ul>
-<!-- END comments -->
-<!-- BEGIN default -->
-  <legend>{lang:conf_default_title}</legend>
-
-  <ul>
-    <li>
-      <span class="property">
-        <label for="default_language">{lang:Language}</label>
-      </span>
-      <select name="default_language" id="default_language" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-        <!-- BEGIN language_option -->
-        <option value="{default.language_option.VALUE}" {default.language_option.SELECTED}>{default.language_option.CONTENT}</option>
-        <!-- END language_option -->
-      </select>
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="nb_image_line">{lang:Number of images per row}</label>
-      </span>
-      <input type="text" size="3" maxlength="2" id="nb_image_line" name="nb_image_line" value="{default.NB_IMAGE_LINE}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="nb_line_page">{lang:Number of rows per page}</label>
-      </span>
-      <input type="text" size="3" maxlength="2" id="nb_line_page" name="nb_line_page" value="{default.NB_ROW_PAGE}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="default_template">{lang:Interface theme}</label>
-      </span>
-      <select name="default_template" id="default_template" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-        <!-- BEGIN template_option -->
-        <option value="{default.template_option.VALUE}" {default.template_option.SELECTED}>{default.template_option.CONTENT}</option>
-        <!-- END template_option -->
-      </select>
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="recent_period">{lang:Recent period}</label>
-      </span>
-      <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{default.CONF_RECENT}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-    </li>
-
-    <li>
-      <span class="property">{lang:Expand all categories}</span>
-      <label><input type="radio" class="radio" name="auto_expand" value="true" {default.EXPAND_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="auto_expand" value="false" {default.EXPAND_NO} />{lang:No}</label>
-    </li>
-
-    <li>
-      <span class="property">{lang:Show number of comments}</span>
-      <label><input type="radio" class="radio" name="show_nb_comments" value="true" {default.SHOW_COMMENTS_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="show_nb_comments" value="false" {default.SHOW_COMMENTS_NO} />{lang:No}</label>
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="default_maxwidth">{lang:Maximum width of the pictures}</label>
-      </span>
-      <input type="text" size="4" maxlength="4" id="default_maxwidth" name="default_maxwidth" value="{default.MAXWIDTH}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-    </li>
-
-    <li>
-      <span class="property">
-        <label for="default_maxheight">{lang:Maximum height of the pictures}</label>
-      </span>
-      <input type="text" size="4" maxlength="4" id="default_maxheight" name="default_maxheight" value="{default.MAXHEIGHT}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-    </li>
-  </ul>
-<!-- END default -->
-  </fieldset>
-
-  <p>
-    <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}>
-    <input type="reset" name="reset" value="{lang:Reset}">
-  </p>
-</form>
diff --git a/template/admin/yoga/admin/element_set_global.tpl b/template/admin/yoga/admin/element_set_global.tpl
deleted file mode 100644
index 638e5a139..000000000
--- a/template/admin/yoga/admin/element_set_global.tpl
+++ /dev/null
@@ -1,166 +0,0 @@
-<!-- $Id: element_set_global.tpl 1315 2006-05-16 18:25:50Z chrisaga $ -->
-<h2>{lang:Batch management}</h2>
-
-<h3>{CATEGORIES_NAV}</h3>
-
-<p style="text-align:center;">
-  {lang:global mode}
-  | <a href="{U_UNIT_MODE}">{lang:unit mode}</a>
-</p>
-
-<fieldset>
-
-  <legend>{lang:Display options}</legend>
-
-  <p>{lang: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">{lang:all}</a>
-  </p>
-
-</fieldset>
-
-<form action="{F_ACTION}" method="post">
-
-<fieldset>
-
-  <legend>{lang:Elements}</legend>
-<!--
-  <div class="navigationBar">{NAV_BAR}</div>
--->
-  <!-- BEGIN thumbnails -->
-  <ul class="thumbnails">
-    <!-- BEGIN thumbnail -->
-    <li><span class="wrap1"><span class="wrap2">
-        <label>
-        <img src="{thumbnails.thumbnail.SRC}"
-             alt="{thumbnails.thumbnail.ALT}"
-             title="{thumbnails.thumbnail.TITLE}"
-             class="thumbnail" />
-        <input type="checkbox" name="selection[]" value="{thumbnails.thumbnail.ID}" />
-        </label></span></span>
-    </li>
-    <!-- END thumbnail -->
-  </ul>
-  <!-- END thumbnails -->
-
-</fieldset>
-
-<fieldset>
-
-  <legend>{lang:Form}</legend>
-
-  <table>
-
-    <tr>
-      <td>{lang: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>{lang: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>{lang:add tags}</td>
-      <td>{ADD_TAG_SELECTION}</td>
-    </tr>
-
-    <tr>
-      <td>{lang:remove tags}</td>
-      <td>{DEL_TAG_SELECTION}</td>
-    </tr>
-    
-    <tr>
-      <td>{lang:author}</td>
-      <td>
-        <input type="radio" name="author_action" value="leave" checked="checked" /> {lang:leave}
-        <input type="radio" name="author_action" value="unset" /> {lang:unset}
-        <input type="radio" name="author_action" value="set" id="author_action_set" /> {lang:set to}
-        <input onmousedown="document.getElementById('author_action_set').checked = true;" type="text" name="author" value="" />
-      </td>
-    </tr>
-
-    <tr>
-      <td>{lang:title}</td>
-      <td>
-        <input type="radio" name="name_action" value="leave" checked="checked" /> {lang:leave}
-        <input type="radio" name="name_action" value="unset" /> {lang:unset}
-        <input type="radio" name="name_action" value="set" id="name_action_set" /> {lang:set to}
-        <input onmousedown="document.getElementById('name_action_set').checked = true;" type="text" name="name" value="" />
-      </td>
-    </tr>
-
-    <tr>
-      <td>{lang:creation date}</td>
-      <td>
-        <input type="radio" name="date_creation_action" value="leave" checked="checked" /> {lang:leave}
-        <input type="radio" name="date_creation_action" value="unset" /> {lang:unset}
-        <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {lang: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>
-    {lang:target}
-    <label><input type="radio" name="target" value="all" /> {lang:all}</label>
-    <label><input type="radio" name="target" value="selection" checked="checked" /> {lang:selection}</label>
-  </p>
-
-    
-  <p><input type="submit" value="{L_SUBMIT}" name="submit" {TAG_INPUT_ENABLED}/></p>
-
-</fieldset>
-
-<fieldset>
-
-  <legend>{lang:Caddie management}</legend>
-
-  <ul style="list-style-type:none;">
-    <!-- BEGIN in_caddie -->
-    <li><label><input type="radio" name="caddie_action" value="empty_all" /> {lang:Empty caddie}</label></li>
-    <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {lang:Take selected elements out of caddie}</label></li>
-    <!-- END in_caddie -->
-
-    <!-- BEGIN not_in_caddie -->
-    <li><label><input type="radio" name="caddie_action" value="add_selected" /> {lang:Add selected elements to caddie}</label></li>
-    <!-- END not_in_caddie -->
-  
-  </ul>
-
-  <p><input type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
-
-</fieldset>
-
-</form>
diff --git a/template/admin/yoga/admin/group_list.tpl b/template/admin/yoga/admin/group_list.tpl
deleted file mode 100644
index 7e7b5f670..000000000
--- a/template/admin/yoga/admin/group_list.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- $Id: group_list.tpl 1129 2006-04-05 21:01:05Z plg $ -->
-<h2>{lang:title_groups}</h2>
-
-<form method="post" name="add_user" action="{F_ADD_ACTION}" class="properties">
-  <fieldset>
-    <legend>{lang:Add group}</legend>
-
-    <span class="property">
-      <label for="groupname">{lang:Group name}</label>
-    </span>
-    <input type="text" id="groupname" name="groupname" maxlength="50" size="20" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-
-    <p>
-      <input type="submit" name="submit_add" value="{lang:Add}" {TAG_INPUT_ENABLED}/>
-    </p>
-  </fieldset>
-</form>
-
-<table class="table2">
-  <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="{themeconf:icon_dir}/permissions.png" class="button" style="border:none" alt="permissions" title="{lang:permissions}" /></a>
-      <a href="{group.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none" alt="delete" title="{lang:delete}" {TAG_INPUT_ENABLED}/></a>
-    </td>
-  </tr>
-  <!-- END group -->
-</table>
diff --git a/template/admin/yoga/admin/intro.tpl b/template/admin/yoga/admin/intro.tpl
deleted file mode 100644
index d924978c0..000000000
--- a/template/admin/yoga/admin/intro.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- $Id: intro.tpl 861 2005-09-03 21:20:24Z plg $ -->
-<h2>{lang:title_default}</h2>
-
-<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 -->
-
-        <!-- BEGIN first_added -->
-        ({first_added.DB_DATE})
-        <!-- END first_added -->
-      </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>
-    </ul>
-  </dd>
-
-</dl>
diff --git a/template/admin/yoga/admin/maintenance.tpl b/template/admin/yoga/admin/maintenance.tpl
deleted file mode 100644
index 030b3782a..000000000
--- a/template/admin/yoga/admin/maintenance.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- $Id: maintenance.tpl 1111 2006-03-28 21:05:12Z rub $ -->
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:Maintenance}</h2>
-</div>
-
-<ul>
-  <li><a href="{U_MAINT_CATEGORIES}" {TAG_INPUT_ENABLED}>{lang:update categories informations}</a></li>
-  <li><a href="{U_MAINT_IMAGES}" {TAG_INPUT_ENABLED}>{lang:update images informations}</a></li>
-  <li><a href="{U_MAINT_HISTORY}" {TAG_INPUT_ENABLED}>{lang:purge history}</a></li>
-  <li><a href="{U_MAINT_SESSIONS}" {TAG_INPUT_ENABLED}>{lang:purge sessions}</a></li>
-  <li><a href="{U_MAINT_FEEDS}" {TAG_INPUT_ENABLED}>{lang:purge never used notification feeds}</a></li>
-  <li><a href="{U_MAINT_DATABASE}" {TAG_INPUT_ENABLED}>{lang:repair and optimize database}</a></li>
-</ul>
diff --git a/template/admin/yoga/admin/picture_modify.tpl b/template/admin/yoga/admin/picture_modify.tpl
deleted file mode 100644
index 14976fac1..000000000
--- a/template/admin/yoga/admin/picture_modify.tpl
+++ /dev/null
@@ -1,183 +0,0 @@
-<!-- $Id: picture_modify.tpl 1119 2006-04-02 22:26:19Z plg $ -->
-<h2>{lang:title_picmod}</h2>
-
-<img src="{TN_SRC}" alt="{lang:thumbnail}" class="thumbnail" />
-
-<ul class="categoryActions">
-  <!-- BEGIN jumpto -->
-  <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to}" /></a></li>
-  <!-- END jumpto -->
-  <li><a href="{U_SYNC}" title="{lang:synchronize metadata}" {TAG_INPUT_ENABLED}><img src="{themeconf:icon_dir}/sync_metadata.png" class="button" alt="{lang:synchronize}" /></a></li>
-</ul>
-
-<form action="{F_ACTION}" method="post" id="properties">
-
-  <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" /> {lang:unset}</label>
-          <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {lang: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:Tags}</strong></td>
-        <td>{TAG_SELECTION}</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" {TAG_INPUT_ENABLED}/>
-      <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;" {TAG_INPUT_ENABLED}/></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;" {TAG_INPUT_ENABLED}/></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;" {TAG_INPUT_ENABLED}/></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;" {TAG_INPUT_ENABLED}/></p>
-        </td>
-      </tr>
-    </table>
-
-  </fieldset>
-</form>
diff --git a/template/admin/yoga/admin/site_manager.tpl b/template/admin/yoga/admin/site_manager.tpl
deleted file mode 100644
index c82a82a12..000000000
--- a/template/admin/yoga/admin/site_manager.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- $Id: site_manager.tpl 1294 2006-04-29 15:40:44Z nikrou $ -->
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:Site manager}</h2>
-</div>
-
-<!-- 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_listing -->
-{lang:remote_site_local_found} {local_listing.URL}
-<!-- BEGIN create -->
-<form action="" method="post">
-  <p>
-    {lang:remote_site_local_create}:
-    <input type="hidden" name="no_check" value="1"/>
-    <input type="hidden" name="galleries_url" value="{local_listing.URL}" />
-    <input type="submit" name="submit" value="{lang:submit}"/>
-  </p>
-</form>
-<!-- END create -->
-<!-- BEGIN update -->
-<a href="{local_listing.update.U_SYNCHRONIZE}" title="{lang:remote_site_local_update}">{lang:site_synchronize}</a>
-<!-- END update -->
-<!-- END local_listing -->
-
-<!-- BEGIN sites -->
-<table border="1" cellpadding="0" cellspacing="0">
-  <!-- BEGIN site -->
-  <tr align="left"><td>
-    <a href="{sites.site.NAME}">{sites.site.NAME}</a><br>({sites.site.TYPE}, {sites.site.CATEGORIES} {lang:Categories}, {sites.site.IMAGES} {lang:picture}s)
-  </td><td>
-    [<a href="{sites.site.U_SYNCHRONIZE}" title="{lang:site_synchronize_hint}">{lang:site_synchronize}</a>]
-    <!-- BEGIN delete -->
-      [<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');"
-                title="{lang:site_delete_hint}">{lang:site_delete}</a>]
-    <!-- END delete -->
-    <!-- BEGIN remote -->
-      <br>
-      [<a href="{sites.site.remote.U_TEST}" title="{lang:remote_site_test_hint}">{lang:remote_site_test}</a>]
-      [<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}">{lang:remote_site_generate}</a>]
-      [<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}">{lang:remote_site_clean}</a>]
-    <!-- END remote -->
-  </td></tr>
-  <!-- END site -->
-</table>
-<!-- END sites -->
-
-<form action="{F_ACTION}" method="post">
-  <p>
-    <label for="galleries_url" >{lang:site_create}</label>
-    <input type="text" name="galleries_url" id="galleries_url" />
-  </p>
-  <p>
-    <input type="submit" name="submit" value="{lang:submit}" {TAG_INPUT_ENABLED} />
-  </p>
-</form>
diff --git a/template/admin/yoga/admin/stats.tpl b/template/admin/yoga/admin/stats.tpl
deleted file mode 100644
index 0798d299f..000000000
--- a/template/admin/yoga/admin/stats.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- $Id: stats.tpl 1339 2006-06-04 10:13:38Z chrisaga $ -->
-<h2>{lang:title_history}</h2>
-
-<h3>{L_STAT_TITLE}</h3>
-<img class="image" src="{IMG_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />
-
-<h3>{L_STAT_DETAIL_TITLE}</h3>
-<table class="table2" id="dailyStats">
-  <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 class="number">{statrow.PAGES}</td>
-    <td class="number">{statrow.VISITORS}</td>
-    <td class="number">{statrow.IMAGES}</td>
-  </tr>
-<!-- END statrow -->
-</table>
-
-<h3>{L_DATE_TITLE}</h3>
-<table class="table2" id="detailedStats">
-  <tr class="throw">
-    <th>{L_STAT_HOUR}</th>
-    <th>{L_STAT_LOGIN}</th>
-    <th>{L_STAT_ADDR}</th>
-    <th>{L_STAT_CATEGORY}</th>
-    <th>{L_STAT_FILE}</th>
-    <th>{L_STAT_PICTURE}</th> 
-  </tr>
-<!-- BEGIN detail -->
-  <tr class="{detail.T_CLASS}">
-    <td class="hour">{detail.HOUR}</td>
-    <td>{detail.LOGIN}</td>
-    <td>{detail.IP}</td>
-    <td>{detail.CATEGORY}</td>
-    <td>{detail.FILE}</td>
-    <td>{detail.PICTURE}</td>
-  </tr>
-<!-- END detail -->
-</table>
-
-<!-- BEGIN navigation -->
-<div class="admin">
-{navigation.NAV_BAR}
-</div>
-<!-- END navigation -->
diff --git a/template/admin/yoga/admin/thumbnail.tpl b/template/admin/yoga/admin/thumbnail.tpl
deleted file mode 100644
index 4e3ed3d19..000000000
--- a/template/admin/yoga/admin/thumbnail.tpl
+++ /dev/null
@@ -1,129 +0,0 @@
-<!-- $Id: thumbnail.tpl 1129 2006-04-05 21:01:05Z plg $ -->
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:title_thumbnails}</h2>
-</div>
-
-<!-- BEGIN results -->
-<div class="admin">{L_RESULTS}</div>
-<table style="width:100%;">
-  <tr class="throw">
-    <td>{L_PATH}</td>
-    <td>{L_THUMBNAIL}</td>
-    <td>{L_GENERATED}</td>
-    <td>{L_FILESIZE}</td>
-    <td>{L_WIDTH}</td>
-    <td>{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">
-    <td 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}" class="properties">
-
-  <fieldset>
-    <legend>{L_PARAMS}</legend>
-
-    <ul>
-      <li>
-        <span class="property">{L_GD}</span>
-	<label>
-          <input type="radio" name="gd" value="2" {params.GD2_CHECKED} />2.x
-        </label>
-        <label>
-          <input type="radio" name="gd" value="1" {params.GD1_CHECKED} />1.x
-        </label>
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="width">{lang:maximum width}</label>
-        </span>
-	<input type="text" id="width" name="width" value="{params.WIDTH_TN}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="height">{lang:maximum height}</label>
-        </span>
-	<input type="text" id="height" name="height" value="{params.HEIGHT_TN}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-      </li>
-
-      <li>
-        <span class="property">{lang:Number of thumbnails to create}</span>
-	<label><input type="radio" name="n" value="5"   {params.n_5_CHECKED} /> 5</label>
-	<label><input type="radio" name="n" value="10"  {params.n_10_CHECKED} /> 10</label>
-	<label><input type="radio" name="n" value="20"  {params.n_20_CHECKED} /> 20</label>
-	<label><input type="radio" name="n" value="all" {params.n_all_CHECKED} /> {L_ALL}</label>
-      </li>
-    </ul>
-  </fieldset>
-
-  <p><input type="submit" name="submit" value="{L_SUBMIT}" {TAG_INPUT_ENABLED}/></p>
-</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">
-    <td>&nbsp;</td>
-    <td style="width:60%;">{L_PATH}</td>
-    <td>{L_FILESIZE}</td>
-    <td>{L_WIDTH}</td>
-    <td>{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/admin/yoga/admin/waiting.tpl b/template/admin/yoga/admin/waiting.tpl
deleted file mode 100644
index 28b9de802..000000000
--- a/template/admin/yoga/admin/waiting.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- $Id: waiting.tpl 1294 2006-04-29 15:40:44Z nikrou $ -->
-<h2>{lang:title_waiting}</h2>
-
-<form action="{F_ACTION}" method="post" id="waiting">
-  <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 href="{picture.PREVIEW_URL_IMG}" title="{picture.FILE_TITLE}">{picture.FILE_IMG}</a>
-      </td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <!-- BEGIN thumbnail -->
-        <a href="{picture.thumbnail.PREVIEW_URL_TN_IMG}" title="{picture.thumbnail.FILE_TN_TITLE}">{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;">
-        <label><input type="radio" name="action-{picture.ID_IMG}" value="validate" /> {lang:Validate}</label>
-        <label><input type="radio" name="action-{picture.ID_IMG}" value="reject" /> {lang:Reject}</label>
-      </td>
-    </tr>
-    <!-- END picture -->
-  </table>
-
-  <p class="bottomButtons">
-    <input type="hidden" name="list" value="{LIST}" />
-    <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}/>
-    <input type="submit" name="validate-all" value="{lang:Validate All}" {TAG_INPUT_ENABLED}/>
-    <input type="submit" name="reject-all" value="{lang:Reject All}" {TAG_INPUT_ENABLED}/>
-    <input type="reset" value="{lang:Reset}" />
-  </p>
-
-</form>
diff --git a/template/admin/yoga/comments.tpl b/template/admin/yoga/comments.tpl
deleted file mode 100644
index 6184929fd..000000000
--- a/template/admin/yoga/comments.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- $Id: comments.tpl 960 2005-12-03 17:33:38Z chrisaga $ -->
-<div id="content">
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:User comments}</h2>
-  </div>
-
-<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>
-
-  <p><input type="submit" name="submit" value="{lang:Filter and display}"></p>
-
-</form>
-
-<div class="navigationBar">{NAVBAR}</div>
-
-<div id="comments">
-
-  <!-- BEGIN comment -->
-  <div class="comment">
-    <a class="illustration" href="{comment.U_PICTURE}"><img src="{comment.TN_SRC}" /></a>
-    <p class="commentHeader"><span class="author">{comment.AUTHOR}</span> - <span class="date">{comment.DATE}</span></p>
-    <blockquote>{comment.CONTENT}</blockquote>
-    <hr class="separation">
-  </div>
-
-  <!-- END comment -->
-
-</div>
-
-</div> <!-- content -->
diff --git a/template/admin/yoga/content.css b/template/admin/yoga/content.css
deleted file mode 100644
index 1b0a79188..000000000
--- a/template/admin/yoga/content.css
+++ /dev/null
@@ -1,329 +0,0 @@
-/* $Id: content.css 1341 2006-06-05 14:36:15Z chrisaga $ */
-#content {
-    margin-right: 1em;
-    margin-bottom: 1em; /* when it's longer than menu bar */
-}
-
-BODY#theCommentsPage #content,
-BODY#theRegisterPage #content,
-BODY#theIdentificationPage #content,
-BODY#theProfilePage #content,
-BODY#theSearchPage #content,
-BODY#theAboutPage #content,
-BODY#thePopuphelpPage #content,
-BODY#thePasswordPage #content,
-BODY#theNotificationPage #content,
-BODY#theTagsPage #content,
-BODY#theNBMPage #content
-{
-  margin: 1em;
-}
-
-#content H3 {
-    margin-bottom: 1ex;
-}
-
-#content H2 { margin-bottom: 3px;} /*<- for IE otherwise calendar select is displaced to middle of page*/
-
-#content H3 {
-    text-align: center;
-}
-
-/* Thumbnails customization */
-#content UL.thumbnails SPAN.thumbLegend {
-  font-size: 80%;		/* font size */
-  overflow: hidden;		/* oversized legend is clipped */
-}
-
-/* Thumbnail "elastic" layout */
-#content UL.thumbnails {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  text-align: center;	/* to center the whole collection in #content */
-}
-#content UL.thumbnails LI { display: inline }
-
-#content UL.thumbnails SPAN.wrap1 {
-  margin: 0 5px 5px 5px;
-  display: table-cell; display: inline-table; display: inline-block;
-  vertical-align: top;		/* OK with Opera and IE6 not Geko */
-  text-align: center;		/* to center the thumbnail and legend in Geko/Opera */
-}
-#content UL.thumbnails SPAN.wrap2 {
-  margin: 0;			/* important reset the margins */
-  display: table-cell;		/* block prevents vertical-align here */
-  vertical-align: middle;	/* Ok with Opera and Geko not IE6 */
-}
-#content UL.thumbnails SPAN.wrap2 A,
-#content UL.thumbnails SPAN.wrap2 LABEL {
-  display: block;
-  border-bottom: none;
-}
-#content UL.thumbnails IMG {
-  margin-bottom: -4px;  /* why ??? something wrong with Geko and Opera ignored by IE6*/
-}
-
-/* label and input used for caddie in admin section */
-#content UL.thumbnails SPAN.wrap2 LABEL {
-  position: relative;
-}
-:root #content UL.thumbnails SPAN.wrap2 INPUT { /* hide from Opera */
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-
-/* fix IE with another layout */
-* html #content UL.thumbnails SPAN.wrap2 {
-  display: block;
-  position: relative;
-  text-align: left;
-}
-* html #content UL.thumbnails SPAN.wrap2 A,
-* html #content UL.thumbnails SPAN.wrap2 LABEL {
-  overflow: visible;
-  position: absolute;
-  top: 50%;
-  text-align: center;
-}
-* html #content UL.thumbnails IMG.thumbnail {
-  position: relative;
-  top: -50%;
-  /*\*//*/
-    margin-top: -40%;
-  /**/
-}
-* html #content UL.thumbnails SPAN.wrap2 input {
-  position: absolute;
-  left: 0;
-  top: -50%;  /* same as other browsers but not so pretty */
-}
-
-#content .navigationBar, #content .additional_info {
-    margin: 10px 0;
-    text-align: center;
-}
-
-#content .pageNumberSelected {
-    font-style: italic;
-}
-
-#content .additional_info {
-    font-size: 110%;
-}
-
-#content FORM {
-    text-align: left;
-}
-
-/* content defaults */
-#content DL, DD { margin: 10px; }
-#content DT {
-  margin-bottom: 5px;
-  font-style: italic;
-  font-size: 110%;
-}
-
-/* actions */
-UL.categoryActions {
-  margin: 0 2px;
-  width: auto;
-  padding: 0;
-  text-indent: 0;
-  list-style: none;
-  text-align: center;
-}
-
-#content DIV.titrePage UL.categoryActions {
-  float: right;
-  text-align: center;
-}
-
-#content DIV.titrePage {
-  padding: 0 0 3px;
-}
-
-#content UL.categoryActions LI {
-  display: inline;
-}
-
-#content UL.categoryActions A IMG, UL.categoryActions A {
-  border: none;
-  margin-bottom: -5px;
-}
-
-/* User comments */
-
-#content DIV#comments {
-  padding-left: 5px;
-  padding-right: 5px;
-  -moz-box-sizing: padding-box;
-}
-#content DIV.comment {
-  margin: 0 0 0.5em 0;
-  padding: 0;
-  overflow: hidden; /* these 2 lines ensure the floating child is kept in the DIV */
-  width: 100%;	    /* don't ask why. It's a very usefull trick                   */
-}
-
-#content DIV.comment A.illustration {
-  display: block;
-  float: left;
-  margin: 0.5em 0 0 0.5em;
-}
-
-#content DIV.comment P.commentHeader {
-  text-align: right;
-  margin: 0.5em 0.5em 0 0;
-}
-
-#content DIV.comment UL.actions {
-  text-align: center;
-  margin: 0.2em;
-}
-
-#content DIV.comment BLOCKQUOTE {
-  margin-top: 1em;
-  margin-right: 0.5em;
-  margin-bottom: 150px;
-  padding: 0.5em;
-}
-
-/* should be in admin.css ? CSS properties also used in popuphelp */
-
-SPAN.pwgScreen {
-  border-bottom: 1px dotted black;
-}
-
-SPAN.filename:before {
-  content: "[";
-}
-
-SPAN.filename:after {
-  content: "]";
-}
-
-/* begin chronology/calendar elements*/
-#content DIV.calendarViews {
-  display: block;
-  float: right;
-  margin: 2px 0 0;
-}
-
-#content DIV.calendarBar { margin: 8px 4px; }
-
-SPAN.calItem, SPAN.calItemEmpty {
-  font-weight: bold;
-  margin: 0 1px;
-}
-
-SPAN.calItem A { border:0 }
-
-#content DIV.calendarCalBar {
-  margin: 10px 10px;
-  text-align: left;
-}
-
-SPAN.calCalHead {
-  font-weight: bold;
-  font-size: 110%;
-  margin: 0 2px;
-}
-
-SPAN.calCal { margin: 0 2px; }
-
-/* nice looking month calendar*/
-TABLE.calMonth {
-  border: none;
-  border-collapse: collapse;
-  margin-bottom: 10px;	/*<-IE ignores this */
-}
-
-TD.calDayCellFull, TD.calDayCellEmpty, TD.calDayCellBlank {
-  text-align:left;
-  vertical-align: top;
-  font: bold 18px Arial, Helvetica, sans-serif;
-}
-
-TD.calDayHead { font: bold 12px Arial, Helvetica, sans-serif; }
-
-DIV.calImg {
-  overflow: hidden;
-  vertical-align: bottom;
-  z-index: 1;
-  position: relative; /*<- this required by IE*/
-}
-
-.calImg img {
-  position: relative;
-  border: 0;
-}
-
-.calBackDate {
-  padding-left: 4px;
-  padding-top: 0px;
-  z-index: 2;
-  position: absolute;
-  text-align: left;
-  vertical-align: top;
-}
-
-.calForeDate {
-  padding-left: 5px;
-  padding-top: 1px;
-  z-index: 3;
-  position: absolute;
-  text-align: left;
-  vertical-align: top;
-}
-
-/* Category thumbnails on main page, CSS code inspired from MOD subcatify */
-#content UL.thumbnailCategories {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  text-align: center;
-  overflow: hidden;
-  width: 100%;
-}
-
-* html #content UL.thumbnailCategories {
-  width: 99%; /* buggy IE box model */
-}
-
-#content UL.thumbnailCategories LI {
-  margin:0;
-  padding:0;
-  float:left;
-}
-
-#content DIV.thumbnailCategory {
-  display:block;
-  padding: 2px 0px 0px 2px;
-  margin: 5px;
-}
-
-#content DIV.thumbnailCategory DIV.description {
-  font-size: 90%;
-  overflow: auto;
-  /*width: inherit;*/
-}
-
-#content DIV.thumbnailCategory DIV.description H3 {
-  text-align: left;
-  background: transparent;
-  margin: 0;
-  padding: 0.1em;
-  font-size: 120%;
-}
-
-#content DIV.thumbnailCategory DIV.description P {
-  margin: 0;
-}
-
-#content DIV.thumbnailCategory DIV.illustration {
-  text-align: left;
-  margin: 2px 0 0 2px;
-  float: left;
-}
diff --git a/template/admin/yoga/default-colors.css b/template/admin/yoga/default-colors.css
deleted file mode 100644
index 12e78116d..000000000
--- a/template/admin/yoga/default-colors.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $Id: default-colors.css 1261 2006-04-22 20:00:43Z chrisaga $ */
-
-/* others */
-.pleaseNote {
-    background: #9c9c9c;
-    color: #ffff99;
-    padding: 1ex;
-    font-weight: bold;
-}
-
-#imageToolBar * {
-    background: inherit;
-}
-
-/* So that non-links are slightly greyed out */
-#content .navigationBar {
-    color: #696969;
-}
-#content .pageNumberSelected {
-    color: #000000;
-}
-
-/* Tables & forms */
-INPUT, SELECT, TEXTAREA {
-	color:black;
-}
-INPUT, SELECT, TEXTAREA, FORM .nofocus {
-	background-color: #d3d3d3;	/* lightgrey */
-}
-FORM .focus {
-  background-color: #f5f5f5;		/* whitesmoke */
-}
-INPUT[type="radio"] {	/* for Opera */
-  border: none;
-  background-color: transparent;
-}
-
-.errors { /* Errors display */
-  color: red;
-  background-color: #ffe1e1;
-  font-weight: bold;
-  text-align: left;
-  margin: 5px;
-  border: 1px solid red;
-  background-image: url(icon/admin/errors.png);
-  background-repeat: no-repeat;
-  background-position: top right;
-  padding: 10px 50px 10px 10px;
-}
-
-.errors UL LI
-{
-  font-weight: normal;
-}
-
-/**
- * Informations box in administration
- */
-.infos {
-  text-align: left;
-  background-color: palegreen;
-  background-image: url(icon/admin/infos.png);
-  background-repeat: no-repeat;
-  background-position: top right;
-  color: darkgreen;
-  font-weight: bold;
-  margin: 5px;
-  padding: 10px 50px 10px 10px;
-}
-
-LEGEND {
-  font-style: italic;
-}
diff --git a/template/admin/yoga/default-layout.css b/template/admin/yoga/default-layout.css
deleted file mode 100644
index 349fa8469..000000000
--- a/template/admin/yoga/default-layout.css
+++ /dev/null
@@ -1,325 +0,0 @@
-/* $Id: default-layout.css 1356 2006-06-15 20:49:39Z nikrou $ */
-
-BODY {
-    margin: 5px;
-    padding: 0;
-    font-size: 0.8em;
-    font-family: Bitsream Vera Sans, Helvetica, Arial, sans-serif;
-    text-align: center; /* be nice to IE5 */
-}
-
-#the_page {
-    /* Just in case another template needs an inner frame */
-}
-
-H1 {
-    text-align: center;
-    font-size: 150%;
-    font-weight: bold;
-    padding: 0; margin: 1ex 0 2ex 0;
-}
-
-H2 {
-    margin: 0;
-    padding: 5px 5px 5px 5px;
-    text-align: left;
-    font-size: 120%;
-}
-
-A {
-    text-decoration:none;
-    border-bottom: 1px dotted #005e89;
-}
-A:hover {
-    border-bottom: 1px solid #858460;
-}
-
-IMG {
-    border: none;
-}
-
-HR.separation {
-  visibility: hidden;
-  clear: both;
-}
-
-#copyright {
-    clear: both;
-    font-size: 83%;
-    text-align: center;
-    margin: 0 0 10px 0;
-}
-
-/** General defaults **/
-INPUT {margin: 0;}
-UL, DL, LI { text-align: left;}
-TABLE {			/* horizontaly centered */
-  margin-left: auto;
-  margin-right: auto;
-}
-/* for debugging purpose */
-PRE { text-align:left; }
-
-/** forms **/
-
-FORM { padding: 0em; }
-
-FORM P {
-	text-align: center;
-	margin-top: 2em;
-	margin-bottom: 2em;
-}
-.small {
-	font-size: 80%;
-}
-
-TEXTAREA.description {
-  height: 100px;
-  width: 500px;
-  overflow: auto;
-}
-SELECT.categoryList {
-  width: 100%;
-}
-
-/** go to an admin.css ? **/
-
-TABLE.table2 {
-  border: 1px solid black;
-  margin: 1em auto;
-  padding: 0;
-}
-
-TABLE.table2 TD, TABLE.table2 TH {
-  padding: 0 1em;
-}
-
-TABLE.table2 TR {
-  text-align: left;
-}
-
-TABLE.table2 TR.throw {
-  text-align: center;
-}
-
-.hour {
-  white-space: pre;
-}
-
-.number {
-  text-align: right;
-}
-  
-TABLE#dailyStats {
-  width: 60%;
-}
-
-TABLE#detailedStats {
-  width: 80%;
-}
-
-FORM#add_virtual P { text-align: left; }
-FORM#categoryOrdering, FORM#addVirtual {
-  padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
-  padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
-}
-FORM#categoryOrdering p {
-	text-align: left;
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-UL.categoryUl {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-LI.categoryLi {
-  border: 1px solid gray;
-  padding: 0px 5px;
-  margin-bottom: 5px;
-}
-
-FORM#categoryOrdering UL.categoryActions {
-  float: right;
-  margin-top: 5px;
-}
-
-FORM#cat_modify TABLE { width: auto; }
-
-/**
- * Filter forms are displayed label by label with the input (or select...)
- * below the label. Use an UL to make a group (radiobox for instance).
- * Use a SPAN to group objects in line
- */
-FIELDSET {
-  padding: 1em;
-  margin: 1em;
-  overflow: hidden; /* <- makes Opera happy */
-}
-
-FORM.filter FIELDSET UL {
-  margin: 0;
-}
-FORM.filter FIELDSET UL,
-FORM.filter FIELDSET LABEL {
-  display: block;
-  float: left;
-  margin-right: 1em;
-  padding: 0;
-}
-
-FORM.filter FIELDSET LI {
-  list-style: none;
-  margin-bottom: 0.5em;
-}
-
-FORM.filter FIELDSET LI LABEL {
-  display: inline;
-  float: none;
-}
-
-FORM.filter FIELDSET UL.tagSelection LABEL {
-  display: inline;
-  float: none;
-  margin-right:0.5em;/*reduce from above*/
-}
-
-/* cannot use FIELDSET>LABEL because of IE<=6 */
-FORM.filter FIELDSET LABEL INPUT,
-FORM.filter FIELDSET LABEL SELECT,
-FORM.filter FIELDSET LABEL SPAN,
-FORM.filter FIELDSET LABEL TEXTAREA {
-  display: block;
-  margin: 0.5em 0;
-}
-FORM.filter FIELDSET * LABEL INPUT,
-FORM.filter FIELDSET * LABEL SELECT,
-FORM.filter FIELDSET * LABEL TEXTAREA,
-FORM.filter FIELDSET LABEL SPAN INPUT,
-FORM.filter FIELDSET LABEL SPAN SELECT,
-FORM.filter FIELDSET LABEL SPAN TEXTAREA {
-  display: inline;
-  vertical-align: top;
-  margin: 0 0.5em 0 0;
-}
-
-FORM.filter FIELDSET UL.tagSelection LI LABEL INPUT {
-  margin-right:0;
-}
-
-/* following declaration is important to avoid strange FF behaviour */
-FORM.filter FIELDSET LABEL SPAN SELECT {
-  margin: 0;
-}
-
-FORM.filter FIELDSET P
-{
-  clear: left;
-  display: block;
-}
-
-FORM.filter INPUT[type="submit"] {
-  margin-top: 1em;
-}
-
-FORM.properties UL, FORM#update UL {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}
-
-FORM.properties LI, FORM#update UL  {
-  margin-bottom: 0.5em;
-  padding: 0;
-  line-height: 1.8em;
-}
-
-FORM.properties SPAN.property {
-  font-weight: bold;
-  float: left;
-  width: 50%;
-  text-align: right;
-  margin: 0;
-  padding: 0 0.5em 0 0;
-}
-
-FIELDSET.elementEdit A {
-  display: block;
-  float: right;
-}
-
-TABLE.doubleSelect {
-  text-align: center;
-  margin: 0 auto;
-  width: 100%;
-}
-
-TABLE.doubleSelect TD {
-  padding: 0 5px;
-  width: 50%;
-}
-
-FORM#categoryPermissions LI {
-  display:inline;
-  white-space: nowrap;
-}
-
-#theHeader H1 {
-  margin-bottom: 0.5em;
-}
-
-#theHeader P {
-  margin-top: 0;
-  padding: 0;
-}
-
-BODY#theAdminPage #theHeader P {
-  display: none;
-}
-
-BODY#thePopuphelpPage #copyright {
-  color: green;
-  display: none;
-}
-
-FORM#addComment FIELDSET LABEL {
-  clear: both;
-}
-
-FORM#addComment FIELDSET INPUT[type="hidden"] {
-  display: none;
-}
-
-/* button tools */
-UL.actions {
-  text-indent: 0;
-  list-style: none;
-}
-UL.actions  LI {
-  display: inline;
-}
-UL.actions  A {
-  border: none;
-}
-
-UL.tagSelection {
-  width: 40em;
-  margin: 1em 0 1em 0;
-  padding: 0;
-}
-
-UL.tagSelection LI {
-  display: inline;
-  white-space: nowrap;
-}
-
-#fullTagCloud { font-size: 140%; }
-
-#fullTagCloud LI { display: inline; }
-
-.tagLevel5 { font-size: 150%; }
-.tagLevel4 { font-size: 140%; }
-.tagLevel3 { font-size: 120%; }
-.tagLevel2 { font-size: 100%; }
-.tagLevel1 { font-size: 90%; }
diff --git a/template/admin/yoga/fix-ie5-ie6.css b/template/admin/yoga/fix-ie5-ie6.css
deleted file mode 100644
index 894567120..000000000
--- a/template/admin/yoga/fix-ie5-ie6.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $Id: fix-ie5-ie6.css 1328 2006-05-30 19:00:17Z chrisaga $ */
-/* Issues in IE from 5 to 6 only to to be used with IE7                       */
-
-/* fix lack of :hover behaviour for non link objects */
-BODY {
-  behavior:url("template-common/csshover.htc");
-}
-
-/* to avoid vanishing objects in IE6 */
-H1, #theHeader {
-  width: 100%;	/* <- useless but seems to make IE6 happy */
-}
-#content {
-  height: 1em; /* for IE6 it's like min-height */
-}
-
-/* to get less hugly checkboxes at least in tagSelection */
-UL.tagSelection LI INPUT,
-#content UL.thumbnails SPAN.wrap2 input {
-  border: none;
-  background-color: transparent;
-}
diff --git a/template/admin/yoga/fix-khtml.css b/template/admin/yoga/fix-khtml.css
deleted file mode 100644
index 1df7bfcad..000000000
--- a/template/admin/yoga/fix-khtml.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $Id: fix-khtml.css 1180 2006-04-15 09:53:11Z chrisaga $ */
-/* Issue in Safari/Konqueror only                                                 */
-/* If H2 has a 0 margin-top categoryActions doesn't float right but overwrites H2 */
-#content>DIV.titrePage>H2 {
-    margin: 1px 0 0 0;	/* add an arbitrary margin-top */
-}
-
-#content>div.titrePage {
-    position: relative;
-    top: -1px;		/* move the container up by the same amount */
-    margin-bottom: 5px; 
-}
-/* end Safari/Konqueror */
-
diff --git a/template/admin/yoga/identification.tpl b/template/admin/yoga/identification.tpl
deleted file mode 100644
index a882405dd..000000000
--- a/template/admin/yoga/identification.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- $Id: identification.tpl 1143 2006-04-09 14:50:14Z nikrou $ -->
-<div id="content">
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
-      <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
-      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:Identification}</h2>
-  </div>
-
-  <!-- BEGIN errors -->
-  <div class="errors">
-    <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
-    </ul>
-  </div>
-  <!-- END errors -->
-
-<form action="{F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
-  <fieldset>
-    <legend>{lang:Connection settings}</legend>
-
-    <input type="hidden" name="redirect" value="{U_REDIRECT}">
-
-    <ul>
-      <li>
-        <span class="property">
-          <label for="username">{L_USERNAME}</label>
-        </span>
-        <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" value="{USERNAME}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="password">{L_PASSWORD}</label>
-        </span>
-        <input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
-      </li>
-
-      <!-- BEGIN remember_me -->
-      <li>
-        <span class="property">
-          <label for="remember_me">{L_REMEMBER_ME}</label>
-        </span>
-        <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
-      </li>
-      <!-- END remember_me -->
-    </ul>
-  </fieldset>
-
-  <p><input tabindex="4" type="submit" name="login" value="{L_LOGIN}"></p>
-</form>
-
-<script type="text/javascript"><!--
-document.login_form.username.focus();
-//--></script>
-
-  <p>
-    <a href="{U_REGISTER}"><img src="{themeconf:icon_dir}/register.png" class="button" alt=""> {L_REGISTER}</a>
-    <a href="{U_LOST_PASSWORD}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt=""> {lang:Forgot your password?}</a>
-  </p>
-
-</div> <!-- content -->
diff --git a/template/admin/yoga/index.tpl b/template/admin/yoga/index.tpl
deleted file mode 100644
index 32c648495..000000000
--- a/template/admin/yoga/index.tpl
+++ /dev/null
@@ -1,247 +0,0 @@
-<!-- $Id: index.tpl 1135 2006-04-08 19:42:11Z rvelices $ -->
-<div id="menubar">
-<!-- BEGIN links -->
-<dl>
-  <dt>{lang:Links}</dt>
-  <dd>
-    <ul>
-      <!-- BEGIN link -->
-      <li><a href="{links.link.URL}">{links.link.LABEL}</a></li>
-      <!-- END link -->
-    </ul>
-  </dd>
-</dl>
-<!-- END links -->
-<dl>
-  <dt><a href="{U_HOME}">{lang:Categories}</a></dt>
-  <dd>
-    {MENU_CATEGORIES_CONTENT}
-    <p class="totalImages">{NB_PICTURE} {lang:total}</p>
-  </dd>
-</dl>
-
-<!-- BEGIN tags -->
-<dl>
-  <dt>{lang:Related tags}</dt>
-  <dd>
-    <ul id="menuTagCloud">
-      <!-- BEGIN tag -->
-      <li>
-        <a href="{tags.tag.URL_ADD}" title="{tags.tag.TITLE_ADD}"><img src="{pwg_root}{themeconf:icon_dir}/add_tag.png" alt="+"></a>
-        <a href="{tags.tag.URL}" class="{tags.tag.CLASS}" title="{tags.tag.TITLE}">{tags.tag.NAME}</a>
-      </li>
-      <!-- END tag -->
-    </ul>
-  </dd>
-</dl>
-<!-- END tags -->
-
-<dl>
-  <dt>{lang:special_categories}</dt>
-  <dd>
-    <ul>
-      <!-- BEGIN special_cat -->
-      <li><a href="{special_cat.URL}" title="{special_cat.TITLE}">{special_cat.NAME}</a></li>
-      <!-- END special_cat -->
-    </ul>
-  </dd>
-</dl>
-<dl>
-  <dt>{lang:title_menu}</dt>
-  <dd>
-    <ul>
-      <!-- BEGIN summary -->
-      <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
-      <!-- END summary -->
-      <!-- BEGIN upload -->
-      <li><a href="{upload.U_UPLOAD}">{lang:upload_picture}</a></li>
-      <!-- END upload -->
-    </ul>
-  </dd>
-</dl>
-<dl>
-  <dt>{lang:identification}</dt>
-  <dd>
-    <!-- BEGIN hello -->
-    <p>{lang:hello}&nbsp;{USERNAME}&nbsp;!</p>
-    <!-- END hello -->
-    <ul>
-      <!-- BEGIN register -->
-      <li><a href="{U_REGISTER}" rel="nofollow">{lang:ident_register}</a></li>
-      <!-- END register -->
-      <!-- BEGIN login -->
-      <li><a href="{F_IDENTIFY}" rel="nofollow">{lang:Connection}</a></li>
-      <!-- END login -->
-      <!-- BEGIN logout -->
-      <li><a href="{U_LOGOUT}">{lang:logout}</a></li>
-      <!-- END logout -->
-      <!-- BEGIN profile -->
-      <li><a href="{U_PROFILE}" title="{lang:hint_customize}">{lang:customize}</a></li>
-      <!-- END profile -->
-      <!-- BEGIN admin -->
-      <li><a href="{U_ADMIN}" title="{lang:hint_admin}">{lang:admin}</a></li>
-      <!-- END admin -->
-    </ul>
-    <!-- BEGIN quickconnect -->
-    <form method="post" action="{F_IDENTIFY}" class="filter" id="quickconnect">
-      <fieldset>
-        <legend>{lang:Quick connect}</legend>
-
-        <label>
-          {lang:Username}
-          <input type="text" name="username" size="15" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-        </label>
-
-        <label>
-          {lang:password}
-          <input type="password" name="password" size="15" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-        </label>
-
-        <!-- BEGIN remember_me -->
-        <label>
-          {lang:remember_me}
-          <input type="checkbox" name="remember_me" value="1">
-        </label>
-        <!-- END remember_me -->
-
-        <p>
-         <input type="submit" name="login" value="{lang:submit}">
-        </p>
-    <ul class="actions">
-      <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
-      <li><a href="{U_REGISTER}" title="{lang:Create a new account}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
-    </ul>
-
-      </fieldset>
-    </form>
-    <!-- END quickconnect -->
-
-  </dd>
-</dl>
-</div> <!-- menubar -->
-
-<div id="content">
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li>&nbsp;</li>
-      <!-- BEGIN preferred_image_order -->
-      <li>
-      {lang:Sort order}:
-      <select onchange="document.location = this.options[this.selectedIndex].value;">
-        <!-- BEGIN order -->
-        <option value="{preferred_image_order.order.URL}" {preferred_image_order.order.SELECTED_OPTION}>{preferred_image_order.order.DISPLAY}</option>
-        <!-- END order -->
-      </select>
-      </li>
-      <!-- END preferred_image_order -->
-
-      <!-- BEGIN caddie -->
-      <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{pwg_root}{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"/></a></li>
-      <!-- END caddie -->
-
-      <!-- BEGIN edit -->
-      <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="{pwg_root}{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
-      <!-- END edit -->
-
-      <!-- BEGIN search_rules -->
-      <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}"><img src="{pwg_root}{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
-      <!-- END search_rules -->
-
-      <!-- BEGIN mode_normal -->
-      <li><a href="{mode_normal.URL}" title="{lang:mode_normal_hint}"><img src="{pwg_root}{themeconf:icon_dir}/normal_mode.png" class="button" alt="{lang:mode_normal_hint}"></a></li>
-      <!-- END mode_normal -->
-      <!-- BEGIN mode_posted -->
-      <li><a href="{mode_posted.URL}" title="{lang:mode_posted_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:mode_posted_hint}"></a></li>
-      <!-- END mode_posted -->
-      <!-- BEGIN mode_created -->
-      <li><a href="{mode_created.URL}" title="{lang:mode_created_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar_created.png" class="button" alt="{lang:mode_created_hint}"></a></li>
-      <!-- END mode_created -->
-    </ul>
-
-  <h2>{TITLE}</h2>
-  <!-- BEGIN calendar -->
-  <!-- BEGIN views -->
-  <div class="calendarViews">{lang:calendar_view}:
-    <select onchange="document.location = this.options[this.selectedIndex].value;">
-    <!-- BEGIN view -->
-      <option value="{calendar.views.view.VALUE}" {calendar.views.view.SELECTED}>{calendar.views.view.CONTENT}</option>
-    <!-- END view -->
-    </select>
-  </div>
-  <!-- END views -->
-  <!-- END calendar -->
-
-  <!-- BEGIN calendar -->
-  <h2>{calendar.TITLE}
-</h2>
-  <!-- END calendar -->
-
-  </div> <!-- titrePage -->
-
-<!-- BEGIN calendar -->
-<!-- BEGIN navbar -->
-<div class="calendarBar">
-<!-- BEGIN prev -->
-	<div style="float:left">&laquo; <a href="{calendar.navbar.prev.URL}">{calendar.navbar.prev.LABEL}</a></div>
-<!-- END prev -->
-<!-- BEGIN next -->
-	<div style="float:right"><a href="{calendar.navbar.next.URL}">{calendar.navbar.next.LABEL}</a> &raquo;</div>
-<!-- END next -->
-	{calendar.navbar.BAR}&nbsp;
-</div>
-<!-- END navbar -->
-
-<!-- BEGIN calbar -->
-<div class="calendarCalBar">{calendar.calbar.BAR}</div>
-<!-- END calbar -->
-<!-- END calendar -->
-
-{MONTH_CALENDAR}
-
-<!-- BEGIN thumbnails -->
-<ul class="thumbnails">
-  <!-- BEGIN line -->
-  <!-- BEGIN thumbnail -->
-  <li class="{thumbnails.line.thumbnail.CLASS}">
-    <span class="wrap1">
-      <span class="wrap2">
-        <a href="{thumbnails.line.thumbnail.U_IMG_LINK}">
-            <img class="thumbnail" src="{thumbnails.line.thumbnail.IMAGE}"
-	    alt="{thumbnails.line.thumbnail.IMAGE_ALT}"
-	    title="{thumbnails.line.thumbnail.IMAGE_TITLE}">
-        </a>
-      </span>
-      <span class="thumbLegend">
-      <!-- BEGIN element_name -->
-      {thumbnails.line.thumbnail.element_name.NAME}
-      <!-- END element_name -->
-      <!-- BEGIN category_name -->
-      [{thumbnails.line.thumbnail.category_name.NAME}]
-      <!-- END category_name -->
-      {thumbnails.line.thumbnail.IMAGE_TS}
-      <!-- BEGIN nb_comments -->
-      <br />{thumbnails.line.thumbnail.nb_comments.NB_COMMENTS} {lang:comments}
-      <!-- END nb_comments -->
-      </span>
-    </span>
-  </li>
-  <!-- END thumbnail -->
-  <!-- END line -->
-
-</ul>
-<!-- END thumbnails -->
-
-{CATEGORIES}
-
-<!-- BEGIN cat_infos -->
-<!-- BEGIN navigation -->
-<div class="navigationBar">
-{cat_infos.navigation.NAV_BAR}
-</div>
-<!-- END navigation -->
-<!-- BEGIN comment -->
-<div class="additional_info">{cat_infos.comment.COMMENTS}</div>
-<!-- END comment -->
-<!-- END cat_infos -->
-
-</div> <!-- content -->
diff --git a/template/admin/yoga/layout.css b/template/admin/yoga/layout.css
deleted file mode 100644
index 1f6c6f4e3..000000000
--- a/template/admin/yoga/layout.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $Id: layout.css 1131 2006-04-06 02:23:54Z rvelices $ */
-
-/* template css */
-@import "menubar.css";
-@import "content.css";
-@import "image.css";
-@import "popuphelp.css";
-@import "default-layout.css";
-/* Override properties with import local file */
-@import "local-layout.css";
-/* common css */
-@import "../../../template-common/layout.css";
-
diff --git a/template/admin/yoga/mainpage_categories.tpl b/template/admin/yoga/mainpage_categories.tpl
deleted file mode 100644
index 9cc6bae9e..000000000
--- a/template/admin/yoga/mainpage_categories.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- BEGIN categories -->
-<!-- $Id: mainpage_categories.tpl 1292 2006-04-29 11:04:43Z chrisaga $ -->
-<ul class="thumbnailCategories">
-  <!-- BEGIN category -->
-  <li>
-    <div class="thumbnailCategory">
-      <div class="illustration">
-        <a href="{categories.category.URL}">
-          <img src="{categories.category.SRC}"
-               alt="{categories.category.ALT}"
-             title="{categories.category.TITLE}">
-        </a>
-      </div>
-      <div class="description">
-        <h3>
-          <a href="{categories.category.URL}">{categories.category.NAME}</a>
-          {categories.category.ICON}
-        </h3>
-        <p>{categories.category.CAPTION_NB_IMAGES}</p>
-        <p>{categories.category.DESCRIPTION}</p>
-      </div>
-    </div>
-  </li>
-  <!-- END category -->
-</ul>
-<!-- END categories -->
diff --git a/template/admin/yoga/month_calendar.tpl b/template/admin/yoga/month_calendar.tpl
deleted file mode 100644
index fa29fdb66..000000000
--- a/template/admin/yoga/month_calendar.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- BEGIN calendar -->
-<!-- $Id: month_calendar.tpl 1352 2006-06-14 00:39:45Z rvelices $ -->
-<!-- BEGIN thumbnails -->
-<table class="calMonth">
-<!-- BEGIN head -->
- <thead><tr>
- <!-- BEGIN col -->
-   <td class="calDayHead">{calendar.thumbnails.head.col.LABEL}</td>
- <!-- END col -->
- </tr></thead>
-<!-- END head -->
-<!-- BEGIN row -->
- <tr>
- <!-- BEGIN col -->
- <!-- BEGIN blank -->
- <td class="calDayCellBlank" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;">
- <!-- END blank -->
- <!-- BEGIN empty -->
- <td class="calDayCellEmpty" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;">{calendar.thumbnails.row.col.empty.LABEL}
- <!-- END empty -->
- <!-- BEGIN full -->
- <td class="calDayCellFull"><div class="calBackDate">{calendar.thumbnails.row.col.full.LABEL}</div><div class="calForeDate">{calendar.thumbnails.row.col.full.LABEL}</div>
-	<div class="calImg" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;"><a href="{calendar.thumbnails.row.col.full.U_IMG_LINK}">
-	  <img style="{calendar.thumbnails.row.col.full.STYLE}" {calendar.thumbnails.row.col.full.IMG_WIDTH} {calendar.thumbnails.row.col.full.IMG_HEIGHT}
-	       src="{calendar.thumbnails.row.col.full.IMAGE}" alt="{calendar.thumbnails.row.col.full.IMAGE_ALT}"
-	    title="{calendar.thumbnails.row.col.full.IMAGE_ALT}">
-	</a></div>
- <!-- END full -->
- </td>
- <!-- END col -->
- </tr>
-<!-- END row -->
-</table>
-<!-- END thumbnails -->
-<!-- END calendar -->
diff --git a/template/admin/yoga/password.tpl b/template/admin/yoga/password.tpl
deleted file mode 100644
index becd14457..000000000
--- a/template/admin/yoga/password.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- $Id: password.tpl 1129 2006-04-05 21:01:05Z plg $ -->
-<div id="content">
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:Password forgotten}</h2>
-  </div>
-
-  <!-- BEGIN errors -->
-  <div class="errors">
-    <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
-    </ul>
-  </div>
-  <!-- END errors -->
-
-  <!-- BEGIN infos -->
-  <div class="infos">
-    <ul>
-      <!-- BEGIN info -->
-      <li>{infos.info.INFO}</li>
-      <!-- END info -->
-    </ul>
-  </div>
-  <!-- END infos -->
-
-<form action="{F_ACTION}" method="post" class="properties">
-  <fieldset>
-    <legend>{lang:Retrieve password}</legend>
-
-    <ul>
-      <li>
-        <span class="property">
-          <label for="mail_address">{lang:Email address}</label>
-        </span>
-        <input class="login" type="text" name="mail_address" id="mail_address" size="40" maxlength="40" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="no_mail_address">{lang:No email address}</label>
-        </span>
-        <input type="checkbox" id="no_mail_address" name="no_mail_address" value="1">
-      </li>
-    </ul>
-  </fieldset>
-
-  <p><input type="submit" name="submit" value="{lang:Send new password}"></p>
-</form>
-
-</div> <!-- content -->
diff --git a/template/admin/yoga/search.tpl b/template/admin/yoga/search.tpl
deleted file mode 100644
index 14df38718..000000000
--- a/template/admin/yoga/search.tpl
+++ /dev/null
@@ -1,138 +0,0 @@
-<!-- $Id: search.tpl 1337 2006-06-03 16:29:30Z chrisaga $ -->
-<div id="content">
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-      <li><a href="{U_HOME}" title="{lang:return to homepage}" rel="home"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:Search}</h2>
-  </div>
-
-<form class="filter" method="post" name="search" action="{S_SEARCH_ACTION}">
-<!-- BEGIN errors -->
-<div class="errors">
-  <ul>
-    <!-- BEGIN error -->
-    <li>{errors.error.ERROR}</li>
-    <!-- END error -->
-  </ul>
-</div>
-<!-- END errors -->
-<fieldset>
-  <legend>{lang:Filter}</legend>
-  <label>{lang:search_keywords}
-    <input type="text" style="width: 300px" name="search_allwords" size="30"  onfocus="this.className='focus';" onblur="this.className='nofocus';"/>
-  </label>
-  <ul>
-    <li><label>
-      <input type="radio" name="mode" value="AND" checked="checked" />{lang:search_mode_and}
-    </label></li>
-    <li><label>
-      <input type="radio" name="mode" value="OR" />{lang:search_mode_or}
-    </label></li>
-  </ul>
-  <label>{lang:search_author}
-    <input type="text" style="width: 300px" name="search_author" size="30"  onfocus="this.className='focus';" onblur="this.className='nofocus';"/>
-  </label>
-</fieldset>
-
-<!-- BEGIN tags -->
-<fieldset>
-  <legend>{lang:Search tags}</legend>
-  {TAG_SELECTION}
-  <label><span><input type="radio" name="tag_mode" value="AND" checked="checked" /> {lang:All tags}</span></label>
-  <label><span><input type="radio" name="tag_mode" value="OR" /> {lang:Any tag}</span></label>
-</fieldset>
-<!-- END tags -->
-
-<fieldset>
-  <legend>{lang:search_date}</legend>
-  <ul>
-    <li><label>{lang:search_date_type}</label></li>
-    <li><label>
-      <input type="radio" name="date_type" value="date_creation" checked="checked" />{lang:Creation date}
-    </label></li>
-    <li><label>
-      <input type="radio" name="date_type" value="date_available" />{lang:Post date}
-    </label></li>
-  </ul>
-  <ul>
-    <li><label>{lang:search_date_from}</label></li>
-    <li>
-      <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" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-    </li>
-    <li>
-      <a href="#" onClick="document.search.start_day.value={TODAY_DAY};document.search.start_month.value={TODAY_MONTH};document.search.start_year.value={TODAY_YEAR};return false;">{lang:today}</a>
-    </li>
-  </ul>
-  <ul>
-    <li><label>{lang:search_date_to}</label></li>
-    <li>
-      <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" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-    </li>
-    <li>
-      <a href="#" onClick="document.search.end_day.value={TODAY_DAY};document.search.end_month.value={TODAY_MONTH};document.search.end_year.value={TODAY_YEAR};return false;">{lang:today}</a>
-    </li>
-  </ul>
-</fieldset>
-
-<fieldset>
-  <legend>{lang:search_options}</legend>
-  <label>{lang:search_categories}
-    <select style="width:250px" name="cat[]" multiple="multiple" size="8" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      <!-- BEGIN category_option -->
-      <option value="{category_option.VALUE}">{category_option.OPTION}</option>
-      <!-- END category_option -->
-    </select>
-  </label>
-  <ul>
-    <li><label>{lang:search_subcats_included}</label></li>
-    <li><label>
-      <input type="radio" name="subcats-included" value="1" checked="checked" />{lang:yes}
-    </label></li>
-    <li><label>
-      <input type="radio" name="subcats-included" value="0" />{lang:no}
-    </label></li>
-  </ul>
-  <ul>
-    <li><label>{lang:search_sort}</label></li>
-    <li><label>
-      <input type="radio" name="sd" value="AND" />{lang:search_ascending}
-    </label></li>
-    <li><label>
-      <input type="radio" name="sd" value="d" checked="checked" />{lang:search_descending}
-    </label></li>
-  </ul>
-</fieldset>
-<p>
-  <input type="submit" name="submit" value="{lang:submit}" class="bouton" />
-  <input type="reset" value="{lang:reset}" class="bouton" />
-</p>
-</form>
-
-<script type="text/javascript"><!--
-document.search.search_allwords.focus();
-//--></script>
-
-</div> <!-- content -->
diff --git a/template/admin/yoga/theme/clear/theme.css b/template/admin/yoga/theme/clear/theme.css
deleted file mode 100644
index 0ad08d98b..000000000
--- a/template/admin/yoga/theme/clear/theme.css
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id: theme.css 1339 2006-06-04 10:13:38Z chrisaga $ */
-
-/* text color */
-BODY, H1, H2, H3, DT {
-  color:#696969;	/* dimgray */
-}
-
-/* backgrounds */
-BODY, H3, .throw {
-  background-color: #ffffff;	/* white */
-}
-
-H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover, .row1 {
-  background-color: #d3d3d3;
-}
-
-#menubar DL, #content, #imageToolBar {
-  background-color: #eeeeee;
-}
-
-/* borders */
-#menubar DL, #content, #imageToolBar,
-#comments DIV.comment BLOCKQUOTE {
-  border: 1px solid #d3d3d3;
-}
-
-#theImage IMG {
-  border-color: #d3d3d3;
-}
-
-#content UL.thumbnail IMG {
-    border: 1px solid #a0a0a0;
-}
-
-FIELDSET, INPUT, SELECT, TEXTAREA,
-#content DIV.comment  A.illustration IMG, #infos,
-#content DIV.thumbnailCategory {
-  border: 1px solid gray;
-}
-
-#comments DIV.comment BLOCKQUOTE {
-  border-left: 2px solid #696969;
-  background-color: #eee;
-}
-
-#content UL.thumbnails SPAN.wrap2 {
-  border: 1px solid #aaaaaa;	/* thumbnails border color and style */
-  -moz-border-radius: 4px;	/* round corners with Geko */
-  border-radius: 4px 4px;	/* round corners with CSS3 compliant browsers */
-}
-#content UL.thumbnails SPAN.wrap2:hover {
-  border-color: yellow;		/* thumbnails border color when mouse cursor is over it */
-}
-
-/* links */
-A, .rateButton {
-    color: #005e89;
-    background: transparent;
-}
-
-A:hover {
-    color: #858460;
-}
-
-#imageToolBar A, #imageToolBar A:hover {
-    border-bottom: none;
-}
-
-A.navThumb, A.navThumb:hover {
-    border-bottom: none;
-}
-
-/* others */
-.pleaseNote {
-    background: #9c9c9c;
-    color: #ffff99;
-    padding: 1ex;
-    font-weight: bold;
-}
-
-/*calendar elements*/
-SPAN.calItemEmpty { color: silver; }
-
-SPAN.calItem, SPAN.calItemEmpty
-{
-  border: 1px solid silver;
-}
-
-/* nice looking month calendar*/
-TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid #7E7262;}
-
-TD.calDayCellEmpty { color: silver; }
-
-.calBackDate { color: #000; }
-.calForeDate { color: #fff; }
diff --git a/template/admin/yoga/theme/clear/themeconf.inc.php b/template/admin/yoga/theme/clear/themeconf.inc.php
deleted file mode 100644
index 88a978367..000000000
--- a/template/admin/yoga/theme/clear/themeconf.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'clear',
-  'icon_dir' => 'template/admin/yoga/icon',
-  'admin_icon_dir' => 'template/admin/yoga/icon/admin',
-  'mime_icon_dir' => 'template/admin/yoga/icon/mimetypes/'
-);
-?>
diff --git a/template/admin/yoga/theme/dark/theme.css b/template/admin/yoga/theme/dark/theme.css
deleted file mode 100644
index 337c60e92..000000000
--- a/template/admin/yoga/theme/dark/theme.css
+++ /dev/null
@@ -1,134 +0,0 @@
-/* $Id: theme.css 1339 2006-06-04 10:13:38Z chrisaga $ */
-
-/* text color */
-BODY, H1, H3, DT {
-  color:#e0e0e0;
-}
-
-H2, #menubar DT, .throw {
-  color: #fff48e;
-}
-
-#content .navigationBar {
-  color: #aaaaaa;
-}
-#content .pageNumberSelected {
-  color: #000000;
-}
-
-/* backgrounds */
-BODY {
-  background-color: #000000;
-}
-
-H3, #the_page, #imageHeaderBar, #imageToolBar A:hover, .row1  {
-  background-color: #3f3f3f;
-}
-
-#menubar DL, #content, #imageToolBar {
-  background-color: #5f5f5f;
-}
-
-H2, #menubar DT, .throw  {
-  background-image: url(images/tableh1_bg.png);
-}
-
-#imageHeaderBar H2 {
-  background-image: none;
-  background-color: transparent;
-  border: none;
-}
-
-#imageHeaderBar {
-  background-image: url(images/tableh2_bg.png);
-  background-repeat: repeat-x;
-  background-position: center;
-}
-
-/* borders */
-#menubar DL, #content,
-#comments DIV.comment BLOCKQUOTE {
-  border: 1px solid #000000;
-}
-
-#imageHeaderBar {
-  border-top: 1px solid #000000;
-}
-H2, #menubar DT, #imageToolBar {
-  border-bottom: 1px solid #000000;
-}
-
-#theImage IMG {
-  border-color: #000000;
-}
-
-#content UL.thumbnail IMG {
-  border: 1px solid #a0a0a0;
-}
-
-FIELDSET, INPUT, SELECT, TEXTAREA,
-#content DIV.comment  A.illustration IMG, #infos,
-#content DIV.thumbnailCategory {
-  border: 1px solid gray;
-}
-
-#comments DIV.comment BLOCKQUOTE {
-  border-left: 2px solid #696969;
-}
-
-#content UL.thumbnails SPAN.wrap2 {
-  border: 1px solid #aaaaaa;	/* thumbnails border color and style */
-  -moz-border-radius: 4px;	/* round corners with Geko */
-  border-radius: 4px 4px;	/* round corners with CSS3 compliant browsers */
-}
-#content UL.thumbnails SPAN.wrap2:hover {
-  border-color: yellow;		/* thumbnails border color when mouse cursor is over it */
-}
-
-/* links */
-A, .rateButton {
-  color: #FFFFFF;
-}
-
-A:hover {
-  color: #FFF48E;
-}
-
-#imageToolBar A, #imageToolBar A:hover {
-  border-bottom: none;
-}
-
-A.navThumb, A.navThumb:hover {
-  border-bottom: none;
-}
-
-/* others */
-.pleaseNote {
-  background: #9c9c9c;
-  color: #ffff99;
-  padding: 1ex;
-  font-weight: bold;
-}
-#the_page {
-  border: 1px solid #e0e0e0;
-  padding-top: 5px;
-  padding-bottom:30px;
-  text-align:center;
-  display:block;
-}
-
-/*calendar elements*/
-SPAN.calItemEmpty { color: silver; }
-
-SPAN.calItem, SPAN.calItemEmpty
-{
-  border: 1px solid gray;
-}
-
-/* nice looking month calendar*/
-TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}
-
-TD.calDayCellEmpty { color: silver; }
-
-.calBackDate { color: #000; }
-.calForeDate { color: #fff; }
diff --git a/template/admin/yoga/theme/dark/themeconf.inc.php b/template/admin/yoga/theme/dark/themeconf.inc.php
deleted file mode 100644
index adb3bead6..000000000
--- a/template/admin/yoga/theme/dark/themeconf.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'dark',
-  'icon_dir' => 'template/admin/yoga/icon',
-  'admin_icon_dir' => 'template/admin/yoga/icon/admin',
-  'mime_icon_dir' => 'template/admin/yoga/icon/mimetypes/'
-);
-?>
diff --git a/template/public/yoga/about.tpl b/template/public/yoga/about.tpl
deleted file mode 100644
index 6efa0e9ee..000000000
--- a/template/public/yoga/about.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="content">
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li>
-        <a href="{U_HOME}" title="{lang:return to homepage}">
-          <img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/>
-        </a>
-      </li>
-    </ul>
-    <h2>{lang:About}</h2>
-  </div>
-
-  {ABOUT_MESSAGE}
-
-</div>
diff --git a/template/public/yoga/admin/cat_perm.tpl b/template/public/yoga/admin/cat_perm.tpl
deleted file mode 100644
index 9c8fafa69..000000000
--- a/template/public/yoga/admin/cat_perm.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:Manage permissions for a category}</h2>
-</div>
-
-<h3>{CATEGORIES_NAV}</h3>
-
-<form action="{F_ACTION}" method="post" id="categoryPermissions">
-
-  <h4>{lang:Groups}</h4>
-
-  <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}" {TAG_INPUT_ENABLED}/>
-  </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}" {TAG_INPUT_ENABLED}/>
-  </fieldset>
-
-  <h4>{lang:Users}</h4>
-  
-  <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}" {TAG_INPUT_ENABLED}/>
-  </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}" {TAG_INPUT_ENABLED}/>
-  </fieldset>
-
-</form>
diff --git a/template/public/yoga/admin/comments.tpl b/template/public/yoga/admin/comments.tpl
deleted file mode 100644
index 065a1c8ee..000000000
--- a/template/public/yoga/admin/comments.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2>{lang:User comments validation}</h2>
-
-<form method="post" action="{F_ACTION}">
-  <!-- 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="hidden" name="list" value="{LIST}" />
-    <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}/>
-    <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/public/yoga/admin/double_select.tpl b/template/public/yoga/admin/double_select.tpl
deleted file mode 100644
index 2bfa28072..000000000
--- a/template/public/yoga/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;" {TAG_INPUT_ENABLED}/></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;" {TAG_INPUT_ENABLED}/></p>
-    </td>
-  </tr>
-</table>
diff --git a/template/public/yoga/admin/element_set_unit.tpl b/template/public/yoga/admin/element_set_unit.tpl
deleted file mode 100644
index 5adce8833..000000000
--- a/template/public/yoga/admin/element_set_unit.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-<h2>{lang:Batch management}</h2>
-
-<h3>{CATEGORIES_NAV}</h3>
-
-<p style="text-align:center;">
-  <a href="{U_GLOBAL_MODE}">{lang:global mode}</a>
-  | {lang:unit mode}
-</p>
-
-<form action="{F_ACTION}" method="POST">
-<fieldset>
-
-  <legend>{lang:Display options}</legend>
-  <input type="hidden" name="list" value="{IDS_LIST}" />
-  <p>{lang: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">{lang: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" /> {lang:unset}</label>
-        <input type="radio" name="date_creation_action-{element.ID}" value="set" id="date_creation_action_set-{element.ID}" /> {lang: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:Tags}</strong></td>
-      <td>{element.TAG_SELECTION}</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>
-  <input type="submit" value="{L_SUBMIT}" name="submit" {TAG_INPUT_ENABLED}/>
-  <input type="reset" value="{lang:Reset}" />
-</p>
-
-
-</form>
diff --git a/template/public/yoga/admin/group_perm.tpl b/template/public/yoga/admin/group_perm.tpl
deleted file mode 100644
index 91c2f637a..000000000
--- a/template/public/yoga/admin/group_perm.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h2>{TITLE}</h2>
-
-<form method="post" action="{F_ACTION}">
-  {DOUBLE_SELECT}
-</form>
-
-<p>{lang:Only private categories are listed}</p>
diff --git a/template/public/yoga/admin/notification_by_mail.tpl b/template/public/yoga/admin/notification_by_mail.tpl
deleted file mode 100644
index 22309e96d..000000000
--- a/template/public/yoga/admin/notification_by_mail.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- $Id: notification_by_mail.tpl Ruben ARNAUD -->
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:nbm_send_mail_to_users} [{U_TABSHEET_TITLE}]</h2>
-  <!-- BEGIN header_link -->
-  <h3>
-      <a href="{header_link.PARAM_MODE}">{lang:nbm_param_mode}</a> | 
-      <a href="{header_link.SUBSCRIBE_MODE}">{lang:nbm_subscribe_mode}</a> | 
-      <a href="{header_link.SEND_MODE}">{lang:nbm_send_mode}</a>
-  </h3>
-  <!-- END header_link -->
-</div>
-
-<form method="post" name="notification_by_mail" id="notification_by_mail" action="{F_ACTION}">
-  <!-- BEGIN repost -->
-  <fieldset>
-    <div class="infos">
-      <input type="submit" value="{lang:nbm_repost_submit}" name="{repost.REPOST_SUBMIT_NAME}" {TAG_INPUT_ENABLED}/>
-    </div>
-  </fieldset>
-  <!-- END repost -->
-
-  <!-- BEGIN param -->
-  <fieldset>
-    <legend>{lang:nbm_title_param}</legend>
-    <table>
-      <tr>
-        <td>
-          <label for="send_mail_as">{lang:nbm_send_mail_as}</label>
-          <br><i><small>{lang:nbm_info_send_mail_as}</small></i>
-        </td>
-        <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{param.SEND_MAIL_AS}"/></td>
-      </tr>
-      <tr> 
-        <td><label>{lang:nbm_send_detailed_content} </label></td>
-        <td>
-          <label><input type="radio" name="nbm_send_detailed_content" value="true"  {param.SEND_DETAILED_CONTENT_YES}/>{lang:yes}</label>
-          <label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:no}</label>
-        </td>
-      </tr>
-     <tr>
-        <td><label for="complementary_mail_content">{lang:nbm_complementary_mail_content} </label></td>
-        <td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
-      </tr>
-    </table>
-  </fieldset>
-
-  <p>
-    <input type="submit" value="{lang:Submit}" name="param_submit" {TAG_INPUT_ENABLED}/>
-    <input type="reset" value="{lang:Reset}" name="param_reset"/>
-  </p>
-  <!-- END param -->
-
-  <!-- BEGIN subscribe -->
-  <fieldset>
-    <legend>{lang:nbm_title_subscribe}</legend>
-    <p><i>{lang:nbm_warning_subscribe_unsubcribe}</i></p>
-    {DOUBLE_SELECT}
-  </fieldset>
-  <!-- END subscribe -->
-
-  <!-- BEGIN send -->
-    <!-- BEGIN send_empty -->
-    <p>{lang:nbm_no_user_available_to_send_L1}</p>
-    <p>
-    {lang:nbm_no_user_available_to_send_L2}<br>
-    {lang:nbm_no_user_available_to_send_L3}
-    </p>
-    <!-- END send_empty -->
-    <!-- BEGIN send_data -->
-    <fieldset>
-      <legend>{lang:nbm_title_send}</legend>
-      <table class="table2">
-        <tr class="throw">
-          <th>{lang:nbm_col_user}</th>
-          <th>{lang:nbm_col_mail}</th>
-          <th>{lang:nbm_col_last_send}</th>
-          <th>{lang:nbm_col_check_user_send_mail}</th>
-        </tr>
-        <!-- BEGIN user_send_mail -->
-        <tr class="{send.send_data.user_send_mail.CLASS}">
-          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.USERNAME}</label></td>
-          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.EMAIL}</label></td>
-          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.LAST_SEND}</label></td>
-          <td><input type="checkbox" name="send_selection[]" value="{send.send_data.user_send_mail.ID}" {send.send_data.user_send_mail.CHECKED} id="send_selection-{send.send_data.user_send_mail.ID}"/></td>
-        </tr>
-        <!-- END user_send_mail -->
-      </table>
-      <p>
-          <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{lang:nbm_send_check_all}</a>
-        / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{lang:nbm_send_uncheck_all}</a>
-      </p>
-    </fieldset>
-
-    <fieldset>
-      <legend>{lang:nbm_send_options}</legend>
-      <table>
-       <tr>
-          <td><label for="send_customize_mail_content">{lang:nbm_send_complementary_mail_content} </label></td>
-          <td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{send.send_data.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
-        </tr>
-      </table>
-    </fieldset>
-
-    <p>
-      <input type="submit" value="{lang:nbm_send_submit}" name="send_submit" {TAG_INPUT_ENABLED}/>
-    </p>
-    <!-- END send_data -->
-  <!-- END send -->
-
-</form>
diff --git a/template/public/yoga/admin/rating.tpl b/template/public/yoga/admin/rating.tpl
deleted file mode 100644
index ac78bf419..000000000
--- a/template/public/yoga/admin/rating.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-<h2>{lang:Rating} [{NB_ELEMENTS} {lang:elements}]</h2>
-
-<form action="{F_ACTION}" method="GET" id="update" class="filter">
-  <fieldset>
-    <legend>{lang:Filter}</legend>
-
-    <label>
-      {lang:Sort 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:Users}
-      <select name="users">
-        <!-- BEGIN user_option -->
-        <option value="{user_option.VALUE}" {user_option.SELECTED}>{user_option.CONTENT}</option>
-        <!-- END user_option -->
-      </select>
-    </label>
-
-    <label>
-      {lang:Number of items}
-      <input type="text" name="display" size="2" value="{DISPLAY}">
-    </label>
-
-    <input type="submit" name="submit_filter" value="{lang:Submit}" />
-    <input type="hidden" name="page" value="rating" />
-  </fieldset>
-</form>
-
-<div class="navigationBar">{NAVBAR}</div>
-<table width="99%">
-<tr class="throw">
-  <td>{lang:File}</td>
-  <td>{lang:Number of rates}</td>
-  <td>{lang:Average rate}</td>
-  <td>{lang:Controversy}</td>
-  <td>{lang:Sum of rates}</td>
-  <td>{lang:Rate}</td>
-  <td>{lang:Username}</td>
-  <td>{lang:Rate date}</td>
-  <td></td>
-</tr>
-<!-- BEGIN image -->
-<tr valign="bottom">
-  <td rowspan="{image.NB_RATES_PLUS1}"><a href="{image.U_URL}"><img src="{image.U_THUMB}" alt="{image.FILE}" title="{image.FILE}"></a></td>
-  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.NB_RATES}/{image.NB_RATES_TOTAL}</strong></td>
-  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.AVG_RATE}</strong></td>
-  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.STD_RATE}</strong></td>
-  <td rowspan="{image.NB_RATES_PLUS1}" style="border-right: 1px solid;" ><strong>{image.SUM_RATE}</strong></td>
-</tr>
-<!-- BEGIN rate -->
-<tr>
-    <td>{image.rate.RATE}</td>
-    <td><b>{image.rate.USER}</b></td>
-    <td><span class="date">{image.rate.DATE}</span></td>
-    <td><a href="{image.rate.U_DELETE}"><img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/></a></td>
-</tr>
-<!-- END rate -->
-<!-- END image -->
-</table>
-
-<div class="navigationBar">{NAVBAR}</div>
diff --git a/template/public/yoga/admin/site_update.tpl b/template/public/yoga/admin/site_update.tpl
deleted file mode 100644
index d3d0221ca..000000000
--- a/template/public/yoga/admin/site_update.tpl
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- $Id: update.tpl 980 2005-12-10 15:24:53Z chrisaga $ -->
-
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:title_update}: <a href="{SITE_URL}">{SITE_URL}</a></h2>
-</div>
-
-<!-- BEGIN update_result -->
-<h3>{L_RESULT_UPDATE}</h3>
-<ul>
-  <li class="update_summary_new">{update_result.NB_NEW_CATEGORIES} {lang:update_nb_new_categories}</li>
-  <li class="update_summary_new">{update_result.NB_NEW_ELEMENTS} {lang:update_nb_new_elements}</li>
-  <li class="update_summary_del">{update_result.NB_DEL_CATEGORIES} {lang:update_nb_del_categories}</li>
-  <li class="update_summary_del">{update_result.NB_DEL_ELEMENTS} {lang:update_nb_del_elements}</li>
-  <li>{update_result.NB_UPD_ELEMENTS} {lang:update_nb_upd_elements}</li>
-  <li class="update_summary_err">{update_result.NB_ERRORS} {lang:update_nb_errors}</li>
-</ul>
-<!-- END update_result -->
-
-<!-- BEGIN metadata_result -->
-<h3>{L_RESULT_METADATA}</h3>
-<ul>
-  <li>{metadata_result.NB_ELEMENTS_DONE} {lang:update_nb_elements_metadata_sync}</li>
-  <li>{metadata_result.NB_ELEMENTS_CANDIDATES} {lang:update_nb_elements_metadata_available}</li>
-  <li>{lang:update_used_metadata} : {METADATA_LIST}</li>
-</ul>
-<!-- END metadata_result -->
-
-
-<!-- BEGIN sync_errors -->
-<h3>{lang:update_error_list_title}</h3>
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>[{sync_errors.error.ELEMENT}] {sync_errors.error.LABEL}</li>
-  <!-- END error -->
-</ul>
-</div>
-<h3>{lang:update_errors_caption}</h3>
-<ul>
-  <!-- BEGIN error_caption -->
-  <li><strong>{sync_errors.error_caption.TYPE}</strong>: {sync_errors.error_caption.LABEL}</li>
-  <!-- END error_caption -->
-</ul>
-<!-- END sync_errors -->
-
-<!-- BEGIN sync_infos -->
-<h3>{lang:update_infos_title}</h3>
-<div class="infos">
-<ul>
-  <!-- BEGIN info -->
-  <li>[{sync_infos.info.ELEMENT}] {sync_infos.info.LABEL}</li>
-  <!-- END sync_infos -->
-</ul>
-</div>
-<!-- END infos -->
-
-<!-- BEGIN introduction -->
-<h3>{lang:update_default_title}</h3>
-<form action="{F_ACTION}" method="post" id="update">
-
-  <fieldset>
-    <legend>{lang:update_sync_files}</legend>
-    <ul>
-      <li><label><input type="radio" name="sync" value="dirs" {SYNC_DIRS_CHECKED} /> {lang:update_sync_dirs}</label></li>
-      <li><label><input type="radio" name="sync" value="files" {SYNC_ALL_CHECKED} /> {lang:update_sync_all}</label></li>
-      <li><label><input type="checkbox" name="display_info" value="1" {DISPLAY_INFO_CHECKED} /> {lang:update_display_info}</label></li>
-    </ul>
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:update_sync_metadata}</legend>
-    {lang:update_used_metadata} : {METADATA_LIST}.<br/>
-    <ul>
-      <li><label><input type="radio" name="sync" value="metadata_new" {SYNC_META_NEW_CHECKED} /> {lang:update_sync_metadata_new}</label></li>
-      <li><label><input type="radio" name="sync" value="metadata_all" {SYNC_META_ALL_CHECKED} /> {lang:update_sync_metadata_all}</label></li>
-    </ul>
-  </fieldset>
-
-  <fieldset>
-    <legend></legend>
-    <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {TAG_INPUT_ENABLED} /> {lang:update_simulate}</label></li></ul>
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:update_cats_subset}</legend>
-    <ul>
-    <li>
-    <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>
-    </li>
-
-    <li><label><input type="checkbox" name="subcats-included" value="1" {SUBCATS_INCLUDED_CHECKED} /> {lang:search_subcats_included}</label></li>
-    </ul>
-  </fieldset>
-
-  <p class="bottomButtons">
-    <input type="submit" value="{lang:submit}" name="submit" />
-    <input type="reset"  value="{lang:reset}"  name="reset"  />
-  </p>
-</form>
-<!-- END introduction -->
-
-<a href="{U_SITE_MANAGER}">{lang:Site manager}</a>
diff --git a/template/public/yoga/admin/tags.tpl b/template/public/yoga/admin/tags.tpl
deleted file mode 100644
index 8fe666b59..000000000
--- a/template/public/yoga/admin/tags.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="titrePage">
-  <h2>{lang:Manage tags}</h2>
-</div>
-
-<form action="{F_ACTION}" method="post">
-
-  <!-- BEGIN edit_tags -->
-  <fieldset>
-    <legend>{lang:Edit tags}</legend>
-    <input type="hidden" name="edit_list" value="{edit_tags.LIST}" />
-    <table class="table2">
-      <tr class="throw">
-        <th>{lang:Current name}</th>
-        <th>{lang:New name}</th>
-      </tr>
-      <!-- BEGIN tag -->
-      <tr>
-        <td>{edit_tags.tag.NAME}</td>
-        <td><input type="text" name="tag_name-{edit_tags.tag.ID}" value="{edit_tags.tag.NAME}" /></td>
-      </tr>
-      <!-- END tag -->
-    </table>
-
-    <p>
-      <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED} />
-      <input type="reset" value="{lang:Reset}" />
-    </p>
-  </fieldset>
-  <!-- END edit_tags -->
-
-  <fieldset>
-    <legend>{lang:Add a tag}</legend>
-
-    <label>
-      {lang:New tag}
-      <input type="text" name="add_tag" />
-    </label>
-    
-    <p><input type="submit" name="add" value="{lang:Submit}" {TAG_INPUT_ENABLED}/></p>
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:Tag selection}</legend>
-    
-    {TAG_SELECTION}
-
-    <p>
-      <input type="submit" name="edit" value="{lang:Edit selected tags}" {TAG_INPUT_ENABLED}/>
-      <input type="submit" name="delete" value="{lang:Delete selected tags}" onclick="return confirm('{lang:Are you sure?}');" {TAG_INPUT_ENABLED}/>
-    </p>
-  </fieldset>
-
-</form>
diff --git a/template/public/yoga/admin/user_list.tpl b/template/public/yoga/admin/user_list.tpl
deleted file mode 100644
index e6c1e81b6..000000000
--- a/template/public/yoga/admin/user_list.tpl
+++ /dev/null
@@ -1,307 +0,0 @@
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:title_liste_users}</h2>
-</div>
-
-<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
-  <fieldset>
-    <legend>{lang:Add a user}</legend>
-    <label>{lang: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}" {TAG_INPUT_ENABLED} />
-  </fieldset>
-</form>
-
-<form class="filter" method="get" name="filter" action="{F_FILTER_ACTION}"> 
-<fieldset>
-  <legend>{lang:Filter}</legend>
-  <input type="hidden" name="page" value="user_list" />
-
-  <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}" {TAG_INPUT_ENABLED}/>
-
-</fieldset>
-
-</form>
-
-<form method="post" name="preferences" action="{F_PREF_ACTION}">
-
-<table class="table2">
-  <tr class="throw">
-    <th>&nbsp;</th>
-    <th>{lang:Username}</th>
-    <th>{L_STATUS}</th>
-    <th>{L_EMAIL}</th>
-    <th>{lang:Groups}</th>
-    <th>{L_PROPERTIES}</th>
-    <th>{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>{user.PROPERTIES}</td>
-    <td style="text-align:center;">
-      <a href="{user.U_PERM}"><img src="{themeconf:icon_dir}/permissions.png" class="button" 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>
-  <label><input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}</label>
-  <input type="submit" value="{lang:Delete selected users}" name="delete" {TAG_INPUT_ENABLED}/>
-</fieldset>
-
-<fieldset>
-  <legend>{lang:Status}</legend>
-
-  <table>
-    <tr>
-      <td>{L_STATUS}</td>
-      <td>
-        <label><input type="radio" name="status_action" value="leave" checked="checked" /> {lang:leave}</label>
-        <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {lang:set to}</label>
-        <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>
-
-    <!-- BEGIN adviser -->
-    <tr>
-      <td>{lang:adviser}</td>
-      <td>
-        <label><input type="radio" name="adviser" value="leave" checked="checked" /> {lang:leave}</label>
-        / {lang:set to}
-        <label><input type="radio" name="adviser" value="true"  {ADVISER_YES} />{L_YES}</label>
-        <label><input type="radio" name="adviser" value="false" {ADVISER_NO}  />{L_NO}</label>
-      </td>
-    </tr>
-    <!-- END adviser -->
-
-  </table>
-</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>
-
-<!-- Properties -->
-<fieldset>
-  <legend>{L_PROPERTIES}</legend>
-
-  <table>
-
-    <tr>
-      <td>{lang:enabled_high}</td>
-      <td>
-        <label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {lang:leave}</label>
-        / {lang:set to}
-        <label><input type="radio" name="enabled_high" value="true"  {ENABLED_HIGH_YES} />{L_YES}</label>
-        <label><input type="radio" name="enabled_high" value="false" {ENABLED_HIGH_NO}  />{L_NO}</label>
-      </td>
-    </tr>
-
-  </table>
-
-</fieldset>
-
-<!-- preference -->
-<fieldset>
-  <legend>{lang:Preferences}</legend>
-
-<table>
-
-  <tr>
-    <td>{L_NB_IMAGE_LINE}</td>
-    <td>
-      <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {lang:leave}</label>
-      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> {lang:set to}</label>
-      <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>
-      <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {lang:leave}</label>
-      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {lang:set to}</label>
-      <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>
-      <label><input type="radio" name="template_action" value="leave" checked="checked" /> {lang:leave}</label>
-      <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {lang:set to}</label>
-      <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>
-      <label><input type="radio" name="language_action" value="leave" checked="checked" /> {lang:leave}</label>
-      <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {lang:set to}</label>
-      <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>
-      <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {lang:leave}</label>
-      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> {lang:set to}</label>
-      <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>
-      <label><input type="radio" name="expand" value="leave" checked="checked" /> {lang:leave}</label>
-      / {lang:set to}
-      <label><input type="radio" name="expand" value="true"  {EXPAND_YES} />{L_YES}</label>
-      <label><input type="radio" name="expand" value="false" {EXPAND_NO}  />{L_NO}</label>
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_SHOW_NB_COMMENTS}</td>
-    <td>
-      <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {lang:leave}</label>
-      / {lang:set to}
-      <label><input type="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}</label>
-      <label><input type="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}</label>
-    </td>
-  </tr>
-
-  <tr>
-    <td>{L_MAXWIDTH}</td>
-    <td>
-      <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {lang:leave}</label>
-      <label><input type="radio" name="maxwidth_action" value="unset" /> {lang:unset}</label>
-      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {lang:set to}</label>
-      <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>
-      <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {lang:leave}</label>
-      <label><input type="radio" name="maxheight_action" value="unset" /> {lang:unset}</label>
-      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {lang:set to}</label>
-      <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
-             type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" />
-    </td>
-  </tr>
-
-
-</table>
-
-</fieldset>
-
-<p>
-  {lang:target}
-  <label><input type="radio" name="target" value="all" /> {lang:all}</label>
-  <label><input type="radio" name="target" value="selection" checked="checked" /> {lang:selection}</label>
-</p>
-
-<p>
-  <input type="submit" value="{L_SUBMIT}" name="pref_submit" {TAG_INPUT_ENABLED} />
-  <input type="reset" value="{L_RESET}" name="pref_reset" />
-</p>
-
-</form>
diff --git a/template/public/yoga/admin/user_perm.tpl b/template/public/yoga/admin/user_perm.tpl
deleted file mode 100644
index a24fd9096..000000000
--- a/template/public/yoga/admin/user_perm.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<h2>{TITLE}</h2>
-
-<!-- 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/public/yoga/dclear.css b/template/public/yoga/dclear.css
deleted file mode 100644
index e69de29bb..000000000
--- a/template/public/yoga/dclear.css
+++ /dev/null
diff --git a/template/public/yoga/footer.tpl b/template/public/yoga/footer.tpl
deleted file mode 100644
index 44d905995..000000000
--- a/template/public/yoga/footer.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div id="copyright">
- <!-- BEGIN debug -->
- {lang:generation_time} {debug.TIME} ({debug.NB_QUERIES} {lang:sql_queries_in} {debug.SQL_TIME}) -
- <!-- END debug -->
-
- <!-- Please, do not remove this copyright. If you really want to,
-	  contact us on http://phpwebgallery.net to find a solution on how
-	  to show the origin of the script...-->
-
-  {lang:powered_by} <a href="http://www.phpwebgallery.net" class="back">PhpWebGallery</a>
-  {VERSION}
-  <!-- BEGIN contact -->
-  - {lang:send_mail}
-  <a href="mailto:{contact.MAIL}?subject={L_TITLE_MAIL}">{lang:Webmaster}</a>
-  <!-- END contact -->
-
-</div> <!-- copyright -->
-</div> <!-- the_page -->
-
-<!-- BEGIN debug -->
-  {debug.QUERIES_LIST}
-<!-- END debug -->
-</body>
-</html>
diff --git a/template/public/yoga/header.tpl b/template/public/yoga/header.tpl
deleted file mode 100644
index beb80d2d2..000000000
--- a/template/public/yoga/header.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html lang="{LANG}" dir="{DIR}">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
-<link rel="shortcut icon" type="image/x-icon" href="{pwg_root}template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/public/{themeconf:template}/layout.css">
-<!-- the next css is used to fix khtml (Konqueror/Safari) issue
-the "text/nonsense" prevents gecko based browsers to load it -->
-<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/public/{themeconf:template}/fix-khtml.css">
-<!--[if lt IE 7]>
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/public/{themeconf:template}/fix-ie5-ie6.css">
-<![endif]-->
-<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/public/{themeconf:template}/print.css">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/public/{themeconf:template}/default-colors.css">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/public/{themeconf:template}/theme/{themeconf:theme}/theme.css">
-<!-- BEGIN next -->
-<link rel="prefetch" href="{next.U_IMG_SRC}">
-<!-- END next -->
-<!-- BEGIN refresh -->
-<meta http-equiv="refresh" content="{REFRESH_TIME};url={U_REFRESH}">
-<!-- END refresh -->
-<title>{GALLERY_TITLE}:{PAGE_TITLE}</title>
-<script type="text/javascript" src="{pwg_root}include/scripts.js"></script>
-<!--[if lt IE 7]>
-<script type="text/javascript" src="{pwg_root}include/pngfix.js"></script>
-<![endif]-->
-</head>
-
-<body id="{BODY_ID}">
-<div id="the_page">
-
-{PAGE_BANNER}
diff --git a/template/public/yoga/icon/add_tag.png b/template/public/yoga/icon/add_tag.png
deleted file mode 100644
index 9051a1d26..000000000
--- a/template/public/yoga/icon/add_tag.png
+++ /dev/null
diff --git a/template/public/yoga/icon/admin/errors.png b/template/public/yoga/icon/admin/errors.png
deleted file mode 100644
index 3c8a37df5..000000000
--- a/template/public/yoga/icon/admin/errors.png
+++ /dev/null
diff --git a/template/public/yoga/icon/admin/infos.png b/template/public/yoga/icon/admin/infos.png
deleted file mode 100644
index dc8c8a457..000000000
--- a/template/public/yoga/icon/admin/infos.png
+++ /dev/null
diff --git a/template/public/yoga/icon/caddie_add.png b/template/public/yoga/icon/caddie_add.png
deleted file mode 100644
index eb20f4e06..000000000
--- a/template/public/yoga/icon/caddie_add.png
+++ /dev/null
diff --git a/template/public/yoga/icon/calendar.png b/template/public/yoga/icon/calendar.png
deleted file mode 100644
index e0a44a13d..000000000
--- a/template/public/yoga/icon/calendar.png
+++ /dev/null
diff --git a/template/public/yoga/icon/calendar_created.png b/template/public/yoga/icon/calendar_created.png
deleted file mode 100644
index 14a84c43c..000000000
--- a/template/public/yoga/icon/calendar_created.png
+++ /dev/null
diff --git a/template/public/yoga/icon/category_children.png b/template/public/yoga/icon/category_children.png
deleted file mode 100644
index 7205c3f61..000000000
--- a/template/public/yoga/icon/category_children.png
+++ /dev/null
diff --git a/template/public/yoga/icon/category_delete.png b/template/public/yoga/icon/category_delete.png
deleted file mode 100644
index da796da11..000000000
--- a/template/public/yoga/icon/category_delete.png
+++ /dev/null
diff --git a/template/public/yoga/icon/category_edit.png b/template/public/yoga/icon/category_edit.png
deleted file mode 100644
index 0f3b619ed..000000000
--- a/template/public/yoga/icon/category_edit.png
+++ /dev/null
diff --git a/template/public/yoga/icon/category_elements.png b/template/public/yoga/icon/category_elements.png
deleted file mode 100644
index 1d367b38f..000000000
--- a/template/public/yoga/icon/category_elements.png
+++ /dev/null
diff --git a/template/public/yoga/icon/category_jump-to.png b/template/public/yoga/icon/category_jump-to.png
deleted file mode 100644
index 62db1f4ee..000000000
--- a/template/public/yoga/icon/category_jump-to.png
+++ /dev/null
diff --git a/template/public/yoga/icon/category_permissions.png b/template/public/yoga/icon/category_permissions.png
deleted file mode 100644
index 4780841ae..000000000
--- a/template/public/yoga/icon/category_permissions.png
+++ /dev/null
diff --git a/template/public/yoga/icon/category_representant_random.png b/template/public/yoga/icon/category_representant_random.png
deleted file mode 100644
index dfa69846f..000000000
--- a/template/public/yoga/icon/category_representant_random.png
+++ /dev/null
diff --git a/template/public/yoga/icon/del_favorite.png b/template/public/yoga/icon/del_favorite.png
deleted file mode 100644
index cfc609749..000000000
--- a/template/public/yoga/icon/del_favorite.png
+++ /dev/null
diff --git a/template/public/yoga/icon/delete.png b/template/public/yoga/icon/delete.png
deleted file mode 100644
index af10be03e..000000000
--- a/template/public/yoga/icon/delete.png
+++ /dev/null
diff --git a/template/public/yoga/icon/exit.png b/template/public/yoga/icon/exit.png
deleted file mode 100644
index 2aafbb4cb..000000000
--- a/template/public/yoga/icon/exit.png
+++ /dev/null
diff --git a/template/public/yoga/icon/favorite.png b/template/public/yoga/icon/favorite.png
deleted file mode 100644
index 58befd9e3..000000000
--- a/template/public/yoga/icon/favorite.png
+++ /dev/null
diff --git a/template/public/yoga/icon/first.png b/template/public/yoga/icon/first.png
deleted file mode 100644
index 2b8db1cff..000000000
--- a/template/public/yoga/icon/first.png
+++ /dev/null
diff --git a/template/public/yoga/icon/help.png b/template/public/yoga/icon/help.png
deleted file mode 100644
index c76f68292..000000000
--- a/template/public/yoga/icon/help.png
+++ /dev/null
diff --git a/template/public/yoga/icon/home.png b/template/public/yoga/icon/home.png
deleted file mode 100644
index cce450d85..000000000
--- a/template/public/yoga/icon/home.png
+++ /dev/null
diff --git a/template/public/yoga/icon/last.png b/template/public/yoga/icon/last.png
deleted file mode 100644
index 12e1367a7..000000000
--- a/template/public/yoga/icon/last.png
+++ /dev/null
diff --git a/template/public/yoga/icon/left.png b/template/public/yoga/icon/left.png
deleted file mode 100644
index 63d306c9c..000000000
--- a/template/public/yoga/icon/left.png
+++ /dev/null
diff --git a/template/public/yoga/icon/lost_password.png b/template/public/yoga/icon/lost_password.png
deleted file mode 100644
index ad6d71422..000000000
--- a/template/public/yoga/icon/lost_password.png
+++ /dev/null
diff --git a/template/public/yoga/icon/metadata.png b/template/public/yoga/icon/metadata.png
deleted file mode 100644
index d5d8fa6dc..000000000
--- a/template/public/yoga/icon/metadata.png
+++ /dev/null
diff --git a/template/public/yoga/icon/mimetypes/avi.png b/template/public/yoga/icon/mimetypes/avi.png
deleted file mode 100644
index 065f0b282..000000000
--- a/template/public/yoga/icon/mimetypes/avi.png
+++ /dev/null
diff --git a/template/public/yoga/icon/mimetypes/mp3.png b/template/public/yoga/icon/mimetypes/mp3.png
deleted file mode 100644
index afb7e1b0a..000000000
--- a/template/public/yoga/icon/mimetypes/mp3.png
+++ /dev/null
diff --git a/template/public/yoga/icon/mimetypes/mpg.png b/template/public/yoga/icon/mimetypes/mpg.png
deleted file mode 100644
index f7dbd2388..000000000
--- a/template/public/yoga/icon/mimetypes/mpg.png
+++ /dev/null
diff --git a/template/public/yoga/icon/mimetypes/ogg.png b/template/public/yoga/icon/mimetypes/ogg.png
deleted file mode 100644
index ead3f62c3..000000000
--- a/template/public/yoga/icon/mimetypes/ogg.png
+++ /dev/null
diff --git a/template/public/yoga/icon/mimetypes/zip.png b/template/public/yoga/icon/mimetypes/zip.png
deleted file mode 100644
index 1f08fe1a3..000000000
--- a/template/public/yoga/icon/mimetypes/zip.png
+++ /dev/null
diff --git a/template/public/yoga/icon/normal_mode.png b/template/public/yoga/icon/normal_mode.png
deleted file mode 100644
index 07318b568..000000000
--- a/template/public/yoga/icon/normal_mode.png
+++ /dev/null
diff --git a/template/public/yoga/icon/permissions.png b/template/public/yoga/icon/permissions.png
deleted file mode 100644
index 33091eb85..000000000
--- a/template/public/yoga/icon/permissions.png
+++ /dev/null
diff --git a/template/public/yoga/icon/preferences.png b/template/public/yoga/icon/preferences.png
deleted file mode 100644
index 0f3b619ed..000000000
--- a/template/public/yoga/icon/preferences.png
+++ /dev/null
diff --git a/template/public/yoga/icon/recent.png b/template/public/yoga/icon/recent.png
deleted file mode 100644
index 78c1428ca..000000000
--- a/template/public/yoga/icon/recent.png
+++ /dev/null
diff --git a/template/public/yoga/icon/register.png b/template/public/yoga/icon/register.png
deleted file mode 100644
index d1dd3c834..000000000
--- a/template/public/yoga/icon/register.png
+++ /dev/null
diff --git a/template/public/yoga/icon/representative.png b/template/public/yoga/icon/representative.png
deleted file mode 100644
index f1141d91b..000000000
--- a/template/public/yoga/icon/representative.png
+++ /dev/null
diff --git a/template/public/yoga/icon/right.png b/template/public/yoga/icon/right.png
deleted file mode 100644
index f998098e4..000000000
--- a/template/public/yoga/icon/right.png
+++ /dev/null
diff --git a/template/public/yoga/icon/save.png b/template/public/yoga/icon/save.png
deleted file mode 100644
index b4b9da08b..000000000
--- a/template/public/yoga/icon/save.png
+++ /dev/null
diff --git a/template/public/yoga/icon/search_rules.png b/template/public/yoga/icon/search_rules.png
deleted file mode 100644
index 300186647..000000000
--- a/template/public/yoga/icon/search_rules.png
+++ /dev/null
diff --git a/template/public/yoga/icon/slideshow.png b/template/public/yoga/icon/slideshow.png
deleted file mode 100644
index 455d73fdf..000000000
--- a/template/public/yoga/icon/slideshow.png
+++ /dev/null
diff --git a/template/public/yoga/icon/sync_metadata.png b/template/public/yoga/icon/sync_metadata.png
deleted file mode 100644
index 03570ead6..000000000
--- a/template/public/yoga/icon/sync_metadata.png
+++ /dev/null
diff --git a/template/public/yoga/icon/up.png b/template/public/yoga/icon/up.png
deleted file mode 100644
index 0c9cda5b1..000000000
--- a/template/public/yoga/icon/up.png
+++ /dev/null
diff --git a/template/public/yoga/image.css b/template/public/yoga/image.css
deleted file mode 100644
index 9ecbaea08..000000000
--- a/template/public/yoga/image.css
+++ /dev/null
@@ -1,149 +0,0 @@
-#imageHeaderBar {
-  padding-top: 2px;
-  padding-bottom: 2px;
-  margin-top: 4px;
-  overflow: hidden;
-  width: 100%;
-}
-
-#imageHeaderBar .browsePath {
-  float: left;
-  margin-left: 10px;
-}
-
-#imageHeaderBar .imageNumber {
-  float: right;
-  margin-right: 10px;
-}
-
-#imageHeaderBar H2 {
-  text-align: center;
-  padding: 0;
-  clear: both;
-}
-
-#imageToolBar {
-  text-align: center;
-  position: relative;
-  clear: both;
-  margin-bottom: 4px;
-  padding: 0;
-}
-
-#imageToolBar {
-    height: 28px;
-}
-#imageToolBar A, #imageToolBar IMG {
-    display: block;
-    border: none;
-    margin: 0; padding: 0;
-}
-#imageToolBar A { width: 48px; }
-#imageToolBar IMG { margin: 2px auto; }
-#imageToolBar .randomButtons A { float: left; }
-#imageToolBar .navButtons    A { float: right; }
-
-#theImage {
-    clear: left;
-}
-
-#theImage>IMG {
-    display: block;
-    margin: 0 auto;
-}
-
-#theImage IMG {
-  border-width: 3px;
-  border-style: solid;
-}
-
-.navThumb {
-    margin-top: 2px;
-}
-#thumbPrev {
-    float: left;
-}
-
-#thumbNext {
-    float: right;
-}
-
-#linkPrev {
-    margin-right: 10px;
-    margin-left: 5px;
-}
-
-#linkNext {
-    margin-right: 5px;
-    margin-left: 10px;
-}
-
-TABLE.infoTable .value {
-    text-align: left;
-}
-
-TABLE.infoTable .label {
-    font-weight: bold;
-    text-align: right;
-    padding-right: 0.5em;
-}
-
-TABLE.infoTable TD.value UL {
-  margin: 0;
-  padding: 0 0 0 1.5em;
-  list-style-type: square;
-}
-
-.rateButton, .rateButtonSelected {
-  background-color:transparent;
-  padding:0;
-  border:0;
-}
-
-.rateButton {
-  cursor: pointer;
-}
-
-.rateButtonSelected {
-  color:inherit;
-  font-weight:bold;
-  font-size:120%;
-}
-
-#comments {
-    text-align: left;
-}
-
-#comments .comment {
-    margin: 3ex 0;
-}
-
-#comments H2 {
-    margin: 1ex 0;
-}
-
-#comments P {
-    margin: 0;
-}
-
-#comments .author {
-    font-weight: bold;
-}
-
-#comments BLOCKQUOTE {
-    margin: 1ex 0 1ex 2em;
-    padding: 4px 4px 0 /* IE bug */ 4px;
-}
-
-#comments BLOCKQUOTE P {
-    margin: 0;
-    padding-bottom: 4px; /* IE bug follow-up */
-}
-#comments BLOCKQUOTE P+P {
-    margin-top: 1ex;
-}
-
-#comments P.userCommentDelete {
-    float: right;
-    margin: 0;
-}
diff --git a/template/public/yoga/install.tpl b/template/public/yoga/install.tpl
deleted file mode 100644
index 2332910e2..000000000
--- a/template/public/yoga/install.tpl
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html 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 style="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;</td>
-    </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>
diff --git a/template/public/yoga/menubar.css b/template/public/yoga/menubar.css
deleted file mode 100644
index f8fbdf914..000000000
--- a/template/public/yoga/menubar.css
+++ /dev/null
@@ -1,108 +0,0 @@
-#menubar {
-    float: left;
-    margin: 0 0 10px 1em;
-    padding: 0;
-    /* Fix against the "double margin of a floated item" IE bug */
-    /* Damned: that screws up top_navbar in opera 7.54/Linux! */
-    display: inline;
-    text-align: left; /* follow-up of the "be nice to IE5" rule */
-}
-
-#menubar DL, #menubar DT, #menubar DD {
-    margin: 0; padding: 0; display: block;
-}
-
-/* H2 properties copied here */
-#menubar DT {
-    font-weight: bold; /* default for h2 */
-    margin: 0;
-    padding: 5px 5px 5px 5px;
-    font-size: 120%;
-    text-align: center;
-}
-
-#menubar UL,
-#menubar HR,
-#menubar FORM,
-#menubar P, /* ooh, careful... */
-#menubar .totalImages {
-    font-size: 92%;
-    margin: 10px 0 10px 10px;
-}
-#menubar UL {
-    list-style-type: square;
-    list-style-position: inside;
-    padding: 0 0 0 2px;
-}
-#menubar UL UL {
-    font-size: 100%;
-    margin-top: 0;
-}
-
-#menubar LI.selected A {
-  font-weight: bold;
-}
-
-#menubar LI.selected LI A {
-  font-weight: normal;
-}
-
-#menubar HR {
-    display: block;
-    margin: 10px auto;
-    width: 90%;
-}
-#menubar FORM P {
-    margin: 5px;
-    font-size: 100%;
-}
-#menubar INPUT {
-    text-indent: 2px;
-}
-
-/* quickconnect form */
-FORM#quickconnect { 
-  margin: 0;
-  padding: 5px;
-}
-
-FORM#quickconnect FIELDSET {
-  margin: 0;
-  padding: 0 0 0.5em 0;
-  overflow: hidden;	/* Correct float issue with Opera 7.5 */
-  width: 100%;		/*        //			      */
-}
-
-FORM#quickconnect P {
-  float: left;
-  clear: left;
-}
-
-FORM#quickconnect P INPUT {
-  margin: 0;
-}
-
-FORM#quickconnect UL.actions {
-  display: inline;
-  float: right;
-  padding: 0;
-  text-align: right;	/* Opera 7.5 */
-  width: 40%;		/* Opera 7.5 cannot find why width:auto fails :-( */
-}
-
-FORM#quickconnect UL.actions,
-FORM#quickconnect P, 
-FORM#quickconnect LABEL {
-  margin: 0 0.5em 0 0.5em;
-}
-
-#menubar #menuTagCloud {
-  text-align: center;
-  margin: 5px 0;
-}
-
-#menubar #menuTagCloud LI
-{
-  display: inline;
-  white-space: nowrap;
-}
diff --git a/template/public/yoga/nbm.tpl b/template/public/yoga/nbm.tpl
deleted file mode 100644
index a22744e5b..000000000
--- a/template/public/yoga/nbm.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- $Id: admin.tpl 1091 2006-03-21 22:58:59Z rub $ -->
-
-<div id="content">
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:nbm_item_notification}</h2>
-  </div>
-
-  <!-- BEGIN errors -->
-  <div class="errors">
-    <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
-    </ul>
-  </div>
-  <!-- END errors -->
-
-  <!-- BEGIN infos -->
-  <div class="infos">
-    <ul>
-      <!-- BEGIN info -->
-      <li>{infos.info.INFO}</li>
-      <!-- END info -->
-    </ul>
-  </div>
-  <!-- END infos -->
-
-</div>
diff --git a/template/public/yoga/notification.tpl b/template/public/yoga/notification.tpl
deleted file mode 100644
index d4b178b42..000000000
--- a/template/public/yoga/notification.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="content">
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:Notification}</h2>
-  </div>
-
-  <p>{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}</p>
-
-  <p><a href="{FEED_URL}">{lang:RSS feed}</a></p>
-</div>
diff --git a/template/public/yoga/picture.tpl b/template/public/yoga/picture.tpl
deleted file mode 100644
index cdeeaf4a8..000000000
--- a/template/public/yoga/picture.tpl
+++ /dev/null
@@ -1,211 +0,0 @@
-<!-- BEGIN information -->
-<div class="pleaseNote">{information.INFORMATION}</div>
-<!-- END information -->
-
-<div id="imageHeaderBar">
-  <div class="browsePath">
-    <a href="{U_HOME}" rel="home">{L_HOME}</a>
-    {LEVEL_SEPARATOR}{SECTION_TITLE}
-    {LEVEL_SEPARATOR}{PICTURE_TITLE}
-  </div>
-  <div class="imageNumber">{PHOTO}</div>
-  <!-- BEGIN title -->
-  <h2>{TITLE}</h2>
-  <!-- END title -->
-</div>
-
-<div id="imageToolBar">
-
-<div class="randomButtons">
-  <a href="{U_SLIDESHOW}" title="{L_SLIDESHOW}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{L_SLIDESHOW}"></a>
-  <a href="{U_METADATA}" title="{L_PICTURE_METADATA}"><img src="{pwg_root}{themeconf:icon_dir}/metadata.png" class="button" alt="{L_PICTURE_METADATA}"></a>
-<!-- BEGIN representative -->
-  <a href="{representative.URL}" title="{lang:set as category representative}"><img src="{pwg_root}{themeconf:icon_dir}/representative.png" class="button" alt="{lang:representative}"/></a>
-<!-- END representative -->
-<!-- BEGIN favorite -->
-  <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" class="button" alt="{favorite.FAVORITE_ALT}"></a>
-<!-- END favorite -->
-<!-- BEGIN download -->
-  <a href="{download.U_DOWNLOAD}" title="{L_DOWNLOAD}"><img src="{pwg_root}{themeconf:icon_dir}/save.png" class="button" alt="{L_DOWNLOAD}"></a>
-<!-- END download -->
-<!-- BEGIN admin -->
-  <a href="{U_ADMIN}" title="{L_ADMIN}"><img src="{pwg_root}{themeconf:icon_dir}/preferences.png" class="button" alt="{L_ADMIN}"></a>
-<!-- END admin -->
-<!-- BEGIN caddie -->
-  <a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{pwg_root}{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"/></a>
-<!-- END caddie -->
-</div>
-
-<div class="navButtons">
-<!-- BEGIN last -->
-  <a class="navButton prev" href="{last.U_IMG}" title="{lang:last_page} : {last.TITLE_IMG}" rel="last"><img src="{pwg_root}{themeconf:icon_dir}/last.png" class="button" alt="{lang:last_page}"></a>
-<!-- END last -->
-<!-- BEGIN next -->
-  <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}" rel="next"><img src="{pwg_root}{themeconf:icon_dir}/right.png" class="button" alt="{lang:next_page}"></a>
-<!-- END next -->
-  <a class="navButton up" href="{U_UP}" title="{lang:thumbnails}" rel="up"><img src="{pwg_root}{themeconf:icon_dir}/up.png" class="button" alt="{L_UP_ALT}"></a>
-<!-- BEGIN previous -->
-  <a class="navButton prev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}" rel="prev"><img src="{pwg_root}{themeconf:icon_dir}/left.png" class="button" alt="{lang:previous_page}"></a>
-<!-- END previous -->
-<!-- BEGIN first -->
-  <a class="navButton prev" href="{first.U_IMG}" title="{lang:first_page} : {first.TITLE_IMG}" rel="first"><img src="{pwg_root}{themeconf:icon_dir}/first.png" class="button" alt="{lang:first_page}"></a>
-<!-- END first -->
-</div>
-
-</div> <!-- imageToolBar -->
-
-<div id="theImage">
-<!-- BEGIN high -->
-<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')">
-<!-- END high -->
-  <img src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}">
-<!-- BEGIN high -->
-</a>
-  <p>{L_PICTURE_HIGH}</p>
-<!-- END high -->
-<!-- BEGIN legend -->
-<p>{legend.COMMENT_IMG}</p>
-<!-- END legend -->
-<!-- BEGIN stop_slideshow -->
-<p>
-  [ <a href="{stop_slideshow.U_SLIDESHOW}">{L_STOP_SLIDESHOW}</a> ]
-</p>
-<!-- END stop_slideshow -->
-</div>
-
-<!-- BEGIN previous -->
-<a class="navThumb" id="thumbPrev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}" rel="prev">
-  <img src="{previous.IMG}" class="thumbLink" id="linkPrev" alt="{previous.TITLE_IMG}">
-</a>
-<!-- END previous -->
-<!-- BEGIN next -->
-<a class="navThumb" id="thumbNext" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}" rel="next">
-  <img src="{next.IMG}" class="thumbLink" id="linkNext" alt="{next.TITLE_IMG}">
-</a>
-<!-- END next -->
-
-<table class="infoTable" summary="Some info about this picture">
-  <tr>
-    <td class="label">{lang:Author}</td>
-    <td class="value">{INFO_AUTHOR}</td>
-  </tr>
-  <tr>
-    <td class="label">{lang:Created on}</td>
-    <td class="value">{INFO_CREATION_DATE}</td>
-  </tr>
-  <tr>
-    <td class="label">{lang:Posted on}</td>
-    <td class="value">{INFO_POSTED_DATE}</td>
-  </tr>
-  <tr>
-    <td class="label">{lang:Dimensions}</td>
-    <td class="value">{INFO_DIMENSIONS}</td>
-  </tr>
-  <tr>
-    <td class="label">{lang:File}</td>
-    <td class="value">{INFO_FILE}</td>
-  </tr>
-  <tr>
-    <td class="label">{lang:Filesize}</td>
-    <td class="value">{INFO_FILESIZE}</td>
-  </tr>
-  <tr>
-    <td class="label">{lang:Tags}</td>
-    <td class="value">{INFO_TAGS}</td>
-  </tr>
-  <tr>
-    <td class="label">{lang:Categories}</td>
-    <td class="value">
-      <ul>
-        <!-- BEGIN category -->
-        <li>{category.LINE}</li>
-        <!-- END category -->
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <td class="label">{lang:Visits}</td>
-    <td class="value">{INFO_VISITS}</td>
-  </tr>
-  <!-- BEGIN info_rate -->
-  <tr>
-    <td class="label">{lang:Average rate}</td>
-    <td class="value">{info_rate.CONTENT}</td>
-  </tr>
-  <!-- END info_rate -->
-</table>
-
-<!-- BEGIN metadata -->
-<table class="infoTable" summary="Some more (technical) info about this picture">
-  <!-- BEGIN headline -->
-  <tr>
-    <th colspan="2">{metadata.headline.TITLE}</th>
-  </tr>
-  <!-- END headline -->
-  <!-- BEGIN line -->
-  <tr>
-    <td class="label">{metadata.line.KEY}</td>
-    <td class="value">{metadata.line.VALUE}</td>
-  </tr>
-  <!-- END line -->
-</table>
-<!-- END metadata -->
-
-<!-- BEGIN rate -->
-<form action="{rate.F_ACTION}" method="post">
-<div>{rate.SENTENCE} :
-<!-- BEGIN rate_option -->
-{rate.rate_option.SEPARATOR}
-<!-- BEGIN my_rate -->
-<input type="button" name="rate" value="{rate.rate_option.OPTION}" class="rateButtonSelected" />
-<!-- END my_rate -->
-<!-- BEGIN not_my_rate -->
-<input type="submit" name="rate" value="{rate.rate_option.OPTION}" class="rateButton" />
-<!-- END not_my_rate -->
-<!-- END rate_option -->
-</div>
-</form>
-<!-- END rate -->
-
-<hr class="separation">
-
-<!-- BEGIN comments -->
-<div id="comments">
-  <h2>[{comments.NB_COMMENT}] {L_COMMENT_TITLE}</h2>
-
-  <div class="navigationBar">{comments.NAV_BAR}</div>
-
-  <!-- BEGIN comment -->
-  <div class="comment">
-    <!-- BEGIN delete -->
-    <p class="userCommentDelete">
-    <a href="{comments.comment.delete.U_COMMENT_DELETE}" title="{L_DELETE_COMMENT}">
-      <img src="{pwg_root}{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{L_DELETE}]"/>
-    </a>
-    </p>
-    <!-- END delete -->
-    <p class="commentInfo"><span class="author">{comments.comment.COMMENT_AUTHOR}</span> - {comments.comment.COMMENT_DATE}</p>
-    <blockquote>{comments.comment.COMMENT}</blockquote>
-  </div>
-  <!-- END comment -->
-
-  <!-- BEGIN add_comment -->
-  <form  method="post" action="{U_ADD_COMMENT}" class="filter" id="addComment">
-    <fieldset>
-      <legend>{L_ADD_COMMENT}</legend>
-      <!-- BEGIN author_field -->
-      <label>{L_AUTHOR}<input type="text" name="author"></label>
-      <!-- END author_field -->
-      <!-- BEGIN author_known -->
-      <input type="hidden" name="author"  value="{comments.add_comment.author_known.KNOWN_AUTHOR}">
-      <!-- END author_known -->
-      <label>{L_COMMENT}<textarea name="content" rows="10" cols="80"></textarea></label>
-      <input type="submit" value="{L_SUBMIT}" {TAG_INPUT_ENABLED}>
-    </fieldset>
-  </form>
-  <!-- END add_comment -->
-
-</div>
-<!-- END comments -->
-
-
diff --git a/template/public/yoga/popuphelp.css b/template/public/yoga/popuphelp.css
deleted file mode 100644
index b61b7952d..000000000
--- a/template/public/yoga/popuphelp.css
+++ /dev/null
@@ -1,22 +0,0 @@
-BODY#thePopuphelpPage #copyright {
-  display: none;
-}
-
-BODY#thePopuphelpPage #theHeader P {
-  display: none;
-}
-
-BODY#thePopuphelpPage #content P {
-  text-align: justify;
-  padding: 0.5em;
-}
-
-BODY#thePopuphelpPage #content OL LI,
-BODY#thePopuphelpPage #content UL LI
-{
-  margin-bottom: 0.5em;
-}
-
-BODY#thePopuphelpPage P#pageBottomActions A {
-  border: none;
-}
diff --git a/template/public/yoga/popuphelp.tpl b/template/public/yoga/popuphelp.tpl
deleted file mode 100644
index 3b3e27328..000000000
--- a/template/public/yoga/popuphelp.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="content">
-{HELP_CONTENT}
-</div> <!-- content -->
-
-<p id="pageBottomActions"><a href="#" onclick="window.close();" title="{lang:Close this window}"><img src="{themeconf:icon_dir}/exit.png" class="button" alt="close"></a></p>
diff --git a/template/public/yoga/print.css b/template/public/yoga/print.css
deleted file mode 100644
index bb564378d..000000000
--- a/template/public/yoga/print.css
+++ /dev/null
@@ -1,14 +0,0 @@
-#menubar, #content .navigationBar, UL.categoryActions, #content DIV.calendarViews, .calendarBar,
-#imageToolBar, .navThumb, #addComment {
-    display: none;
-}
-
-BODY {
-    margin: 0;
-    color: #000000;
-    background: #ffffff;
-}
-
-#content {
-    margin: 0;
-}
diff --git a/template/public/yoga/profile.tpl b/template/public/yoga/profile.tpl
deleted file mode 100644
index b3837f454..000000000
--- a/template/public/yoga/profile.tpl
+++ /dev/null
@@ -1,148 +0,0 @@
-<div id="content">
-
-<!-- BEGIN errors -->
-<div class="errors">
-  <ul>
-    <!-- BEGIN error -->
-    <li>{errors.error.ERROR}</li>
-    <!-- END error -->
-  </ul>
-</div>
-<!-- END errors -->
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_RETURN}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:Profile}</h2>
-  </div>
-
-<form method="post" name="profile" action="{F_ACTION}" id="profile" class="properties">
-
-  <fieldset>
-    <legend>{L_REGISTRATION_INFO}</legend>
-    <input type="hidden" name="userid" value="{USERID}" />
-    <ul>
-      <li>
-        <span class="property">{lang:Username}</span>
-        {USERNAME}
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="mail_address">{lang:Email address}</label>
-        </span>
-        <input type="text" name="mail_address" id="mail_address" value="{EMAIL}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="password">{L_CURRENT_PASSWORD}</label>
-        </span>
-        <input type="password" name="password" id="password" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="use_new_pwd">{L_NEW_PASSWORD}</label>
-        </span>
-        <input type="password" name="use_new_pwd" id="use_new_pwd" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="passwordConf">{L_CONFIRM_PASSWORD}</label>
-        </span>
-        <input type="password" name="passwordConf" id="passwordConf" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-    </ul>
-  </fieldset>
-
-  <fieldset>
-    <legend>{L_PREFERENCES}</legend>
-
-    <ul>
-      <li>
-        <span class="property">
-          <label for="nb_image_line">{L_NB_IMAGE_LINE}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{NB_IMAGE_LINE}"
-               onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="nb_line_page">{L_NB_ROW_PAGE}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{NB_ROW_PAGE}"
-               onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="template">{L_STYLE_SELECT}</label>
-        </span>
-        <select name="template" id="template" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-          <!-- BEGIN template_option -->
-          <option value="{template_option.VALUE}" {template_option.SELECTED}>{template_option.CONTENT}</option>
-          <!-- END template_option -->
-        </select>
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="language">{L_LANG_SELECT}</label>
-        </span>
-        <select name="language" id="language" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-          <!-- BEGIN language_option -->
-          <option value="{language_option.VALUE}" {language_option.SELECTED}>{language_option.CONTENT}</option>
-          <!-- END language_option -->
-        </select>
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="recent_period">{L_RECENT_PERIOD}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{RECENT_PERIOD}"
-               onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">{L_EXPAND_TREE}</span>
-        <label><input type="radio" class="radio" name="expand" value="true" {EXPAND_TREE_YES}> {L_YES}</label>
-        <label><input type="radio" class="radio" name="expand" value="false" {EXPAND_TREE_NO}> {L_NO}</label>
-      </li>
-
-      <li>
-        <span class="property">{L_NB_COMMENTS}</span>
-        <label><input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES}> {L_YES}</label>
-        <label><input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO}> {L_NO}</label>
-      </li>
- 
-      <li>
-        <span class="property">
-          <label for="maxwidth">{L_MAXWIDTH}</label>
-        </span>
-        <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{MAXWIDTH}"
-               onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="maxheight">{L_MAXHEIGHT}</label>
-        </span>
-        <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{MAXHEIGHT}"
-               onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-    </ul>
-  </fieldset>
-
-  <p class="bottomButtons">
-    <input type="submit" name="validate" value="{L_SUBMIT}">
-    <input type="reset" name="reset" value="{L_RESET}">
-  </p>
-
-</form>
-
-</div> <!-- content -->
diff --git a/template/public/yoga/redirect.tpl b/template/public/yoga/redirect.tpl
deleted file mode 100644
index 446f187a3..000000000
--- a/template/public/yoga/redirect.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>{U_REDIRECT_MSG}</p>
-<p><a href="{U_REFRESH}">{lang:click_to_redirect}</a></p>
diff --git a/template/public/yoga/register.tpl b/template/public/yoga/register.tpl
deleted file mode 100644
index be3fb4a79..000000000
--- a/template/public/yoga/register.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<div id="registerPage">
-
-<div id="content">
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:Registration}</h2>
-  </div>
-
-  <!-- BEGIN errors -->
-  <div class="errors">
-    <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
-    </ul>
-  </div>
-  <!-- END errors -->
-
-<form method="post" action="{F_ACTION}" class="properties" name="register_form">
-  <fieldset>
-    <legend>{lang:Enter your personnal informations}</legend>
-
-    <ul>
-      <li>
-        <span class="property">
-          <label for="login">* {lang:Username}</label>
-        </span>
-        <input type="text" name="login" id="login" value="{F_LOGIN}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="password">* {lang:Password}</label>
-        </span>
-        <input type="password" name="password" id="password" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="password_conf">* {lang:Confirm Password}</label>
-        </span>
-        <input type="password" name="password_conf" id="password_conf" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="mail_address">{lang:Mail address}</label>
-        </span>
-        <input type="text" name="mail_address" id="mail_address" value="{F_EMAIL}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
-        ({lang:useful when password forgotten})
-      </li>
-    </ul>
-
-  </fieldset>
-
-  <p class="bottomButtons">
-    <input type="submit" name="submit" value="{lang:Register}">
-    <input type="reset" value="{lang:Reset}">
-  </p>
-
-</form>
-
-<script type="text/javascript"><!--
-document.register_form.login.focus();
-//--></script>
-
-</div> <!-- content -->
-</div> <!-- registerPage -->
diff --git a/template/public/yoga/search_rules.tpl b/template/public/yoga/search_rules.tpl
deleted file mode 100644
index 921df4a12..000000000
--- a/template/public/yoga/search_rules.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-<div id="content">
-<h2>{lang:Search rules}</h2>
-
-<p>{INTRODUCTION}</p>
-
-<ul>
-
-  <!-- BEGIN words -->
-  <li>{words.CONTENT}</li>
-  <!-- END words -->
-
-  <!-- BEGIN tags -->
-  <li>
-    <p>{tags.LIST_INTRO}</p>
-
-    <ul>
-      <!-- BEGIN tag -->
-      <li>{tags.tag.NAME}</li>
-      <!-- END tag -->
-    </ul>
-  </li>
-  <!-- END tags -->
-  
-  <!-- BEGIN author -->
-  <li>{author.CONTENT}</li>
-  <!-- END author -->
-
-  <!-- BEGIN date_creation -->
-  <li>{date_creation.CONTENT}</li>
-  <!-- END date_creation -->
-
-  <!-- BEGIN date_available -->
-  <li>{date_available.CONTENT}</li>
-  <!-- END date_available -->
-
-  <!-- BEGIN categories -->
-  <li>
-    <p>{categories.LIST_INTRO}</p>
-
-    <ul>
-      <!-- BEGIN category -->
-      <li>{categories.category.NAME}</li>
-      <!-- END category -->
-    </ul>
-  </li>
-  <!-- END categories -->
-  
-</ul>
-
-</div> <!-- content -->
-
-<p id="pageBottomActions">
-  <a href="#" onclick="window.close();" title="{lang:Close this window}">
-    <img src="{themeconf:icon_dir}/exit.png" class="button" alt="close">
-  </a>
-</p>
diff --git a/template/public/yoga/tags.tpl b/template/public/yoga/tags.tpl
deleted file mode 100644
index 33f69ca69..000000000
--- a/template/public/yoga/tags.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- $Id: comments.tpl 960 2005-12-03 17:33:38Z chrisaga $ -->
-<div id="content">
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
-    </ul>
-    <h2>{lang:Tags}</h2>
-  </div>
-
-  <ul id="fullTagCloud">
-    <!-- BEGIN tag -->
-    <li><a href="{tag.URL}" class="{tag.CLASS}" title="{tag.TITLE}">{tag.NAME}</a></li>
-    <!-- END tag -->
-  </ul>
-
-</div> <!-- content -->
diff --git a/template/public/yoga/theme/clear/themeconf.inc.php b/template/public/yoga/theme/clear/themeconf.inc.php
deleted file mode 100644
index ef23e2d0e..000000000
--- a/template/public/yoga/theme/clear/themeconf.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'clear',
-  'icon_dir' => 'template/public/yoga/icon',
-  'admin_icon_dir' => 'template/public/yoga/icon/admin',
-  'mime_icon_dir' => 'template/public/yoga/icon/mimetypes/'
-);
-?>
diff --git a/template/public/yoga/theme/dark/images/tableh1_bg.png b/template/public/yoga/theme/dark/images/tableh1_bg.png
deleted file mode 100644
index c7785d0f6..000000000
--- a/template/public/yoga/theme/dark/images/tableh1_bg.png
+++ /dev/null
diff --git a/template/public/yoga/theme/dark/images/tableh2_bg.png b/template/public/yoga/theme/dark/images/tableh2_bg.png
deleted file mode 100644
index d8c29f93d..000000000
--- a/template/public/yoga/theme/dark/images/tableh2_bg.png
+++ /dev/null
diff --git a/template/public/yoga/theme/dark/themeconf.inc.php b/template/public/yoga/theme/dark/themeconf.inc.php
deleted file mode 100644
index 5cf6b03f1..000000000
--- a/template/public/yoga/theme/dark/themeconf.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'dark',
-  'icon_dir' => 'template/public/yoga/icon',
-  'admin_icon_dir' => 'template/public/yoga/icon/admin',
-  'mime_icon_dir' => 'template/public/yoga/icon/mimetypes/'
-);
-?>
diff --git a/template/public/yoga/upload.tpl b/template/public/yoga/upload.tpl
deleted file mode 100644
index fcf27b543..000000000
--- a/template/public/yoga/upload.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<h2>{L_TITLE}</h2>
-<!-- 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/admin/yoga/about.tpl b/template/yoga/about.tpl
index 6efa0e9ee..6efa0e9ee 100644
--- a/template/admin/yoga/about.tpl
+++ b/template/yoga/about.tpl
diff --git a/template/public/yoga/admin.tpl b/template/yoga/admin.tpl
index 24177e427..24177e427 100644
--- a/template/public/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
diff --git a/template/public/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index ec4b66d43..ec4b66d43 100644
--- a/template/public/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
diff --git a/template/public/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index ed8861d84..ed8861d84 100644
--- a/template/public/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
diff --git a/template/public/yoga/admin/cat_move.tpl b/template/yoga/admin/cat_move.tpl
index 5d5247f2f..5d5247f2f 100644
--- a/template/public/yoga/admin/cat_move.tpl
+++ b/template/yoga/admin/cat_move.tpl
diff --git a/template/public/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl
index 891dc37d4..891dc37d4 100644
--- a/template/public/yoga/admin/cat_options.tpl
+++ b/template/yoga/admin/cat_options.tpl
diff --git a/template/admin/yoga/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl
index 9c8fafa69..9c8fafa69 100644
--- a/template/admin/yoga/admin/cat_perm.tpl
+++ b/template/yoga/admin/cat_perm.tpl
diff --git a/template/admin/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl
index 065a1c8ee..065a1c8ee 100644
--- a/template/admin/yoga/admin/comments.tpl
+++ b/template/yoga/admin/comments.tpl
diff --git a/template/public/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index a0578692d..a0578692d 100644
--- a/template/public/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
diff --git a/template/admin/yoga/admin/double_select.tpl b/template/yoga/admin/double_select.tpl
index 2bfa28072..2bfa28072 100644
--- a/template/admin/yoga/admin/double_select.tpl
+++ b/template/yoga/admin/double_select.tpl
diff --git a/template/public/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index 7bb9d7006..7bb9d7006 100644
--- a/template/public/yoga/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
diff --git a/template/admin/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl
index 5adce8833..5adce8833 100644
--- a/template/admin/yoga/admin/element_set_unit.tpl
+++ b/template/yoga/admin/element_set_unit.tpl
diff --git a/template/public/yoga/admin/group_list.tpl b/template/yoga/admin/group_list.tpl
index 7b7dd67eb..7b7dd67eb 100644
--- a/template/public/yoga/admin/group_list.tpl
+++ b/template/yoga/admin/group_list.tpl
diff --git a/template/admin/yoga/admin/group_perm.tpl b/template/yoga/admin/group_perm.tpl
index 91c2f637a..91c2f637a 100644
--- a/template/admin/yoga/admin/group_perm.tpl
+++ b/template/yoga/admin/group_perm.tpl
diff --git a/template/public/yoga/admin/intro.tpl b/template/yoga/admin/intro.tpl
index 58c6b2510..58c6b2510 100644
--- a/template/public/yoga/admin/intro.tpl
+++ b/template/yoga/admin/intro.tpl
diff --git a/template/public/yoga/admin/maintenance.tpl b/template/yoga/admin/maintenance.tpl
index 697e0954b..697e0954b 100644
--- a/template/public/yoga/admin/maintenance.tpl
+++ b/template/yoga/admin/maintenance.tpl
diff --git a/template/admin/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index 22309e96d..22309e96d 100644
--- a/template/admin/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
diff --git a/template/public/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index c10e7744e..c10e7744e 100644
--- a/template/public/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
diff --git a/template/admin/yoga/admin/rating.tpl b/template/yoga/admin/rating.tpl
index ac78bf419..ac78bf419 100644
--- a/template/admin/yoga/admin/rating.tpl
+++ b/template/yoga/admin/rating.tpl
diff --git a/template/public/yoga/admin/site_manager.tpl b/template/yoga/admin/site_manager.tpl
index 88b77a362..88b77a362 100644
--- a/template/public/yoga/admin/site_manager.tpl
+++ b/template/yoga/admin/site_manager.tpl
diff --git a/template/admin/yoga/admin/site_update.tpl b/template/yoga/admin/site_update.tpl
index d3d0221ca..d3d0221ca 100644
--- a/template/admin/yoga/admin/site_update.tpl
+++ b/template/yoga/admin/site_update.tpl
diff --git a/template/public/yoga/admin/stats.tpl b/template/yoga/admin/stats.tpl
index 75de81f79..75de81f79 100644
--- a/template/public/yoga/admin/stats.tpl
+++ b/template/yoga/admin/stats.tpl
diff --git a/template/admin/yoga/admin/tags.tpl b/template/yoga/admin/tags.tpl
index 8fe666b59..8fe666b59 100644
--- a/template/admin/yoga/admin/tags.tpl
+++ b/template/yoga/admin/tags.tpl
diff --git a/template/public/yoga/admin/thumbnail.tpl b/template/yoga/admin/thumbnail.tpl
index cf5345d43..cf5345d43 100644
--- a/template/public/yoga/admin/thumbnail.tpl
+++ b/template/yoga/admin/thumbnail.tpl
diff --git a/template/admin/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index e6c1e81b6..e6c1e81b6 100644
--- a/template/admin/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
diff --git a/template/admin/yoga/admin/user_perm.tpl b/template/yoga/admin/user_perm.tpl
index a24fd9096..a24fd9096 100644
--- a/template/admin/yoga/admin/user_perm.tpl
+++ b/template/yoga/admin/user_perm.tpl
diff --git a/template/public/yoga/admin/waiting.tpl b/template/yoga/admin/waiting.tpl
index b48aa314b..b48aa314b 100644
--- a/template/public/yoga/admin/waiting.tpl
+++ b/template/yoga/admin/waiting.tpl
diff --git a/template/public/yoga/comments.tpl b/template/yoga/comments.tpl
index 6bf28d33b..6bf28d33b 100644
--- a/template/public/yoga/comments.tpl
+++ b/template/yoga/comments.tpl
diff --git a/template/public/yoga/content.css b/template/yoga/content.css
index 7a8909856..7a8909856 100644
--- a/template/public/yoga/content.css
+++ b/template/yoga/content.css
diff --git a/template/admin/yoga/dclear.css b/template/yoga/dclear.css
index e69de29bb..e69de29bb 100644
--- a/template/admin/yoga/dclear.css
+++ b/template/yoga/dclear.css
diff --git a/template/public/yoga/default-colors.css b/template/yoga/default-colors.css
index 8b73f966b..8b73f966b 100644
--- a/template/public/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
diff --git a/template/public/yoga/default-layout.css b/template/yoga/default-layout.css
index a9fc2da1c..a9fc2da1c 100644
--- a/template/public/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
diff --git a/template/public/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css
index 8dad42298..8dad42298 100644
--- a/template/public/yoga/fix-ie5-ie6.css
+++ b/template/yoga/fix-ie5-ie6.css
diff --git a/template/public/yoga/fix-khtml.css b/template/yoga/fix-khtml.css
index 6853313e9..6853313e9 100644
--- a/template/public/yoga/fix-khtml.css
+++ b/template/yoga/fix-khtml.css
diff --git a/template/admin/yoga/footer.tpl b/template/yoga/footer.tpl
index 44d905995..44d905995 100644
--- a/template/admin/yoga/footer.tpl
+++ b/template/yoga/footer.tpl
diff --git a/template/admin/yoga/header.tpl b/template/yoga/header.tpl
index 9776eabe8..d432d7b63 100644
--- a/template/admin/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -4,16 +4,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
 <link rel="shortcut icon" type="image/x-icon" href="{pwg_root}template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/layout.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/layout.css">
 <!-- the next css is used to fix khtml (Konqueror/Safari) issue
 the "text/nonsense" prevents gecko based browsers to load it -->
-<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/admin/{themeconf:template}/fix-khtml.css">
+<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-khtml.css">
 <!--[if lt IE 7]>
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/fix-ie5-ie6.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie5-ie6.css">
 <![endif]-->
-<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/admin/{themeconf:template}/print.css">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/default-colors.css">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/theme/{themeconf:theme}/theme.css">
+<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/{themeconf:template}/print.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-colors.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/theme.css">
 <!-- BEGIN next -->
 <link rel="prefetch" href="{next.U_IMG_SRC}">
 <!-- END next -->
diff --git a/template/admin/yoga/icon/add_tag.png b/template/yoga/icon/add_tag.png
index 9051a1d26..9051a1d26 100644
--- a/template/admin/yoga/icon/add_tag.png
+++ b/template/yoga/icon/add_tag.png
diff --git a/template/admin/yoga/icon/admin/errors.png b/template/yoga/icon/admin/errors.png
index 3c8a37df5..3c8a37df5 100644
--- a/template/admin/yoga/icon/admin/errors.png
+++ b/template/yoga/icon/admin/errors.png
diff --git a/template/admin/yoga/icon/admin/infos.png b/template/yoga/icon/admin/infos.png
index dc8c8a457..dc8c8a457 100644
--- a/template/admin/yoga/icon/admin/infos.png
+++ b/template/yoga/icon/admin/infos.png
diff --git a/template/admin/yoga/icon/caddie_add.png b/template/yoga/icon/caddie_add.png
index eb20f4e06..eb20f4e06 100644
--- a/template/admin/yoga/icon/caddie_add.png
+++ b/template/yoga/icon/caddie_add.png
diff --git a/template/admin/yoga/icon/calendar.png b/template/yoga/icon/calendar.png
index e0a44a13d..e0a44a13d 100644
--- a/template/admin/yoga/icon/calendar.png
+++ b/template/yoga/icon/calendar.png
diff --git a/template/admin/yoga/icon/calendar_created.png b/template/yoga/icon/calendar_created.png
index 14a84c43c..14a84c43c 100644
--- a/template/admin/yoga/icon/calendar_created.png
+++ b/template/yoga/icon/calendar_created.png
diff --git a/template/admin/yoga/icon/category_children.png b/template/yoga/icon/category_children.png
index 7205c3f61..7205c3f61 100644
--- a/template/admin/yoga/icon/category_children.png
+++ b/template/yoga/icon/category_children.png
diff --git a/template/admin/yoga/icon/category_delete.png b/template/yoga/icon/category_delete.png
index da796da11..da796da11 100644
--- a/template/admin/yoga/icon/category_delete.png
+++ b/template/yoga/icon/category_delete.png
diff --git a/template/admin/yoga/icon/category_edit.png b/template/yoga/icon/category_edit.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/admin/yoga/icon/category_edit.png
+++ b/template/yoga/icon/category_edit.png
diff --git a/template/admin/yoga/icon/category_elements.png b/template/yoga/icon/category_elements.png
index 1d367b38f..1d367b38f 100644
--- a/template/admin/yoga/icon/category_elements.png
+++ b/template/yoga/icon/category_elements.png
diff --git a/template/admin/yoga/icon/category_jump-to.png b/template/yoga/icon/category_jump-to.png
index 62db1f4ee..62db1f4ee 100644
--- a/template/admin/yoga/icon/category_jump-to.png
+++ b/template/yoga/icon/category_jump-to.png
diff --git a/template/admin/yoga/icon/category_permissions.png b/template/yoga/icon/category_permissions.png
index 4780841ae..4780841ae 100644
--- a/template/admin/yoga/icon/category_permissions.png
+++ b/template/yoga/icon/category_permissions.png
diff --git a/template/admin/yoga/icon/category_representant_random.png b/template/yoga/icon/category_representant_random.png
index dfa69846f..dfa69846f 100644
--- a/template/admin/yoga/icon/category_representant_random.png
+++ b/template/yoga/icon/category_representant_random.png
diff --git a/template/admin/yoga/icon/del_favorite.png b/template/yoga/icon/del_favorite.png
index cfc609749..cfc609749 100644
--- a/template/admin/yoga/icon/del_favorite.png
+++ b/template/yoga/icon/del_favorite.png
diff --git a/template/admin/yoga/icon/delete.png b/template/yoga/icon/delete.png
index af10be03e..af10be03e 100644
--- a/template/admin/yoga/icon/delete.png
+++ b/template/yoga/icon/delete.png
diff --git a/template/admin/yoga/icon/exit.png b/template/yoga/icon/exit.png
index 2aafbb4cb..2aafbb4cb 100644
--- a/template/admin/yoga/icon/exit.png
+++ b/template/yoga/icon/exit.png
diff --git a/template/admin/yoga/icon/favorite.png b/template/yoga/icon/favorite.png
index 58befd9e3..58befd9e3 100644
--- a/template/admin/yoga/icon/favorite.png
+++ b/template/yoga/icon/favorite.png
diff --git a/template/admin/yoga/icon/first.png b/template/yoga/icon/first.png
index 2b8db1cff..2b8db1cff 100644
--- a/template/admin/yoga/icon/first.png
+++ b/template/yoga/icon/first.png
diff --git a/template/admin/yoga/icon/help.png b/template/yoga/icon/help.png
index c76f68292..c76f68292 100644
--- a/template/admin/yoga/icon/help.png
+++ b/template/yoga/icon/help.png
diff --git a/template/admin/yoga/icon/home.png b/template/yoga/icon/home.png
index cce450d85..cce450d85 100644
--- a/template/admin/yoga/icon/home.png
+++ b/template/yoga/icon/home.png
diff --git a/template/admin/yoga/icon/last.png b/template/yoga/icon/last.png
index 12e1367a7..12e1367a7 100644
--- a/template/admin/yoga/icon/last.png
+++ b/template/yoga/icon/last.png
diff --git a/template/admin/yoga/icon/left.png b/template/yoga/icon/left.png
index 63d306c9c..63d306c9c 100644
--- a/template/admin/yoga/icon/left.png
+++ b/template/yoga/icon/left.png
diff --git a/template/admin/yoga/icon/lost_password.png b/template/yoga/icon/lost_password.png
index ad6d71422..ad6d71422 100644
--- a/template/admin/yoga/icon/lost_password.png
+++ b/template/yoga/icon/lost_password.png
diff --git a/template/admin/yoga/icon/metadata.png b/template/yoga/icon/metadata.png
index d5d8fa6dc..d5d8fa6dc 100644
--- a/template/admin/yoga/icon/metadata.png
+++ b/template/yoga/icon/metadata.png
diff --git a/template/admin/yoga/icon/mimetypes/avi.png b/template/yoga/icon/mimetypes/avi.png
index 065f0b282..065f0b282 100644
--- a/template/admin/yoga/icon/mimetypes/avi.png
+++ b/template/yoga/icon/mimetypes/avi.png
diff --git a/template/admin/yoga/icon/mimetypes/mp3.png b/template/yoga/icon/mimetypes/mp3.png
index afb7e1b0a..afb7e1b0a 100644
--- a/template/admin/yoga/icon/mimetypes/mp3.png
+++ b/template/yoga/icon/mimetypes/mp3.png
diff --git a/template/admin/yoga/icon/mimetypes/mpg.png b/template/yoga/icon/mimetypes/mpg.png
index f7dbd2388..f7dbd2388 100644
--- a/template/admin/yoga/icon/mimetypes/mpg.png
+++ b/template/yoga/icon/mimetypes/mpg.png
diff --git a/template/admin/yoga/icon/mimetypes/ogg.png b/template/yoga/icon/mimetypes/ogg.png
index ead3f62c3..ead3f62c3 100644
--- a/template/admin/yoga/icon/mimetypes/ogg.png
+++ b/template/yoga/icon/mimetypes/ogg.png
diff --git a/template/admin/yoga/icon/mimetypes/zip.png b/template/yoga/icon/mimetypes/zip.png
index 1f08fe1a3..1f08fe1a3 100644
--- a/template/admin/yoga/icon/mimetypes/zip.png
+++ b/template/yoga/icon/mimetypes/zip.png
diff --git a/template/admin/yoga/icon/normal_mode.png b/template/yoga/icon/normal_mode.png
index 07318b568..07318b568 100644
--- a/template/admin/yoga/icon/normal_mode.png
+++ b/template/yoga/icon/normal_mode.png
diff --git a/template/admin/yoga/icon/permissions.png b/template/yoga/icon/permissions.png
index 33091eb85..33091eb85 100644
--- a/template/admin/yoga/icon/permissions.png
+++ b/template/yoga/icon/permissions.png
diff --git a/template/admin/yoga/icon/preferences.png b/template/yoga/icon/preferences.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/admin/yoga/icon/preferences.png
+++ b/template/yoga/icon/preferences.png
diff --git a/template/admin/yoga/icon/recent.png b/template/yoga/icon/recent.png
index 78c1428ca..78c1428ca 100644
--- a/template/admin/yoga/icon/recent.png
+++ b/template/yoga/icon/recent.png
diff --git a/template/admin/yoga/icon/register.png b/template/yoga/icon/register.png
index d1dd3c834..d1dd3c834 100644
--- a/template/admin/yoga/icon/register.png
+++ b/template/yoga/icon/register.png
diff --git a/template/admin/yoga/icon/representative.png b/template/yoga/icon/representative.png
index f1141d91b..f1141d91b 100644
--- a/template/admin/yoga/icon/representative.png
+++ b/template/yoga/icon/representative.png
diff --git a/template/admin/yoga/icon/right.png b/template/yoga/icon/right.png
index f998098e4..f998098e4 100644
--- a/template/admin/yoga/icon/right.png
+++ b/template/yoga/icon/right.png
diff --git a/template/admin/yoga/icon/save.png b/template/yoga/icon/save.png
index b4b9da08b..b4b9da08b 100644
--- a/template/admin/yoga/icon/save.png
+++ b/template/yoga/icon/save.png
diff --git a/template/admin/yoga/icon/search_rules.png b/template/yoga/icon/search_rules.png
index 300186647..300186647 100644
--- a/template/admin/yoga/icon/search_rules.png
+++ b/template/yoga/icon/search_rules.png
diff --git a/template/admin/yoga/icon/slideshow.png b/template/yoga/icon/slideshow.png
index 455d73fdf..455d73fdf 100644
--- a/template/admin/yoga/icon/slideshow.png
+++ b/template/yoga/icon/slideshow.png
diff --git a/template/admin/yoga/icon/sync_metadata.png b/template/yoga/icon/sync_metadata.png
index 03570ead6..03570ead6 100644
--- a/template/admin/yoga/icon/sync_metadata.png
+++ b/template/yoga/icon/sync_metadata.png
diff --git a/template/admin/yoga/icon/up.png b/template/yoga/icon/up.png
index 0c9cda5b1..0c9cda5b1 100644
--- a/template/admin/yoga/icon/up.png
+++ b/template/yoga/icon/up.png
diff --git a/template/public/yoga/identification.tpl b/template/yoga/identification.tpl
index dd07d0135..dd07d0135 100644
--- a/template/public/yoga/identification.tpl
+++ b/template/yoga/identification.tpl
diff --git a/template/admin/yoga/image.css b/template/yoga/image.css
index 9ecbaea08..9ecbaea08 100644
--- a/template/admin/yoga/image.css
+++ b/template/yoga/image.css
diff --git a/template/public/yoga/index.tpl b/template/yoga/index.tpl
index becf011ce..becf011ce 100644
--- a/template/public/yoga/index.tpl
+++ b/template/yoga/index.tpl
diff --git a/template/admin/yoga/install.tpl b/template/yoga/install.tpl
index 2332910e2..2332910e2 100644
--- a/template/admin/yoga/install.tpl
+++ b/template/yoga/install.tpl
diff --git a/template/public/yoga/layout.css b/template/yoga/layout.css
index 1f6c6f4e3..79cb2911f 100644
--- a/template/public/yoga/layout.css
+++ b/template/yoga/layout.css
@@ -9,5 +9,5 @@
 /* Override properties with import local file */
 @import "local-layout.css";
 /* common css */
-@import "../../../template-common/layout.css";
+@import "../../template-common/layout.css";
 
diff --git a/template/public/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl
index 8c00b433e..8c00b433e 100644
--- a/template/public/yoga/mainpage_categories.tpl
+++ b/template/yoga/mainpage_categories.tpl
diff --git a/template/admin/yoga/menubar.css b/template/yoga/menubar.css
index f8fbdf914..f8fbdf914 100644
--- a/template/admin/yoga/menubar.css
+++ b/template/yoga/menubar.css
diff --git a/template/public/yoga/month_calendar.tpl b/template/yoga/month_calendar.tpl
index 7e531e7c7..7e531e7c7 100644
--- a/template/public/yoga/month_calendar.tpl
+++ b/template/yoga/month_calendar.tpl
diff --git a/template/admin/yoga/nbm.tpl b/template/yoga/nbm.tpl
index a22744e5b..a22744e5b 100644
--- a/template/admin/yoga/nbm.tpl
+++ b/template/yoga/nbm.tpl
diff --git a/template/admin/yoga/notification.tpl b/template/yoga/notification.tpl
index d4b178b42..d4b178b42 100644
--- a/template/admin/yoga/notification.tpl
+++ b/template/yoga/notification.tpl
diff --git a/template/public/yoga/password.tpl b/template/yoga/password.tpl
index f581507e2..f581507e2 100644
--- a/template/public/yoga/password.tpl
+++ b/template/yoga/password.tpl
diff --git a/template/admin/yoga/picture.tpl b/template/yoga/picture.tpl
index cdeeaf4a8..cdeeaf4a8 100644
--- a/template/admin/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
diff --git a/template/admin/yoga/popuphelp.css b/template/yoga/popuphelp.css
index b61b7952d..b61b7952d 100644
--- a/template/admin/yoga/popuphelp.css
+++ b/template/yoga/popuphelp.css
diff --git a/template/admin/yoga/popuphelp.tpl b/template/yoga/popuphelp.tpl
index 3b3e27328..3b3e27328 100644
--- a/template/admin/yoga/popuphelp.tpl
+++ b/template/yoga/popuphelp.tpl
diff --git a/template/admin/yoga/print.css b/template/yoga/print.css
index bb564378d..bb564378d 100644
--- a/template/admin/yoga/print.css
+++ b/template/yoga/print.css
diff --git a/template/admin/yoga/profile.tpl b/template/yoga/profile.tpl
index b3837f454..b3837f454 100644
--- a/template/admin/yoga/profile.tpl
+++ b/template/yoga/profile.tpl
diff --git a/template/admin/yoga/redirect.tpl b/template/yoga/redirect.tpl
index 446f187a3..446f187a3 100644
--- a/template/admin/yoga/redirect.tpl
+++ b/template/yoga/redirect.tpl
diff --git a/template/admin/yoga/register.tpl b/template/yoga/register.tpl
index be3fb4a79..be3fb4a79 100644
--- a/template/admin/yoga/register.tpl
+++ b/template/yoga/register.tpl
diff --git a/template/public/yoga/search.tpl b/template/yoga/search.tpl
index 1e3c9be2d..1e3c9be2d 100644
--- a/template/public/yoga/search.tpl
+++ b/template/yoga/search.tpl
diff --git a/template/admin/yoga/search_rules.tpl b/template/yoga/search_rules.tpl
index 921df4a12..921df4a12 100644
--- a/template/admin/yoga/search_rules.tpl
+++ b/template/yoga/search_rules.tpl
diff --git a/template/admin/yoga/tags.tpl b/template/yoga/tags.tpl
index 33f69ca69..33f69ca69 100644
--- a/template/admin/yoga/tags.tpl
+++ b/template/yoga/tags.tpl
diff --git a/template/public/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index 56da48326..56da48326 100644
--- a/template/public/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
diff --git a/template/yoga/theme/clear/themeconf.inc.php b/template/yoga/theme/clear/themeconf.inc.php
new file mode 100644
index 000000000..10b5d104b
--- /dev/null
+++ b/template/yoga/theme/clear/themeconf.inc.php
@@ -0,0 +1,9 @@
+<?php
+$themeconf = array(
+  'template' => 'yoga',
+  'theme' => 'clear',
+  'icon_dir' => 'template/yoga/icon',
+  'admin_icon_dir' => 'template/yoga/icon/admin',
+  'mime_icon_dir' => 'template/yoga/icon/mimetypes/'
+);
+?>
diff --git a/template/admin/yoga/theme/dark/images/tableh1_bg.png b/template/yoga/theme/dark/images/tableh1_bg.png
index c7785d0f6..c7785d0f6 100644
--- a/template/admin/yoga/theme/dark/images/tableh1_bg.png
+++ b/template/yoga/theme/dark/images/tableh1_bg.png
diff --git a/template/admin/yoga/theme/dark/images/tableh2_bg.png b/template/yoga/theme/dark/images/tableh2_bg.png
index d8c29f93d..d8c29f93d 100644
--- a/template/admin/yoga/theme/dark/images/tableh2_bg.png
+++ b/template/yoga/theme/dark/images/tableh2_bg.png
diff --git a/template/public/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 854cc48dd..854cc48dd 100644
--- a/template/public/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
diff --git a/template/yoga/theme/dark/themeconf.inc.php b/template/yoga/theme/dark/themeconf.inc.php
new file mode 100644
index 000000000..9785a2916
--- /dev/null
+++ b/template/yoga/theme/dark/themeconf.inc.php
@@ -0,0 +1,9 @@
+<?php
+$themeconf = array(
+  'template' => 'yoga',
+  'theme' => 'dark',
+  'icon_dir' => 'template/yoga/icon',
+  'admin_icon_dir' => 'template/yoga/icon/admin',
+  'mime_icon_dir' => 'template/yoga/icon/mimetypes/'
+);
+?>
diff --git a/template/admin/yoga/upload.tpl b/template/yoga/upload.tpl
index fcf27b543..fcf27b543 100644
--- a/template/admin/yoga/upload.tpl
+++ b/template/yoga/upload.tpl