213 files changed, 267 insertions, 203 deletions
diff --git a/admin.php b/admin.php
index d914ad7ca..aaf9b40ca 100644
--- a/admin.php
+++ b/admin.php
@@ -62,26 +62,26 @@ SELECT
 // theme changer
 if (isset($_GET['change_theme']))
 {
-  $admin_themes = array('goto/roma', 'goto/clear');
+  $admin_themes = array('roma', 'clear');
 
   $new_admin_theme = array_pop(
     array_diff(
       $admin_themes,
-      array($conf['admin_layout'])
+      array($conf['admin_theme'])
       )
     );
 
   $query = '
 DELETE
   FROM '.CONFIG_TABLE.'
-  WHERE param = "admin_layout"
+  WHERE param = "admin_theme"
 ;';
   pwg_query($query);
 
   $query = '
 INSERT
   INTO '.CONFIG_TABLE.'
-  SET param = "admin_layout"
+  SET param = "admin_theme"
     , value = "'.$new_admin_theme.'"
 ;';
   pwg_query($query);
diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php
index 92c70e6a9..97f374a54 100644
--- a/admin/extend_for_templates.php
+++ b/admin/extend_for_templates.php
@@ -111,7 +111,7 @@ $flip_templates = array_flip($eligible_templates);
 
 $available_templates = array_merge(
   array('N/A' => '----------'),
-  get_dirs(PHPWG_ROOT_PATH.'template'));
+  get_dirs(PHPWG_ROOT_PATH.'theme'));
 
 // +-----------------------------------------------------------------------+
 // |                            selected templates                         |
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index 35a83f616..5771c4d1d 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -256,11 +256,8 @@ function set_user_on_env_nbm(&$nbm_user, $is_action_send)
 
   if ($is_action_send)
   {
-    $nbm_user['template'] = $user['template'];
     $nbm_user['theme'] = $user['theme'];
-    $env_nbm['mail_template'] =
-      get_mail_template($env_nbm['email_format'], 
-        array('template' => $nbm_user['template'], 'theme' => $nbm_user['theme']));
+    $env_nbm['mail_template'] = get_mail_template($env_nbm['email_format'], $nbm_user['theme']);
     $env_nbm['mail_template']->set_filename('notification_by_mail', 'notification_by_mail.tpl');
   }
 }
@@ -435,7 +432,6 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
                 'email_format' => $env_nbm['email_format'],
                 'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
                 'content_format' => $env_nbm['email_format'],
-                'template' => $nbm_user['template'],
                 'theme' => $nbm_user['theme']
               )
             ))
diff --git a/admin/template/goto/header.tpl b/admin/template/goto/header.tpl
deleted file mode 100644
index 5c71f42e0..000000000
--- a/admin/template/goto/header.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-{* 
-
-          Warning : This is the admin pages header only 
-          don't confuse with the public page header
-
-*}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}">
-<meta name="generator" content="Piwigo (aka PWG), see piwigo.org">
-<title>{$GALLERY_TITLE} :: {$PAGE_TITLE}</title>
-<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
-
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
-<!--[if lt IE 7]>
-  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/fix-ie5-ie6.css">
-<![endif]-->
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js" now=1} {*jQuery is always available by default*}
-{$themeconf.local_head}
-<script type="text/javascript" src="{$ROOT_URL}template-common/scripts.js"></script>
-<!--[if lt IE 7]>
-<style>
-  {* only because we need {$ROOT_URL} otherwise use fix-ie5-ie6.css *}
-  BODY {ldelim} behavior:url("{$ROOT_URL}template-common/csshover.htc"); }
-  A IMG, .button, .icon {ldelim}
-    behavior:url("{$ROOT_URL}template-common/tooltipfix.htc");
-  }
-  FORM {ldelim} behavior: url("{$ROOT_URL}template-common/inputfix.htc"); }
-</style>
-<script type="text/javascript" src="{$ROOT_URL}template-common/pngfix.js"></script>
-<![endif]-->
-
-{if not empty($head_elements)}
-{foreach from=$head_elements item=elt}
-{$elt}
-{/foreach}
-{/if}
-
-</head>
-
-<body id="{$BODY_ID}">
-
-<div id="the_page">
-
-<div id="pwgHead">
-  <h1>
-    <a href="{$U_RETURN}" title="Visit Gallery">
-      <img src="admin/template/goto/icon/home.png" alt="{'Home'|@translate}">
-      {$GALLERY_TITLE}
-    </a>
-  </h1>
-
-  <div id="headActions">
-    Hello {$USERNAME} :
-    <a href="{$U_RETURN}" title="Visit Gallery">Visit Gallery</a> |
-    <a href="{$U_CHANGE_THEME}" title="Switch to clear theme for administration">Change Theme</a> |
-    <a href="{$U_LOGOUT}">{'Logout'|@translate}</a>
-    <a href="{$U_FAQ}" title="{'Instructions'|@translate}" id="instructions"><img style="padding-left:10px;" src="{$ROOT_URL}admin/template/goto/icon/help.png" class="button" alt="(?)"></a>
-  </div>
-</div>
-
-<div style="clear:both;"></div>
-
-{if not empty($header_msgs)}
-<div class="header_msgs">
-  {foreach from=$header_msgs item=elt}
-  {$elt}
-  {/foreach}
-</div>
-{/if}
-
-<div id="theHeader">{*$PAGE_BANNER*}</div>
-
-{if not empty($header_notes)}
-<div class="header_notes">
-  {foreach from=$header_notes item=elt}
-  {$elt}
-  {/foreach}
-</div>
-{/if}
-
-<div id="pwgMain">
-\ No newline at end of file
diff --git a/admin/template/goto/include/datepicker.inc.tpl b/admin/template/goto/include/datepicker.inc.tpl
deleted file mode 100644
index 9d1055c20..000000000
--- a/admin/template/goto/include/datepicker.inc.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.datepicker.packed.js"}
-{known_script id="datepicker.js" src=$ROOT_URL|@cat:"template-common/datepicker.js"}
-
-{assign var="datepicker_language" value="template-common/lib/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
-
-{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
-{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:$datepicker_language}
-{/if}
-
-{html_head}
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template-common/lib/ui/theme/ui.datepicker.css">
-{/html_head}
-
-<script type="text/javascript">
-function pwg_initialization_datepicker(day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date)
-{ldelim}
-  return pwg_common_initialization_datepicker(
-    "{$ROOT_URL}admin/template/{$themeconf.template}/icon/datepicker.png",
-    day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date);
-}
-</script>
diff --git a/admin/template/goto/theme/clear/themeconf.inc.php b/admin/template/goto/theme/clear/themeconf.inc.php
deleted file mode 100644
index 868b4f61c..000000000
--- a/admin/template/goto/theme/clear/themeconf.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-if (!function_exists('selected_admin_menu')) 
-{
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php');
-}
-$themeconf = array(
-  'template' => 'goto',
-  'theme' => 'clear',
-  'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'admin/template/goto/theme/clear/icon',
-  'mime_icon_dir' => 'template/yoga/icon/mimetypes',
-  'selected_admin_menu' => selected_admin_menu(),
-  'local_head' => '',
-);
-?>
diff --git a/admin/template/goto/theme/roma/themeconf.inc.php b/admin/template/goto/theme/roma/themeconf.inc.php
deleted file mode 100644
index 9e731144b..000000000
--- a/admin/template/goto/theme/roma/themeconf.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-if (!function_exists('selected_admin_menu')) 
-{
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php');
-}
-$themeconf = array(
-  'template' => 'goto', /* Goto Admin template */
-  'theme' => 'roma',    /* "roma" is the foundation theme of Piwigo */
-  'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'admin/template/goto/icon',
-  'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'selected_admin_menu' => selected_admin_menu(),
-  'local_head' => '',
-);
-?>
diff --git a/admin/template/goto/theme/clear/icon/cat_move.png b/admin/themes/clear/icon/cat_move.png
index 5788ab439..5788ab439 100644
--- a/admin/template/goto/theme/clear/icon/cat_move.png
+++ b/admin/themes/clear/icon/cat_move.png
diff --git a/admin/template/goto/theme/clear/icon/category_children.png b/admin/themes/clear/icon/category_children.png
index 7205c3f61..7205c3f61 100644
--- a/admin/template/goto/theme/clear/icon/category_children.png
+++ b/admin/themes/clear/icon/category_children.png
diff --git a/admin/template/goto/theme/clear/icon/category_delete.png b/admin/themes/clear/icon/category_delete.png
index da796da11..da796da11 100644
--- a/admin/template/goto/theme/clear/icon/category_delete.png
+++ b/admin/themes/clear/icon/category_delete.png
diff --git a/admin/template/goto/theme/clear/icon/category_edit.png b/admin/themes/clear/icon/category_edit.png
index 0f3b619ed..0f3b619ed 100644
--- a/admin/template/goto/theme/clear/icon/category_edit.png
+++ b/admin/themes/clear/icon/category_edit.png
diff --git a/admin/template/goto/theme/clear/icon/category_elements.png b/admin/themes/clear/icon/category_elements.png
index 1d367b38f..1d367b38f 100644
--- a/admin/template/goto/theme/clear/icon/category_elements.png
+++ b/admin/themes/clear/icon/category_elements.png
diff --git a/admin/template/goto/theme/clear/icon/category_jump-to.png b/admin/themes/clear/icon/category_jump-to.png
index 62db1f4ee..62db1f4ee 100644
--- a/admin/template/goto/theme/clear/icon/category_jump-to.png
+++ b/admin/themes/clear/icon/category_jump-to.png
diff --git a/admin/template/goto/theme/clear/icon/category_permissions.png b/admin/themes/clear/icon/category_permissions.png
index 4780841ae..4780841ae 100644
--- a/admin/template/goto/theme/clear/icon/category_permissions.png
+++ b/admin/themes/clear/icon/category_permissions.png
diff --git a/admin/template/goto/theme/clear/icon/category_representant_random.png b/admin/themes/clear/icon/category_representant_random.png
index dfa69846f..dfa69846f 100644
--- a/admin/template/goto/theme/clear/icon/category_representant_random.png
+++ b/admin/themes/clear/icon/category_representant_random.png
diff --git a/admin/template/goto/theme/clear/icon/check.png b/admin/themes/clear/icon/check.png
index d9abf2763..d9abf2763 100644
--- a/admin/template/goto/theme/clear/icon/check.png
+++ b/admin/themes/clear/icon/check.png
diff --git a/admin/template/goto/theme/clear/icon/collapse.gif b/admin/themes/clear/icon/collapse.gif
index 6bf0b0657..6bf0b0657 100644
--- a/admin/template/goto/theme/clear/icon/collapse.gif
+++ b/admin/themes/clear/icon/collapse.gif
diff --git a/admin/template/goto/theme/clear/icon/datepicker.png b/admin/themes/clear/icon/datepicker.png
index 45a6b4874..45a6b4874 100644
--- a/admin/template/goto/theme/clear/icon/datepicker.png
+++ b/admin/themes/clear/icon/datepicker.png
diff --git a/admin/template/goto/theme/clear/icon/delete.png b/admin/themes/clear/icon/delete.png
index af10be03e..af10be03e 100644
--- a/admin/template/goto/theme/clear/icon/delete.png
+++ b/admin/themes/clear/icon/delete.png
diff --git a/admin/template/goto/theme/clear/icon/edit_s.png b/admin/themes/clear/icon/edit_s.png
index e4951d22f..e4951d22f 100644
--- a/admin/template/goto/theme/clear/icon/edit_s.png
+++ b/admin/themes/clear/icon/edit_s.png
diff --git a/admin/template/goto/theme/clear/icon/errors.png b/admin/themes/clear/icon/errors.png
index 3c8a37df5..3c8a37df5 100644
--- a/admin/template/goto/theme/clear/icon/errors.png
+++ b/admin/themes/clear/icon/errors.png
diff --git a/admin/template/goto/theme/clear/icon/exit.png b/admin/themes/clear/icon/exit.png
index 2aafbb4cb..2aafbb4cb 100644
--- a/admin/template/goto/theme/clear/icon/exit.png
+++ b/admin/themes/clear/icon/exit.png
diff --git a/admin/template/goto/theme/clear/icon/expand.gif b/admin/themes/clear/icon/expand.gif
index 96261b426..96261b426 100644
--- a/admin/template/goto/theme/clear/icon/expand.gif
+++ b/admin/themes/clear/icon/expand.gif
diff --git a/admin/template/goto/theme/clear/icon/help.png b/admin/themes/clear/icon/help.png
index c76f68292..c76f68292 100644
--- a/admin/template/goto/theme/clear/icon/help.png
+++ b/admin/themes/clear/icon/help.png
diff --git a/admin/template/goto/theme/clear/icon/index.php b/admin/themes/clear/icon/index.php
index b54047f4e..b54047f4e 100644
--- a/admin/template/goto/theme/clear/icon/index.php
+++ b/admin/themes/clear/icon/index.php
diff --git a/admin/template/goto/theme/clear/icon/infos.png b/admin/themes/clear/icon/infos.png
index dc8c8a457..dc8c8a457 100644
--- a/admin/template/goto/theme/clear/icon/infos.png
+++ b/admin/themes/clear/icon/infos.png
diff --git a/admin/template/goto/theme/clear/icon/note.png b/admin/themes/clear/icon/note.png
index 5849f791b..5849f791b 100644
--- a/admin/template/goto/theme/clear/icon/note.png
+++ b/admin/themes/clear/icon/note.png
diff --git a/admin/template/goto/theme/clear/icon/page_end.png b/admin/themes/clear/icon/page_end.png
index c8f54fb91..c8f54fb91 100644
--- a/admin/template/goto/theme/clear/icon/page_end.png
+++ b/admin/themes/clear/icon/page_end.png
diff --git a/admin/template/goto/theme/clear/icon/page_top.png b/admin/themes/clear/icon/page_top.png
index 8b18f13c3..8b18f13c3 100644
--- a/admin/template/goto/theme/clear/icon/page_top.png
+++ b/admin/themes/clear/icon/page_top.png
diff --git a/admin/template/goto/theme/clear/icon/permissions.png b/admin/themes/clear/icon/permissions.png
index 9109a851b..9109a851b 100644
--- a/admin/template/goto/theme/clear/icon/permissions.png
+++ b/admin/themes/clear/icon/permissions.png
diff --git a/admin/template/goto/theme/clear/icon/plug_activate.png b/admin/themes/clear/icon/plug_activate.png
index 4505e0f48..4505e0f48 100644
--- a/admin/template/goto/theme/clear/icon/plug_activate.png
+++ b/admin/themes/clear/icon/plug_activate.png
diff --git a/admin/template/goto/theme/clear/icon/plug_activate_grey.png b/admin/themes/clear/icon/plug_activate_grey.png
index 05a2d4e45..05a2d4e45 100644
--- a/admin/template/goto/theme/clear/icon/plug_activate_grey.png
+++ b/admin/themes/clear/icon/plug_activate_grey.png
diff --git a/admin/template/goto/theme/clear/icon/plug_deactivate.png b/admin/themes/clear/icon/plug_deactivate.png
index 579b87355..579b87355 100644
--- a/admin/template/goto/theme/clear/icon/plug_deactivate.png
+++ b/admin/themes/clear/icon/plug_deactivate.png
diff --git a/admin/template/goto/theme/clear/icon/plug_deactivate_grey.png b/admin/themes/clear/icon/plug_deactivate_grey.png
index 87d5f6b14..87d5f6b14 100644
--- a/admin/template/goto/theme/clear/icon/plug_deactivate_grey.png
+++ b/admin/themes/clear/icon/plug_deactivate_grey.png
diff --git a/admin/template/goto/theme/clear/icon/plug_delete.png b/admin/themes/clear/icon/plug_delete.png
index dd9bb1b4a..dd9bb1b4a 100644
--- a/admin/template/goto/theme/clear/icon/plug_delete.png
+++ b/admin/themes/clear/icon/plug_delete.png
diff --git a/admin/template/goto/theme/clear/icon/plug_delete_grey.png b/admin/themes/clear/icon/plug_delete_grey.png
index 3706aadc5..3706aadc5 100644
--- a/admin/template/goto/theme/clear/icon/plug_delete_grey.png
+++ b/admin/themes/clear/icon/plug_delete_grey.png
diff --git a/admin/template/goto/theme/clear/icon/plug_install.png b/admin/themes/clear/icon/plug_install.png
index e5fb66000..e5fb66000 100644
--- a/admin/template/goto/theme/clear/icon/plug_install.png
+++ b/admin/themes/clear/icon/plug_install.png
diff --git a/admin/template/goto/theme/clear/icon/plug_install_grey.png b/admin/themes/clear/icon/plug_install_grey.png
index d0fd9565d..d0fd9565d 100644
--- a/admin/template/goto/theme/clear/icon/plug_install_grey.png
+++ b/admin/themes/clear/icon/plug_install_grey.png
diff --git a/admin/template/goto/theme/clear/icon/plug_uninstall.png b/admin/themes/clear/icon/plug_uninstall.png
index 37a45feb0..37a45feb0 100644
--- a/admin/template/goto/theme/clear/icon/plug_uninstall.png
+++ b/admin/themes/clear/icon/plug_uninstall.png
diff --git a/admin/template/goto/theme/clear/icon/plug_uninstall_grey.png b/admin/themes/clear/icon/plug_uninstall_grey.png
index c51cb754b..c51cb754b 100644
--- a/admin/template/goto/theme/clear/icon/plug_uninstall_grey.png
+++ b/admin/themes/clear/icon/plug_uninstall_grey.png
diff --git a/admin/template/goto/theme/clear/icon/plugin_active.gif b/admin/themes/clear/icon/plugin_active.gif
index 5134d95a7..5134d95a7 100644
--- a/admin/template/goto/theme/clear/icon/plugin_active.gif
+++ b/admin/themes/clear/icon/plugin_active.gif
diff --git a/admin/template/goto/theme/clear/icon/plugin_inactive.gif b/admin/themes/clear/icon/plugin_inactive.gif
index 9a3c80617..9a3c80617 100644
--- a/admin/template/goto/theme/clear/icon/plugin_inactive.gif
+++ b/admin/themes/clear/icon/plugin_inactive.gif
diff --git a/admin/template/goto/theme/clear/icon/preferences.png b/admin/themes/clear/icon/preferences.png
index 30393347b..30393347b 100644
--- a/admin/template/goto/theme/clear/icon/preferences.png
+++ b/admin/themes/clear/icon/preferences.png
diff --git a/admin/template/goto/theme/clear/icon/ranks.png b/admin/themes/clear/icon/ranks.png
index f48b394aa..f48b394aa 100644
--- a/admin/template/goto/theme/clear/icon/ranks.png
+++ b/admin/themes/clear/icon/ranks.png
diff --git a/admin/template/goto/theme/clear/icon/ranks_grey.png b/admin/themes/clear/icon/ranks_grey.png
index 18478fc1f..18478fc1f 100644
--- a/admin/template/goto/theme/clear/icon/ranks_grey.png
+++ b/admin/themes/clear/icon/ranks_grey.png
diff --git a/admin/template/goto/theme/clear/icon/sync_metadata.png b/admin/themes/clear/icon/sync_metadata.png
index cb62824a3..cb62824a3 100644
--- a/admin/template/goto/theme/clear/icon/sync_metadata.png
+++ b/admin/themes/clear/icon/sync_metadata.png
diff --git a/admin/template/goto/theme/clear/icon/sync_metadata_pink.png b/admin/themes/clear/icon/sync_metadata_pink.png
index 6597ef254..6597ef254 100644
--- a/admin/template/goto/theme/clear/icon/sync_metadata_pink.png
+++ b/admin/themes/clear/icon/sync_metadata_pink.png
diff --git a/admin/template/goto/theme/clear/icon/toggle_is_default_group.png b/admin/themes/clear/icon/toggle_is_default_group.png
index 0d58e79e7..0d58e79e7 100644
--- a/admin/template/goto/theme/clear/icon/toggle_is_default_group.png
+++ b/admin/themes/clear/icon/toggle_is_default_group.png
diff --git a/admin/template/goto/theme/clear/icon/uncheck.png b/admin/themes/clear/icon/uncheck.png
index 2f7df3503..2f7df3503 100644
--- a/admin/template/goto/theme/clear/icon/uncheck.png
+++ b/admin/themes/clear/icon/uncheck.png
diff --git a/admin/template/goto/theme/clear/icon/validate_s.png b/admin/themes/clear/icon/validate_s.png
index 400bf8a24..400bf8a24 100644
--- a/admin/template/goto/theme/clear/icon/validate_s.png
+++ b/admin/themes/clear/icon/validate_s.png
diff --git a/admin/template/goto/theme/clear/icon/virt_category.png b/admin/themes/clear/icon/virt_category.png
index 15f4f2267..15f4f2267 100644
--- a/admin/template/goto/theme/clear/icon/virt_category.png
+++ b/admin/themes/clear/icon/virt_category.png
diff --git a/admin/template/goto/theme/clear/images/external_active.png b/admin/themes/clear/images/external_active.png
index 9bbccfa96..9bbccfa96 100644
--- a/admin/template/goto/theme/clear/images/external_active.png
+++ b/admin/themes/clear/images/external_active.png
diff --git a/admin/template/goto/theme/clear/images/external_inactive.png b/admin/themes/clear/images/external_inactive.png
index 5ed8db208..5ed8db208 100644
--- a/admin/template/goto/theme/clear/images/external_inactive.png
+++ b/admin/themes/clear/images/external_inactive.png
diff --git a/admin/template/goto/theme/clear/images/piwigo_logo_214x100.png b/admin/themes/clear/images/piwigo_logo_214x100.png
index 92770a0d8..92770a0d8 100644
--- a/admin/template/goto/theme/clear/images/piwigo_logo_214x100.png
+++ b/admin/themes/clear/images/piwigo_logo_214x100.png
diff --git a/admin/template/goto/theme/clear/images/quickLocalSync.png b/admin/themes/clear/images/quickLocalSync.png
index daf75e696..daf75e696 100644
--- a/admin/template/goto/theme/clear/images/quickLocalSync.png
+++ b/admin/themes/clear/images/quickLocalSync.png
diff --git a/admin/template/goto/theme/clear/images/resizable-e.gif b/admin/themes/clear/images/resizable-e.gif
index 32d05b9ca..32d05b9ca 100644
--- a/admin/template/goto/theme/clear/images/resizable-e.gif
+++ b/admin/themes/clear/images/resizable-e.gif
diff --git a/admin/template/goto/theme/clear/images/resizable-n.gif b/admin/themes/clear/images/resizable-n.gif
index 6a62dc8e2..6a62dc8e2 100644
--- a/admin/template/goto/theme/clear/images/resizable-n.gif
+++ b/admin/themes/clear/images/resizable-n.gif
diff --git a/admin/template/goto/theme/clear/images/resizable-ne.gif b/admin/themes/clear/images/resizable-ne.gif
index 09ad9fc81..09ad9fc81 100644
--- a/admin/template/goto/theme/clear/images/resizable-ne.gif
+++ b/admin/themes/clear/images/resizable-ne.gif
diff --git a/admin/template/goto/theme/clear/images/resizable-nw.gif b/admin/themes/clear/images/resizable-nw.gif
index c33bd0fcc..c33bd0fcc 100644
--- a/admin/template/goto/theme/clear/images/resizable-nw.gif
+++ b/admin/themes/clear/images/resizable-nw.gif
diff --git a/admin/template/goto/theme/clear/images/resizable-s.gif b/admin/themes/clear/images/resizable-s.gif
index b1d72c5ce..b1d72c5ce 100644
--- a/admin/template/goto/theme/clear/images/resizable-s.gif
+++ b/admin/themes/clear/images/resizable-s.gif
diff --git a/admin/template/goto/theme/clear/images/resizable-se.gif b/admin/themes/clear/images/resizable-se.gif
index ad6bd1fbc..ad6bd1fbc 100644
--- a/admin/template/goto/theme/clear/images/resizable-se.gif
+++ b/admin/themes/clear/images/resizable-se.gif
diff --git a/admin/template/goto/theme/clear/images/resizable-sw.gif b/admin/themes/clear/images/resizable-sw.gif
index 5bf25ce07..5bf25ce07 100644
--- a/admin/template/goto/theme/clear/images/resizable-sw.gif
+++ b/admin/themes/clear/images/resizable-sw.gif
diff --git a/admin/template/goto/theme/clear/images/resizable-w.gif b/admin/themes/clear/images/resizable-w.gif
index e4ed876e7..e4ed876e7 100644
--- a/admin/template/goto/theme/clear/images/resizable-w.gif
+++ b/admin/themes/clear/images/resizable-w.gif
diff --git a/admin/template/goto/theme/clear/images/transparent.gif b/admin/themes/clear/images/transparent.gif
index f419cd417..f419cd417 100644
--- a/admin/template/goto/theme/clear/images/transparent.gif
+++ b/admin/themes/clear/images/transparent.gif
diff --git a/admin/template/goto/theme/clear/index.php b/admin/themes/clear/index.php
index e8cc580ab..e8cc580ab 100644
--- a/admin/template/goto/theme/clear/index.php
+++ b/admin/themes/clear/index.php
diff --git a/admin/template/goto/theme/clear/mail-css.tpl b/admin/themes/clear/mail-css.tpl
index b94f17f17..cfe148b39 100644
--- a/admin/template/goto/theme/clear/mail-css.tpl
+++ b/admin/themes/clear/mail-css.tpl
@@ -6,7 +6,7 @@ body {ldelim} background-color:#111; color:#69c;}
 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
 color: #69c;}
-h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);}
+h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);}
 img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; }
 a {ldelim} color: #69c; background: transparent; }
diff --git a/admin/template/goto/theme/clear/theme.css b/admin/themes/clear/theme.css
index ed9a57a6e..ed9a57a6e 100644
--- a/admin/template/goto/theme/clear/theme.css
+++ b/admin/themes/clear/theme.css
diff --git a/admin/themes/clear/themeconf.inc.php b/admin/themes/clear/themeconf.inc.php
new file mode 100644
index 000000000..de1d34209
--- /dev/null
+++ b/admin/themes/clear/themeconf.inc.php
@@ -0,0 +1,12 @@
+<?php
+if (!function_exists('selected_admin_menu')) 
+{
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php');
+}
+$themeconf = array(
+  'theme'    => 'clear',
+  'parent'   => 'default',
+  'admin_icon_dir' => 'admin/themes/clear/icon',
+  'selected_admin_menu' => selected_admin_menu(),
+);
+?>
diff --git a/admin/template/goto/content.css b/admin/themes/default/content.css
index 61ab73b83..61ab73b83 100644
--- a/admin/template/goto/content.css
+++ b/admin/themes/default/content.css
diff --git a/admin/template/goto/default-colors.css b/admin/themes/default/default-colors.css
index e45863bd3..e45863bd3 100644
--- a/admin/template/goto/default-colors.css
+++ b/admin/themes/default/default-colors.css
diff --git a/admin/template/goto/default-layout.css b/admin/themes/default/default-layout.css
index 56cb22ab6..a14f6632b 100644
--- a/admin/template/goto/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -695,4 +695,44 @@ html, body {height:100%; margin:0; padding:0;}
 	#tiptip_holder.tip_top #tiptip_arrow_inner { 
 		border-top-color: rgba(20,20,20,0.92);
 	}
+}
+
+/* Set the width of the menubar for the galery */
+#menubar {
+  width: 18em;
+}
+.content {
+  margin-left: 20em;  /* = #menubar width + 2em */
+}
+/* Set minimum width of the page before getting a scrollbar */
+/* IE5 and IE6 don't get that */
+BODY {
+  min-width: 60em;  /* ~ 3* #menubar width */
+}
+BODY#thePopuphelpPage {
+  min-width: 0;
+}
+
+/* Set some sizes according to your maximum thumbnail width and height */
+.content UL.thumbnails SPAN,
+.content UL.thumbnails SPAN.wrap2 A,
+.content UL.thumbnails LABEL,
+.content DIV.thumbnailCategory DIV.illustration {
+  width: 140px;      /* max thumbnail width + 2px */
+}
+.content UL.thumbnails SPAN.wrap2,
+.content DIV.thumbnailCategory DIV.description {
+  height: 140px;    /* max thumbnail height + 2px */
+}
+
+
+/* Category thumbnails on main page */
+.content UL.thumbnailCategories LI {
+  width: 49.7%;    /* 49.7% for 2 per line, 33.2% for 3 per line*/
+}
+
+/* Set defaults for thumbnails legend */
+.content UL.thumbnails SPAN.thumbLegend {
+  display: block;  /* display: none; if you don't want legend */
+  height: 4em;    /* legend height (don't set auto to be Gecko friendly)*/
 }
 \ No newline at end of file
diff --git a/admin/template/goto/fix-ie5-ie6.css b/admin/themes/default/fix-ie5-ie6.css
index 078206d1d..078206d1d 100644
--- a/admin/template/goto/fix-ie5-ie6.css
+++ b/admin/themes/default/fix-ie5-ie6.css
diff --git a/admin/template/goto/icon/cat_move.png b/admin/themes/default/icon/cat_move.png
index 9d6939cfc..9d6939cfc 100644
--- a/admin/template/goto/icon/cat_move.png
+++ b/admin/themes/default/icon/cat_move.png
diff --git a/admin/template/goto/icon/category_children.png b/admin/themes/default/icon/category_children.png
index d2c4edd1f..d2c4edd1f 100644
--- a/admin/template/goto/icon/category_children.png
+++ b/admin/themes/default/icon/category_children.png
diff --git a/admin/template/goto/icon/category_delete.png b/admin/themes/default/icon/category_delete.png
index b27ef62d3..b27ef62d3 100644
--- a/admin/template/goto/icon/category_delete.png
+++ b/admin/themes/default/icon/category_delete.png
diff --git a/admin/template/goto/icon/category_edit.png b/admin/themes/default/icon/category_edit.png
index 3ace19daf..3ace19daf 100644
--- a/admin/template/goto/icon/category_edit.png
+++ b/admin/themes/default/icon/category_edit.png
diff --git a/admin/template/goto/icon/category_elements.png b/admin/themes/default/icon/category_elements.png
index c5e3f9292..c5e3f9292 100644
--- a/admin/template/goto/icon/category_elements.png
+++ b/admin/themes/default/icon/category_elements.png
diff --git a/admin/template/goto/icon/category_jump-to.png b/admin/themes/default/icon/category_jump-to.png
index 765bc119f..765bc119f 100644
--- a/admin/template/goto/icon/category_jump-to.png
+++ b/admin/themes/default/icon/category_jump-to.png
diff --git a/admin/template/goto/icon/category_permissions.png b/admin/themes/default/icon/category_permissions.png
index 055d9e58d..055d9e58d 100644
--- a/admin/template/goto/icon/category_permissions.png
+++ b/admin/themes/default/icon/category_permissions.png
diff --git a/admin/template/goto/icon/category_representant_random.png b/admin/themes/default/icon/category_representant_random.png
index 26fe7016a..26fe7016a 100644
--- a/admin/template/goto/icon/category_representant_random.png
+++ b/admin/themes/default/icon/category_representant_random.png
diff --git a/admin/template/goto/icon/check.png b/admin/themes/default/icon/check.png
index 708003a2b..708003a2b 100644
--- a/admin/template/goto/icon/check.png
+++ b/admin/themes/default/icon/check.png
diff --git a/admin/template/goto/icon/datepicker.png b/admin/themes/default/icon/datepicker.png
index 72e836b93..72e836b93 100644
--- a/admin/template/goto/icon/datepicker.png
+++ b/admin/themes/default/icon/datepicker.png
diff --git a/admin/template/goto/icon/delete.png b/admin/themes/default/icon/delete.png
index 285e53e19..285e53e19 100644
--- a/admin/template/goto/icon/delete.png
+++ b/admin/themes/default/icon/delete.png
diff --git a/admin/template/goto/icon/edit_s.png b/admin/themes/default/icon/edit_s.png
index efb639947..efb639947 100644
--- a/admin/template/goto/icon/edit_s.png
+++ b/admin/themes/default/icon/edit_s.png
diff --git a/admin/template/goto/icon/errors.png b/admin/themes/default/icon/errors.png
index e26d8c6e5..e26d8c6e5 100644
--- a/admin/template/goto/icon/errors.png
+++ b/admin/themes/default/icon/errors.png
diff --git a/admin/template/goto/icon/exit.png b/admin/themes/default/icon/exit.png
index 685cc44b5..685cc44b5 100644
--- a/admin/template/goto/icon/exit.png
+++ b/admin/themes/default/icon/exit.png
diff --git a/admin/template/goto/icon/fcbkcomplete_close.gif b/admin/themes/default/icon/fcbkcomplete_close.gif
index cc2199248..cc2199248 100644
--- a/admin/template/goto/icon/fcbkcomplete_close.gif
+++ b/admin/themes/default/icon/fcbkcomplete_close.gif
diff --git a/admin/template/goto/icon/help.png b/admin/themes/default/icon/help.png
index cd1d20919..cd1d20919 100644
--- a/admin/template/goto/icon/help.png
+++ b/admin/themes/default/icon/help.png
diff --git a/admin/template/goto/icon/home.png b/admin/themes/default/icon/home.png
index 81b6bddb7..81b6bddb7 100644
--- a/admin/template/goto/icon/home.png
+++ b/admin/themes/default/icon/home.png
diff --git a/admin/template/goto/icon/index.php b/admin/themes/default/icon/index.php
index 871b52b6a..871b52b6a 100644
--- a/admin/template/goto/icon/index.php
+++ b/admin/themes/default/icon/index.php
diff --git a/admin/template/goto/icon/infos.png b/admin/themes/default/icon/infos.png
index d98031df4..d98031df4 100644
--- a/admin/template/goto/icon/infos.png
+++ b/admin/themes/default/icon/infos.png
diff --git a/admin/template/goto/icon/note.png b/admin/themes/default/icon/note.png
index 9ef1af537..9ef1af537 100644
--- a/admin/template/goto/icon/note.png
+++ b/admin/themes/default/icon/note.png
diff --git a/admin/template/goto/icon/page_end.png b/admin/themes/default/icon/page_end.png
index ac7b25ab8..ac7b25ab8 100644
--- a/admin/template/goto/icon/page_end.png
+++ b/admin/themes/default/icon/page_end.png
diff --git a/admin/template/goto/icon/page_top.png b/admin/themes/default/icon/page_top.png
index 30c58edd7..30c58edd7 100644
--- a/admin/template/goto/icon/page_top.png
+++ b/admin/themes/default/icon/page_top.png
diff --git a/admin/template/goto/icon/permissions.png b/admin/themes/default/icon/permissions.png
index 370ddddeb..370ddddeb 100644
--- a/admin/template/goto/icon/permissions.png
+++ b/admin/themes/default/icon/permissions.png
diff --git a/admin/template/goto/icon/plug_activate.png b/admin/themes/default/icon/plug_activate.png
index feb97a1c9..feb97a1c9 100644
--- a/admin/template/goto/icon/plug_activate.png
+++ b/admin/themes/default/icon/plug_activate.png
diff --git a/admin/template/goto/icon/plug_activate_grey.png b/admin/themes/default/icon/plug_activate_grey.png
index bf2a9be53..bf2a9be53 100644
--- a/admin/template/goto/icon/plug_activate_grey.png
+++ b/admin/themes/default/icon/plug_activate_grey.png
diff --git a/admin/template/goto/icon/plug_deactivate.png b/admin/themes/default/icon/plug_deactivate.png
index 8401ad8b9..8401ad8b9 100644
--- a/admin/template/goto/icon/plug_deactivate.png
+++ b/admin/themes/default/icon/plug_deactivate.png
diff --git a/admin/template/goto/icon/plug_deactivate_grey.png b/admin/themes/default/icon/plug_deactivate_grey.png
index a7e55e669..a7e55e669 100644
--- a/admin/template/goto/icon/plug_deactivate_grey.png
+++ b/admin/themes/default/icon/plug_deactivate_grey.png
diff --git a/admin/template/goto/icon/plug_delete.png b/admin/themes/default/icon/plug_delete.png
index 285e53e19..285e53e19 100644
--- a/admin/template/goto/icon/plug_delete.png
+++ b/admin/themes/default/icon/plug_delete.png
diff --git a/admin/template/goto/icon/plug_delete_grey.png b/admin/themes/default/icon/plug_delete_grey.png
index d3d070bfc..d3d070bfc 100644
--- a/admin/template/goto/icon/plug_delete_grey.png
+++ b/admin/themes/default/icon/plug_delete_grey.png
diff --git a/admin/template/goto/icon/plug_install.png b/admin/themes/default/icon/plug_install.png
index bef78e171..bef78e171 100644
--- a/admin/template/goto/icon/plug_install.png
+++ b/admin/themes/default/icon/plug_install.png
diff --git a/admin/template/goto/icon/plug_install_grey.png b/admin/themes/default/icon/plug_install_grey.png
index 3bd56be3c..3bd56be3c 100644
--- a/admin/template/goto/icon/plug_install_grey.png
+++ b/admin/themes/default/icon/plug_install_grey.png
diff --git a/admin/template/goto/icon/plug_uninstall.png b/admin/themes/default/icon/plug_uninstall.png
index 9fd420ad7..9fd420ad7 100644
--- a/admin/template/goto/icon/plug_uninstall.png
+++ b/admin/themes/default/icon/plug_uninstall.png
diff --git a/admin/template/goto/icon/plug_uninstall_grey.png b/admin/themes/default/icon/plug_uninstall_grey.png
index 4d6291cee..4d6291cee 100644
--- a/admin/template/goto/icon/plug_uninstall_grey.png
+++ b/admin/themes/default/icon/plug_uninstall_grey.png
diff --git a/admin/template/goto/icon/plugin_active.gif b/admin/themes/default/icon/plugin_active.gif
index fe49227da..fe49227da 100644
--- a/admin/template/goto/icon/plugin_active.gif
+++ b/admin/themes/default/icon/plugin_active.gif
diff --git a/admin/template/goto/icon/plugin_inactive.gif b/admin/themes/default/icon/plugin_inactive.gif
index 19d551865..19d551865 100644
--- a/admin/template/goto/icon/plugin_inactive.gif
+++ b/admin/themes/default/icon/plugin_inactive.gif
diff --git a/admin/template/goto/icon/preferences.png b/admin/themes/default/icon/preferences.png
index 8634b5159..8634b5159 100644
--- a/admin/template/goto/icon/preferences.png
+++ b/admin/themes/default/icon/preferences.png
diff --git a/admin/template/goto/icon/ranks.png b/admin/themes/default/icon/ranks.png
index 47710e87f..47710e87f 100644
--- a/admin/template/goto/icon/ranks.png
+++ b/admin/themes/default/icon/ranks.png
diff --git a/admin/template/goto/icon/ranks_grey.png b/admin/themes/default/icon/ranks_grey.png
index f9757b998..f9757b998 100644
--- a/admin/template/goto/icon/ranks_grey.png
+++ b/admin/themes/default/icon/ranks_grey.png
diff --git a/admin/template/goto/icon/sync_metadata.png b/admin/themes/default/icon/sync_metadata.png
index c527e2b04..c527e2b04 100644
--- a/admin/template/goto/icon/sync_metadata.png
+++ b/admin/themes/default/icon/sync_metadata.png
diff --git a/admin/template/goto/icon/sync_metadata_pink.png b/admin/themes/default/icon/sync_metadata_pink.png
index 954c69612..954c69612 100644
--- a/admin/template/goto/icon/sync_metadata_pink.png
+++ b/admin/themes/default/icon/sync_metadata_pink.png
diff --git a/admin/template/goto/icon/toggle_is_default_group.png b/admin/themes/default/icon/toggle_is_default_group.png
index 7ddce0076..7ddce0076 100644
--- a/admin/template/goto/icon/toggle_is_default_group.png
+++ b/admin/themes/default/icon/toggle_is_default_group.png
diff --git a/admin/template/goto/icon/uncheck.png b/admin/themes/default/icon/uncheck.png
index df08cb8fe..df08cb8fe 100644
--- a/admin/template/goto/icon/uncheck.png
+++ b/admin/themes/default/icon/uncheck.png
diff --git a/admin/template/goto/icon/validate_s.png b/admin/themes/default/icon/validate_s.png
index adea3d580..adea3d580 100644
--- a/admin/template/goto/icon/validate_s.png
+++ b/admin/themes/default/icon/validate_s.png
diff --git a/admin/template/goto/icon/virt_category.png b/admin/themes/default/icon/virt_category.png
index 7957ec77c..7957ec77c 100644
--- a/admin/template/goto/icon/virt_category.png
+++ b/admin/themes/default/icon/virt_category.png
diff --git a/admin/template/goto/index.php b/admin/themes/default/index.php
index 871b52b6a..871b52b6a 100644
--- a/admin/template/goto/index.php
+++ b/admin/themes/default/index.php
diff --git a/admin/template/goto/layout.css b/admin/themes/default/layout.css
index 5a7d5c4df..5a7d5c4df 100644
--- a/admin/template/goto/layout.css
+++ b/admin/themes/default/layout.css
diff --git a/admin/template/goto/local-layout.css b/admin/themes/default/local-layout.css
index e8136ac6d..e8136ac6d 100644
--- a/admin/template/goto/local-layout.css
+++ b/admin/themes/default/local-layout.css
diff --git a/admin/themes/default/local_head.tpl b/admin/themes/default/local_head.tpl
new file mode 100644
index 000000000..dd2ebc552
--- /dev/null
+++ b/admin/themes/default/local_head.tpl
@@ -0,0 +1,3 @@
+<!--[if lt IE 7]>
+  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/fix-ie5-ie6.css">
+<![endif]-->
diff --git a/admin/template/goto/menubar.css b/admin/themes/default/menubar.css
index c0c51db29..c0c51db29 100644
--- a/admin/template/goto/menubar.css
+++ b/admin/themes/default/menubar.css
diff --git a/admin/template/goto/picture.css b/admin/themes/default/picture.css
index 13b0ca6ef..13b0ca6ef 100644
--- a/admin/template/goto/picture.css
+++ b/admin/themes/default/picture.css
diff --git a/admin/template/goto/print.css b/admin/themes/default/print.css
index 88c9ef4a1..88c9ef4a1 100644
--- a/admin/template/goto/print.css
+++ b/admin/themes/default/print.css
diff --git a/admin/template/goto/admin.tpl b/admin/themes/default/template/admin.tpl
index ac25b3990..8de4f69ea 100644
--- a/admin/template/goto/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -1,6 +1,6 @@
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js" }
-{known_script id="jquery.ui.accordion" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.accordion.packed.js" }
-{known_script id="jquery.tipTip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.tipTip.minified.js" }
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery.ui.accordion" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.accordion.packed.js" }
+{known_script id="jquery.tipTip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.tipTip.minified.js" }
 
 <script type="text/javascript">
 jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/advanced_feature.tpl b/admin/themes/default/template/advanced_feature.tpl
index 76209387c..76209387c 100644
--- a/admin/template/goto/advanced_feature.tpl
+++ b/admin/themes/default/template/advanced_feature.tpl
diff --git a/admin/template/goto/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 379306592..30b517a7b 100644
--- a/admin/template/goto/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -1,6 +1,6 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js" }
-{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.sortable.packed.js" }
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js" }
 
 <script type="text/javascript">
   jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 1878da75c..1878da75c 100644
--- a/admin/template/goto/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
diff --git a/admin/template/goto/cat_move.tpl b/admin/themes/default/template/cat_move.tpl
index f8a83c584..f8a83c584 100644
--- a/admin/template/goto/cat_move.tpl
+++ b/admin/themes/default/template/cat_move.tpl
diff --git a/admin/template/goto/cat_options.tpl b/admin/themes/default/template/cat_options.tpl
index 9c25c1ef0..9c25c1ef0 100644
--- a/admin/template/goto/cat_options.tpl
+++ b/admin/themes/default/template/cat_options.tpl
diff --git a/admin/template/goto/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index fb239e79f..fb239e79f 100644
--- a/admin/template/goto/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
diff --git a/admin/template/goto/check_integrity.tpl b/admin/themes/default/template/check_integrity.tpl
index 7cf566123..7cf566123 100644
--- a/admin/template/goto/check_integrity.tpl
+++ b/admin/themes/default/template/check_integrity.tpl
diff --git a/admin/template/goto/comments.tpl b/admin/themes/default/template/comments.tpl
index b7ac21ba4..b7ac21ba4 100644
--- a/admin/template/goto/comments.tpl
+++ b/admin/themes/default/template/comments.tpl
diff --git a/admin/template/goto/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 065a2ad76..065a2ad76 100644
--- a/admin/template/goto/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
diff --git a/admin/template/goto/double_select.tpl b/admin/themes/default/template/double_select.tpl
index ee9704419..ee9704419 100644
--- a/admin/template/goto/double_select.tpl
+++ b/admin/themes/default/template/double_select.tpl
diff --git a/admin/template/goto/element_set_global.tpl b/admin/themes/default/template/element_set_global.tpl
index fffea3f09..fffea3f09 100644
--- a/admin/template/goto/element_set_global.tpl
+++ b/admin/themes/default/template/element_set_global.tpl
diff --git a/admin/template/goto/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index ab4416b05..6fed3fb19 100644
--- a/admin/template/goto/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -1,6 +1,6 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js" }
-{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.sortable.packed.js" }
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js" }
 
 {literal}
 <script type="text/javascript">
diff --git a/admin/template/goto/element_set_unit.tpl b/admin/themes/default/template/element_set_unit.tpl
index 4e188590b..4e188590b 100644
--- a/admin/template/goto/element_set_unit.tpl
+++ b/admin/themes/default/template/element_set_unit.tpl
diff --git a/admin/template/goto/extend_for_templates.tpl b/admin/themes/default/template/extend_for_templates.tpl
index 0d093c3bf..0d093c3bf 100644
--- a/admin/template/goto/extend_for_templates.tpl
+++ b/admin/themes/default/template/extend_for_templates.tpl
diff --git a/admin/template/goto/footer.tpl b/admin/themes/default/template/footer.tpl
index e8709b59f..e8709b59f 100644
--- a/admin/template/goto/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
diff --git a/admin/template/goto/group_list.tpl b/admin/themes/default/template/group_list.tpl
index 6b32da66b..6b32da66b 100644
--- a/admin/template/goto/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
diff --git a/admin/template/goto/group_perm.tpl b/admin/themes/default/template/group_perm.tpl
index 1dded1291..1dded1291 100644
--- a/admin/template/goto/group_perm.tpl
+++ b/admin/themes/default/template/group_perm.tpl
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
new file mode 100644
index 000000000..57ae04fa4
--- /dev/null
+++ b/admin/themes/default/template/header.tpl
@@ -0,0 +1,77 @@
+{* 
+
+          Warning : This is the admin pages header only 
+          don't confuse with the public page header
+
+*}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}">
+<meta name="generator" content="Piwigo (aka PWG), see piwigo.org">
+<title>{$GALLERY_TITLE} :: {$PAGE_TITLE}</title>
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
+
+{foreach from=$themes item=theme}
+{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css">
+{/foreach}
+
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1} {*jQuery is always available by default*}
+
+<script type="text/javascript" src="{$ROOT_URL}themes/default/js/scripts.js"></script>
+<!--[if lt IE 7]>
+<script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script>
+<![endif]-->
+
+{if not empty($head_elements)}
+{foreach from=$head_elements item=elt}
+{$elt}
+{/foreach}
+{/if}
+
+</head>
+
+<body id="{$BODY_ID}">
+
+<div id="the_page">
+
+<div id="pwgHead">
+  <h1>
+    <a href="{$U_RETURN}" title="Visit Gallery">
+      <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/home.png" alt="{'Home'|@translate}">
+      {$GALLERY_TITLE}
+    </a>
+  </h1>
+
+  <div id="headActions">
+    Hello {$USERNAME} :
+    <a href="{$U_RETURN}" title="Visit Gallery">Visit Gallery</a> |
+    <a href="{$U_CHANGE_THEME}" title="Switch to clear theme for administration">Change Theme</a> |
+    <a href="{$U_LOGOUT}">{'Logout'|@translate}</a>
+    <a href="{$U_FAQ}" title="{'Instructions'|@translate}" id="instructions"><img style="padding-left:10px;" src="{$ROOT_URL}{$themeconf.admin_icon_dir}/help.png" class="button" alt="(?)"></a>
+  </div>
+</div>
+
+<div style="clear:both;"></div>
+
+{if not empty($header_msgs)}
+<div class="header_msgs">
+  {foreach from=$header_msgs item=elt}
+  {$elt}
+  {/foreach}
+</div>
+{/if}
+
+<div id="theHeader">{*$PAGE_BANNER*}</div>
+
+{if not empty($header_notes)}
+<div class="header_notes">
+  {foreach from=$header_notes item=elt}
+  {$elt}
+  {/foreach}
+</div>
+{/if}
+
+<div id="pwgMain">
+\ No newline at end of file
diff --git a/admin/template/goto/history.tpl b/admin/themes/default/template/history.tpl
index 5d0cd771e..5d0cd771e 100644
--- a/admin/template/goto/history.tpl
+++ b/admin/themes/default/template/history.tpl
diff --git a/template/default/include/autosize.inc.tpl b/admin/themes/default/template/include/autosize.inc.tpl
index 5529d07bd..8f5c78c70 100644
--- a/template/default/include/autosize.inc.tpl
+++ b/admin/themes/default/template/include/autosize.inc.tpl
@@ -1,5 +1,5 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.autogrow-textarea.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.autogrow-textarea.js"}
 
 {* Auto size and auto grow textarea *}
 {literal}
diff --git a/admin/themes/default/template/include/datepicker.inc.tpl b/admin/themes/default/template/include/datepicker.inc.tpl
new file mode 100644
index 000000000..f010febcf
--- /dev/null
+++ b/admin/themes/default/template/include/datepicker.inc.tpl
@@ -0,0 +1,24 @@
+
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
+{known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.datepicker.packed.js"}
+{known_script id="datepicker.js" src=$ROOT_URL|@cat:"themes/default/js/datepicker.js"}
+
+{assign var="datepicker_language" value="themes/default/js/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
+
+{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
+{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:$datepicker_language}
+{/if}
+
+{html_head}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/js/ui/themes/ui.datepicker.css">
+{/html_head}
+
+<script type="text/javascript">
+function pwg_initialization_datepicker(day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date)
+{ldelim}
+  return pwg_common_initialization_datepicker(
+    "{$ROOT_URL}{$themeconf.admin_icon_dir}/datepicker.png",
+    day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date);
+}
+</script>
diff --git a/admin/template/goto/include/dbselect.inc.tpl b/admin/themes/default/template/include/dbselect.inc.tpl
index 30db7400a..009452c1e 100644
--- a/admin/template/goto/include/dbselect.inc.tpl
+++ b/admin/themes/default/template/include/dbselect.inc.tpl
@@ -1,6 +1,6 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.resizable.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
+{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
 
 {* Resize possible *}
 {literal}
diff --git a/admin/template/goto/include/install.inc.tpl b/admin/themes/default/template/include/install.inc.tpl
index b153f0f30..b153f0f30 100644
--- a/admin/template/goto/include/install.inc.tpl
+++ b/admin/themes/default/template/include/install.inc.tpl
diff --git a/template/default/include/resize.inc.tpl b/admin/themes/default/template/include/resize.inc.tpl
index aebb9f6c5..30a637563 100644
--- a/template/default/include/resize.inc.tpl
+++ b/admin/themes/default/template/include/resize.inc.tpl
@@ -1,6 +1,6 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.resizable.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
+{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
 
 {* Resize possible *}
 {literal}
diff --git a/admin/template/goto/install.tpl b/admin/themes/default/template/install.tpl
index 28609c366..ce3d8d906 100644
--- a/admin/template/goto/install.tpl
+++ b/admin/themes/default/template/install.tpl
@@ -5,12 +5,32 @@
 <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">
-<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
-{include file="include/install.inc.tpl"}
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
+
+{foreach from=$themes item=theme}
+{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css">
+{/foreach}
+
+<script type="text/javascript" src="themes/default/js/jquery.packed.js"></script>
 {literal}
+<script type="text/javascript">
+$(function() {
+    $option_selected = $('#dblayer option:selected').attr('value');
+    if ($option_selected=='sqlite' || $option_selected=='pdo-sqlite') {
+       $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().hide();
+    }
+    $('#dblayer').change(function() {
+        $db = this;
+        if ($db.value=='sqlite' || $db.value=='pdo-sqlite') {
+           $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().hide();
+        } else {
+           $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().show();
+        }
+      });
+  });
+</script>
+
 <style type="text/css">
 .content {
  width: 800px;
diff --git a/admin/template/goto/intro.tpl b/admin/themes/default/template/intro.tpl
index 01cfda5af..86c65c0a3 100644
--- a/admin/template/goto/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -1,5 +1,5 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
 
 <script type="text/javascript">
 jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/maintenance.tpl b/admin/themes/default/template/maintenance.tpl
index 2208b5baa..2208b5baa 100644
--- a/admin/template/goto/maintenance.tpl
+++ b/admin/themes/default/template/maintenance.tpl
diff --git a/admin/template/goto/menubar.tpl b/admin/themes/default/template/menubar.tpl
index d77c2dbac..552880b45 100644
--- a/admin/template/goto/menubar.tpl
+++ b/admin/themes/default/template/menubar.tpl
@@ -1,6 +1,6 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js" }
-{known_script id="jquery-tablednd" src=$ROOT_URL|@cat:"template-common/lib/jquery.tablednd.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery-tablednd" src=$ROOT_URL|@cat:"themes/default/js/jquery.tablednd.js"}
 
 {literal}
 <script type="text/javascript">
diff --git a/admin/template/goto/navigation_bar.tpl b/admin/themes/default/template/navigation_bar.tpl
index 82c66bd15..82c66bd15 100644
--- a/admin/template/goto/navigation_bar.tpl
+++ b/admin/themes/default/template/navigation_bar.tpl
diff --git a/admin/template/goto/notification_by_mail.tpl b/admin/themes/default/template/notification_by_mail.tpl
index 3ffccd544..3ffccd544 100644
--- a/admin/template/goto/notification_by_mail.tpl
+++ b/admin/themes/default/template/notification_by_mail.tpl
diff --git a/admin/template/goto/permalinks.tpl b/admin/themes/default/template/permalinks.tpl
index ef5c7f802..ef5c7f802 100644
--- a/admin/template/goto/permalinks.tpl
+++ b/admin/themes/default/template/permalinks.tpl
diff --git a/admin/template/goto/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 5715d358e..9f59c11a7 100644
--- a/admin/template/goto/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -1,4 +1,4 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
 
 {literal}
 <script>
diff --git a/admin/template/goto/photos_add_settings.tpl b/admin/themes/default/template/photos_add_settings.tpl
index 10e4633dd..10e4633dd 100644
--- a/admin/template/goto/photos_add_settings.tpl
+++ b/admin/themes/default/template/photos_add_settings.tpl
diff --git a/admin/template/goto/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 77f1671a6..be5fa94a4 100644
--- a/admin/template/goto/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -2,7 +2,7 @@
 {include file='include/dbselect.inc.tpl'}
 {include file='include/datepicker.inc.tpl'}
 
-{known_script id="jquery.fcbkcomplete" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.fcbkcomplete.js"}
+{known_script id="jquery.fcbkcomplete" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.fcbkcomplete.js"}
 {literal}
 <script type="text/javascript">
   $(document).ready(function() {
diff --git a/admin/template/goto/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl
index 8743d6b6d..8743d6b6d 100644
--- a/admin/template/goto/plugins_list.tpl
+++ b/admin/themes/default/template/plugins_list.tpl
diff --git a/admin/template/goto/plugins_new.tpl b/admin/themes/default/template/plugins_new.tpl
index 6b106b87e..4bc7700b0 100644
--- a/admin/template/goto/plugins_new.tpl
+++ b/admin/themes/default/template/plugins_new.tpl
@@ -1,5 +1,5 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
 
 <script type="text/javascript">
 jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/plugins_update.tpl b/admin/themes/default/template/plugins_update.tpl
index d6fc71662..312fb3ba8 100644
--- a/admin/template/goto/plugins_update.tpl
+++ b/admin/themes/default/template/plugins_update.tpl
@@ -1,5 +1,5 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
 
 <script type="text/javascript">
 jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/popuphelp.tpl b/admin/themes/default/template/popuphelp.tpl
index 950e3ca0e..950e3ca0e 100644
--- a/admin/template/goto/popuphelp.tpl
+++ b/admin/themes/default/template/popuphelp.tpl
diff --git a/admin/template/goto/profile.tpl b/admin/themes/default/template/profile.tpl
index 6eac82e44..6eac82e44 100644
--- a/admin/template/goto/profile.tpl
+++ b/admin/themes/default/template/profile.tpl
diff --git a/admin/template/goto/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index fd8841a4e..fd8841a4e 100644
--- a/admin/template/goto/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
diff --git a/admin/template/goto/rating.tpl b/admin/themes/default/template/rating.tpl
index d7d3a85c9..d7d3a85c9 100644
--- a/admin/template/goto/rating.tpl
+++ b/admin/themes/default/template/rating.tpl
diff --git a/admin/template/goto/site_manager.tpl b/admin/themes/default/template/site_manager.tpl
index 678f177fb..678f177fb 100644
--- a/admin/template/goto/site_manager.tpl
+++ b/admin/themes/default/template/site_manager.tpl
diff --git a/admin/template/goto/site_update.tpl b/admin/themes/default/template/site_update.tpl
index 90a2562cf..90a2562cf 100644
--- a/admin/template/goto/site_update.tpl
+++ b/admin/themes/default/template/site_update.tpl
diff --git a/admin/template/goto/stats.tpl b/admin/themes/default/template/stats.tpl
index 692a3a6c5..692a3a6c5 100644
--- a/admin/template/goto/stats.tpl
+++ b/admin/themes/default/template/stats.tpl
diff --git a/admin/template/goto/tabsheet.tpl b/admin/themes/default/template/tabsheet.tpl
index 00b3f3c54..00b3f3c54 100644
--- a/admin/template/goto/tabsheet.tpl
+++ b/admin/themes/default/template/tabsheet.tpl
diff --git a/admin/template/goto/tags.tpl b/admin/themes/default/template/tags.tpl
index 3db8417a6..3db8417a6 100644
--- a/admin/template/goto/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
diff --git a/admin/template/goto/thumbnail.tpl b/admin/themes/default/template/thumbnail.tpl
index 653f07cc3..653f07cc3 100644
--- a/admin/template/goto/thumbnail.tpl
+++ b/admin/themes/default/template/thumbnail.tpl
diff --git a/admin/template/goto/upgrade.tpl b/admin/themes/default/template/upgrade.tpl
index a5424c9e6..29b723ef1 100644
--- a/admin/template/goto/upgrade.tpl
+++ b/admin/themes/default/template/upgrade.tpl
@@ -5,10 +5,13 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="Content-script-type" content="text/javascript">
 <meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
+
+{foreach from=$themes item=theme}
+{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css">
+{/foreach}
+
 {literal}
 <style type="text/css">
 .content {
diff --git a/admin/template/goto/upload.tpl b/admin/themes/default/template/upload.tpl
index cc56d9a02..cc56d9a02 100644
--- a/admin/template/goto/upload.tpl
+++ b/admin/themes/default/template/upload.tpl
diff --git a/admin/template/goto/user_list.tpl b/admin/themes/default/template/user_list.tpl
index ed68a719a..9eb14fa84 100644
--- a/admin/template/goto/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -218,10 +218,10 @@
   <tr>
     <td>{'Interface theme'|@translate}</td>
     <td>
-      <label><input type="radio" name="template_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="template_action" value="set" id="template_action_set"> {'set to'|@translate}</label>
-      <select onchange="document.getElementById('template_action_set').checked = true;" name="template" size="1">
-        {html_options values=$template_options output=$template_options selected=$template_selected}
+      <label><input type="radio" name="theme_action" value="leave" checked="checked"> {'leave'|@translate}</label>
+      <label><input type="radio" name="theme_action" value="set" id="theme_action_set"> {'set to'|@translate}</label>
+      <select onchange="document.getElementById('theme_action_set').checked = true;" name="theme" size="1">
+        {html_options values=$theme_options output=$theme_options selected=$theme_selected}
       </select>
     </td>
   </tr>
diff --git a/admin/template/goto/user_perm.tpl b/admin/themes/default/template/user_perm.tpl
index d1ecdca9a..d1ecdca9a 100644
--- a/admin/template/goto/user_perm.tpl
+++ b/admin/themes/default/template/user_perm.tpl
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
new file mode 100644
index 000000000..3283e29a5
--- /dev/null
+++ b/admin/themes/default/theme.css
@@ -0,0 +1,10 @@
+
+/* template css */
+/*@import "menubar.css";*/
+@import "content.css";
+@import "thumbnails.css";
+@import "default-layout.css";
+/* Override properties with import local file */
+@import "local-layout.css";
+
+@import "default-colors.css";
diff --git a/admin/themes/default/themeconf.inc.php b/admin/themes/default/themeconf.inc.php
new file mode 100644
index 000000000..36352b2b2
--- /dev/null
+++ b/admin/themes/default/themeconf.inc.php
@@ -0,0 +1,8 @@
+<?php
+$themeconf = array(
+  'theme'          => 'default',
+  'icon_dir'       => 'themes/default/icon',
+  'admin_icon_dir' => 'admin/themes/default/icon',
+  'mime_icon_dir'  => 'themes/default/icon/mimetypes/',
+);
+?>
diff --git a/admin/template/goto/thumbnails.css b/admin/themes/default/thumbnails.css
index 432854e4b..432854e4b 100644
--- a/admin/template/goto/thumbnails.css
+++ b/admin/themes/default/thumbnails.css
diff --git a/admin/template/goto/theme/roma/images/active_tab.png b/admin/themes/roma/images/active_tab.png
index f0fbcfae3..f0fbcfae3 100644
--- a/admin/template/goto/theme/roma/images/active_tab.png
+++ b/admin/themes/roma/images/active_tab.png
diff --git a/admin/template/goto/theme/roma/images/active_tab2.png b/admin/themes/roma/images/active_tab2.png
index 29ffdeedc..29ffdeedc 100644
--- a/admin/template/goto/theme/roma/images/active_tab2.png
+++ b/admin/themes/roma/images/active_tab2.png
diff --git a/admin/template/goto/theme/roma/images/active_tab3.png b/admin/themes/roma/images/active_tab3.png
index b84c40c11..b84c40c11 100644
--- a/admin/template/goto/theme/roma/images/active_tab3.png
+++ b/admin/themes/roma/images/active_tab3.png
diff --git a/admin/template/goto/theme/roma/images/bottom-left-bg.jpg b/admin/themes/roma/images/bottom-left-bg.jpg
index 3d8a5eed2..3d8a5eed2 100644
--- a/admin/template/goto/theme/roma/images/bottom-left-bg.jpg
+++ b/admin/themes/roma/images/bottom-left-bg.jpg
diff --git a/admin/template/goto/theme/roma/images/external_active.png b/admin/themes/roma/images/external_active.png
index 03c50fbf5..03c50fbf5 100644
--- a/admin/template/goto/theme/roma/images/external_active.png
+++ b/admin/themes/roma/images/external_active.png
diff --git a/admin/template/goto/theme/roma/images/external_inactive.png b/admin/themes/roma/images/external_inactive.png
index 918640316..918640316 100644
--- a/admin/template/goto/theme/roma/images/external_inactive.png
+++ b/admin/themes/roma/images/external_inactive.png
diff --git a/admin/template/goto/theme/roma/images/fillet.png b/admin/themes/roma/images/fillet.png
index c56a51aeb..c56a51aeb 100644
--- a/admin/template/goto/theme/roma/images/fillet.png
+++ b/admin/themes/roma/images/fillet.png
diff --git a/admin/template/goto/theme/roma/images/header_msgs-bg.gif b/admin/themes/roma/images/header_msgs-bg.gif
index 0879e1b79..0879e1b79 100644
--- a/admin/template/goto/theme/roma/images/header_msgs-bg.gif
+++ b/admin/themes/roma/images/header_msgs-bg.gif
diff --git a/admin/template/goto/theme/roma/images/inactive_tab.png b/admin/themes/roma/images/inactive_tab.png
index 8834859ab..8834859ab 100644
--- a/admin/template/goto/theme/roma/images/inactive_tab.png
+++ b/admin/themes/roma/images/inactive_tab.png
diff --git a/admin/template/goto/theme/roma/images/inactive_tab2.png b/admin/themes/roma/images/inactive_tab2.png
index 8d4183b94..8d4183b94 100644
--- a/admin/template/goto/theme/roma/images/inactive_tab2.png
+++ b/admin/themes/roma/images/inactive_tab2.png
diff --git a/admin/template/goto/theme/roma/images/inactive_tab3.png b/admin/themes/roma/images/inactive_tab3.png
index 2b22c8eb1..2b22c8eb1 100644
--- a/admin/template/goto/theme/roma/images/inactive_tab3.png
+++ b/admin/themes/roma/images/inactive_tab3.png
diff --git a/admin/template/goto/theme/roma/images/menuBoxBottom_new.png b/admin/themes/roma/images/menuBoxBottom_new.png
index 4df220e7c..4df220e7c 100644
--- a/admin/template/goto/theme/roma/images/menuBoxBottom_new.png
+++ b/admin/themes/roma/images/menuBoxBottom_new.png
diff --git a/admin/template/goto/theme/roma/images/menuBoxTop_new.png b/admin/themes/roma/images/menuBoxTop_new.png
index c8cecd2b1..c8cecd2b1 100644
--- a/admin/template/goto/theme/roma/images/menuBoxTop_new.png
+++ b/admin/themes/roma/images/menuBoxTop_new.png
diff --git a/admin/template/goto/theme/roma/images/menubar-detail.png b/admin/themes/roma/images/menubar-detail.png
index d7f4f2480..d7f4f2480 100644
--- a/admin/template/goto/theme/roma/images/menubar-detail.png
+++ b/admin/themes/roma/images/menubar-detail.png
diff --git a/admin/template/goto/theme/roma/images/menubar-top.png b/admin/themes/roma/images/menubar-top.png
index 3da3bcad3..3da3bcad3 100644
--- a/admin/template/goto/theme/roma/images/menubar-top.png
+++ b/admin/themes/roma/images/menubar-top.png
diff --git a/admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png b/admin/themes/roma/images/piwigo_logo_sombre_214x100.png
index 106f20add..106f20add 100644
--- a/admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png
+++ b/admin/themes/roma/images/piwigo_logo_sombre_214x100.png
diff --git a/admin/template/goto/theme/roma/images/quickLocalSync_hover.png b/admin/themes/roma/images/quickLocalSync_hover.png
index a8b9ed98b..a8b9ed98b 100644
--- a/admin/template/goto/theme/roma/images/quickLocalSync_hover.png
+++ b/admin/themes/roma/images/quickLocalSync_hover.png
diff --git a/admin/template/goto/theme/roma/images/quickLocalSync_inactiv.png b/admin/themes/roma/images/quickLocalSync_inactiv.png
index b26b23027..b26b23027 100644
--- a/admin/template/goto/theme/roma/images/quickLocalSync_inactiv.png
+++ b/admin/themes/roma/images/quickLocalSync_inactiv.png
diff --git a/admin/template/goto/theme/roma/images/resizable-e.gif b/admin/themes/roma/images/resizable-e.gif
index 36451a670..36451a670 100644
--- a/admin/template/goto/theme/roma/images/resizable-e.gif
+++ b/admin/themes/roma/images/resizable-e.gif
diff --git a/admin/template/goto/theme/roma/images/resizable-n.gif b/admin/themes/roma/images/resizable-n.gif
index fe11bf420..fe11bf420 100644
--- a/admin/template/goto/theme/roma/images/resizable-n.gif
+++ b/admin/themes/roma/images/resizable-n.gif
diff --git a/admin/template/goto/theme/roma/images/resizable-ne.gif b/admin/themes/roma/images/resizable-ne.gif
index 4819fdf1c..4819fdf1c 100644
--- a/admin/template/goto/theme/roma/images/resizable-ne.gif
+++ b/admin/themes/roma/images/resizable-ne.gif
diff --git a/admin/template/goto/theme/roma/images/resizable-nw.gif b/admin/themes/roma/images/resizable-nw.gif
index 7f128dac2..7f128dac2 100644
--- a/admin/template/goto/theme/roma/images/resizable-nw.gif
+++ b/admin/themes/roma/images/resizable-nw.gif
diff --git a/admin/template/goto/theme/roma/images/resizable-s.gif b/admin/themes/roma/images/resizable-s.gif
index 908576c9b..908576c9b 100644
--- a/admin/template/goto/theme/roma/images/resizable-s.gif
+++ b/admin/themes/roma/images/resizable-s.gif
diff --git a/admin/template/goto/theme/roma/images/resizable-se.gif b/admin/themes/roma/images/resizable-se.gif
index 0db439888..0db439888 100644
--- a/admin/template/goto/theme/roma/images/resizable-se.gif
+++ b/admin/themes/roma/images/resizable-se.gif
diff --git a/admin/template/goto/theme/roma/images/resizable-sw.gif b/admin/themes/roma/images/resizable-sw.gif
index e983320f6..e983320f6 100644
--- a/admin/template/goto/theme/roma/images/resizable-sw.gif
+++ b/admin/themes/roma/images/resizable-sw.gif
diff --git a/admin/template/goto/theme/roma/images/resizable-w.gif b/admin/themes/roma/images/resizable-w.gif
index fe2a79034..fe2a79034 100644
--- a/admin/template/goto/theme/roma/images/resizable-w.gif
+++ b/admin/themes/roma/images/resizable-w.gif
diff --git a/admin/template/goto/theme/roma/images/top-left-bg.jpg b/admin/themes/roma/images/top-left-bg.jpg
index 98aa1d6a5..98aa1d6a5 100644
--- a/admin/template/goto/theme/roma/images/top-left-bg.jpg
+++ b/admin/themes/roma/images/top-left-bg.jpg
diff --git a/admin/template/goto/theme/roma/images/transparent.gif b/admin/themes/roma/images/transparent.gif
index e565824aa..e565824aa 100644
--- a/admin/template/goto/theme/roma/images/transparent.gif
+++ b/admin/themes/roma/images/transparent.gif
diff --git a/admin/template/goto/theme/roma/index.php b/admin/themes/roma/index.php
index 871b52b6a..871b52b6a 100644
--- a/admin/template/goto/theme/roma/index.php
+++ b/admin/themes/roma/index.php
diff --git a/admin/template/goto/theme/roma/mail-css.tpl b/admin/themes/roma/mail-css.tpl
index a99f13c5a..a8da286b3 100644
--- a/admin/template/goto/theme/roma/mail-css.tpl
+++ b/admin/themes/roma/mail-css.tpl
@@ -5,7 +5,7 @@ body {ldelim} background-color:#111; color:#69c;}
 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
 color: #69c;}
-h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);}
+h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);}
 img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; }
 a {ldelim} color: #69c; background: transparent; }
diff --git a/admin/template/goto/theme/roma/theme.css b/admin/themes/roma/theme.css
index 81af6c627..81af6c627 100644
--- a/admin/template/goto/theme/roma/theme.css
+++ b/admin/themes/roma/theme.css
diff --git a/admin/themes/roma/themeconf.inc.php b/admin/themes/roma/themeconf.inc.php
new file mode 100644
index 000000000..1260576ab
--- /dev/null
+++ b/admin/themes/roma/themeconf.inc.php
@@ -0,0 +1,11 @@
+<?php
+if (!function_exists('selected_admin_menu')) 
+{
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php');
+}
+$themeconf = array(
+  'theme'  => 'roma',
+  'parent' => 'default',
+  'selected_admin_menu' => selected_admin_menu(),
+);
+?>
diff --git a/admin/user_list.php b/admin/user_list.php
index b69bac20e..e677f49d1 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -385,7 +385,7 @@ DELETE FROM '.USER_GROUP_TABLE.'
   $dbfields = array('primary' => array('user_id'), 'update' => array());
 
   $formfields =
-    array('nb_image_line', 'nb_line_page', 'template', 'language',
+    array('nb_image_line', 'nb_line_page', 'theme', 'language',
           'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
           'show_nb_hits', 'maxheight', 'status', 'enabled_high',
           'level');
@@ -583,16 +583,16 @@ else
 }
 
 // Template Options
-$template->assign('template_options', get_pwg_themes());
-$template->assign('template_selected',
-    isset($_POST['pref_submit']) ? $_POST['template'] : get_default_template());
+$template->assign('theme_options', get_pwg_themes());
+$template->assign('theme_selected',
+    isset($_POST['pref_submit']) ? $_POST['theme'] : get_default_theme());
 
 // Language options
 $template->assign('language_options', get_languages());
 $template->assign('language_selected',
     isset($_POST['pref_submit']) ? $_POST['language'] : get_default_language());
 
-Log::getInstance()->debug($status);
+//Log::getInstance()->debug($status);
 // Status options
 foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)
 {
diff --git a/admin/template/goto/include/autosize.inc.tpl b/themes/default/template/include/autosize.inc.tpl
index 5529d07bd..8f5c78c70 100644
--- a/admin/template/goto/include/autosize.inc.tpl
+++ b/themes/default/template/include/autosize.inc.tpl
@@ -1,5 +1,5 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.autogrow-textarea.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.autogrow-textarea.js"}
 
 {* Auto size and auto grow textarea *}
 {literal}
diff --git a/admin/template/goto/include/resize.inc.tpl b/themes/default/template/include/resize.inc.tpl
index aebb9f6c5..30a637563 100644
--- a/admin/template/goto/include/resize.inc.tpl
+++ b/themes/default/template/include/resize.inc.tpl
@@ -1,6 +1,6 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.resizable.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
+{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
 
 {* Resize possible *}
 {literal}