diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php
index da3452e84..6d277bf3f 100644
--- a/admin/advanced_feature.php
+++ b/admin/advanced_feature.php
@@ -85,7 +85,7 @@ $advanced_features =
 // |  Template init                                                        |
 // +-----------------------------------------------------------------------+
 
-$template->set_filename('advanced_feature', 'admin/advanced_feature.tpl');
+$template->set_filename('advanced_feature', 'advanced_feature.tpl');
 
 $start_url = get_root_url().'admin.php?page=advanced_feature&action=';
 
diff --git a/admin/cat_list.php b/admin/cat_list.php
index 2fa4ee25f..a12cd5717 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -150,7 +150,7 @@ if (isset($_GET['parent_id']))
 // +-----------------------------------------------------------------------+
 // |                       template initialization                         |
 // +-----------------------------------------------------------------------+
-$template->set_filename('categories', 'admin/cat_list.tpl');
+$template->set_filename('categories', 'cat_list.tpl');
 
 $form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_list';
 if (isset($_GET['parent_id']))
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 5d788b8c2..6f313f9ea 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -221,7 +221,7 @@ $navigation = get_cat_display_name_cache(
 $form_action = get_root_url().'admin.php?page=cat_modify&cat_id='.$_GET['cat_id'];
 
 //----------------------------------------------------- template initialization
-$template->set_filename( 'categories', 'admin/cat_modify.tpl');
+$template->set_filename( 'categories', 'cat_modify.tpl');
 
 $base_url = get_root_url().'admin.php?page=';
 $cat_list_url = $base_url.'cat_list';
diff --git a/admin/cat_move.php b/admin/cat_move.php
index 412b1412f..107534d33 100644
--- a/admin/cat_move.php
+++ b/admin/cat_move.php
@@ -61,7 +61,7 @@ if (isset($_POST['submit']))
 // +-----------------------------------------------------------------------+
 // |                       template initialization                         |
 // +-----------------------------------------------------------------------+
-$template->set_filename('cat_move', 'admin/cat_move.tpl');
+$template->set_filename('cat_move', 'cat_move.tpl');
 
 $template->assign(
   array(
diff --git a/admin/cat_options.php b/admin/cat_options.php
index 810534f0b..3100d59b0 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -141,8 +141,8 @@ UPDATE '.CATEGORIES_TABLE.'
 
 $template->set_filenames(
   array(
-    'cat_options' => 'admin/cat_options.tpl',
-    'double_select' => 'admin/double_select.tpl'
+    'cat_options' => 'cat_options.tpl',
+    'double_select' => 'double_select.tpl'
     )
   );
 
diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index 45eb15937..59f3dab1a 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -193,7 +193,7 @@ SELECT user_id, cat_id
 // |                       template initialization                         |
 // +-----------------------------------------------------------------------+
 
-$template->set_filename('cat_perm', 'admin/cat_perm.tpl');
+$template->set_filename('cat_perm', 'cat_perm.tpl');
 
 $template->assign(
   array(
diff --git a/admin/comments.php b/admin/comments.php
index 200451989..ca380caca 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -116,7 +116,7 @@ DELETE
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 
-$template->set_filenames(array('comments'=>'admin/comments.tpl'));
+$template->set_filenames(array('comments'=>'comments.tpl'));
 
 // TabSheet initialization
 waiting_tabsheet();
diff --git a/admin/configuration.php b/admin/configuration.php
index 8e69d9c16..c363f9361 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -164,7 +164,7 @@ WHERE param = \''.$row['param'].'\'
 }
 
 //----------------------------------------------------- template initialization
-$template->set_filename('config', 'admin/configuration.tpl');
+$template->set_filename('config', 'configuration.tpl');
 
 // TabSheet
 $tabsheet = new tabsheet();
diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 20daf4dff..4b22f112f 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -200,7 +200,7 @@ SELECT id
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 $template->set_filenames(
-  array('element_set_global' => 'admin/element_set_global.tpl'));
+  array('element_set_global' => 'element_set_global.tpl'));
 
 $base_url = get_root_url().'admin.php';
 
diff --git a/admin/element_set_ranks.php b/admin/element_set_ranks.php
index 9f4a086ee..4c856264d 100644
--- a/admin/element_set_ranks.php
+++ b/admin/element_set_ranks.php
@@ -103,7 +103,7 @@ if (isset($_POST['submit']))
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 $template->set_filenames(
-  array('element_set_ranks' => 'admin/element_set_ranks.tpl')
+  array('element_set_ranks' => 'element_set_ranks.tpl')
   );
 
 $base_url = get_root_url().'admin.php';
diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php
index 28b1cd828..b4eeebb1a 100644
--- a/admin/element_set_unit.php
+++ b/admin/element_set_unit.php
@@ -126,7 +126,7 @@ SELECT id, date_creation
 // +-----------------------------------------------------------------------+
 
 $template->set_filenames(
-  array('element_set_unit' => 'admin/element_set_unit.tpl'));
+  array('element_set_unit' => 'element_set_unit.tpl'));
 
 $base_url = PHPWG_ROOT_PATH.'admin.php';
 
diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php
index 00b83c3d9..04fd0177f 100644
--- a/admin/extend_for_templates.php
+++ b/admin/extend_for_templates.php
@@ -181,7 +181,7 @@ foreach ($new_extensions as $file)
 }
 
 $template->set_filenames(array('extend_for_templates'
-     => 'admin/extend_for_templates.tpl'));
+     => 'extend_for_templates.tpl'));
 
 $base_url = PHPWG_ROOT_PATH.'admin.php?page=extend_for_templates';
 
diff --git a/admin/group_list.php b/admin/group_list.php
index 323674bc1..09462025e 100644
--- a/admin/group_list.php
+++ b/admin/group_list.php
@@ -149,7 +149,7 @@ UPDATE '.GROUPS_TABLE.'
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 
-$template->set_filenames(array('group_list' => 'admin/group_list.tpl'));
+$template->set_filenames(array('group_list' => 'group_list.tpl'));
 
 $template->assign(
   array(
diff --git a/admin/group_perm.php b/admin/group_perm.php
index 430730001..af43c6d5e 100644
--- a/admin/group_perm.php
+++ b/admin/group_perm.php
@@ -123,8 +123,8 @@ SELECT cat_id
 
 $template->set_filenames(
   array(
-    'group_perm' => 'admin/group_perm.tpl',
-    'double_select' => 'admin/double_select.tpl'
+    'group_perm' => 'group_perm.tpl',
+    'double_select' => 'double_select.tpl'
     )
   );
 
diff --git a/admin/history.php b/admin/history.php
index c064e7516..02b321055 100644
--- a/admin/history.php
+++ b/admin/history.php
@@ -151,7 +151,7 @@ INSERT INTO '.SEARCH_TABLE.'
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 
-$template->set_filename('history', 'admin/history.tpl');
+$template->set_filename('history', 'history.tpl');
 
 // TabSheet initialization
 history_tabsheet();
diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php
index b6f3ddd6a..97d29bb76 100644
--- a/admin/include/check_integrity.class.php
+++ b/admin/include/check_integrity.class.php
@@ -184,7 +184,7 @@ class check_integrity
 
     if (isset($this->retrieve_list) and count($this->retrieve_list) > 0)
     {
-      $template->set_filenames(array('check_integrity' => 'admin/check_integrity.tpl'));
+      $template->set_filenames(array('check_integrity' => 'check_integrity.tpl'));
 
       foreach ($this->retrieve_list as $i => $c13y)
       {
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index c7c9f1942..683b1d55b 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -261,7 +261,7 @@ function set_user_on_env_nbm(&$nbm_user, $is_action_send)
     $env_nbm['mail_template'] =
       get_mail_template($env_nbm['email_format'], 
         array('template' => $nbm_user['template'], 'theme' => $nbm_user['theme']));
-    $env_nbm['mail_template']->set_filename('notification_by_mail', 'admin/notification_by_mail.tpl');
+    $env_nbm['mail_template']->set_filename('notification_by_mail', 'notification_by_mail.tpl');
   }
 }
 
diff --git a/admin/include/tabsheet.class.php b/admin/include/tabsheet.class.php
index c295f0ae0..77452a81d 100644
--- a/admin/include/tabsheet.class.php
+++ b/admin/include/tabsheet.class.php
@@ -126,7 +126,7 @@ class tabsheet
   {
     global $template;
 
-    $template->set_filename('tabsheet', 'admin/tabsheet.tpl');
+    $template->set_filename('tabsheet', 'tabsheet.tpl');
     $template->assign('tabsheet', $this->sheets);
     $template->assign('tabsheet_selected', $this->selected);
 
diff --git a/admin/maintenance.php b/admin/maintenance.php
index 69268cf2c..946fcf916 100644
--- a/admin/maintenance.php
+++ b/admin/maintenance.php
@@ -115,7 +115,7 @@ DELETE
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 
-$template->set_filenames(array('maintenance'=>'admin/maintenance.tpl'));
+$template->set_filenames(array('maintenance'=>'maintenance.tpl'));
 
 $start_url = get_root_url().'admin.php?page=maintenance&action=';
 
diff --git a/admin/menubar.php b/admin/menubar.php
index bdd761762..9873fb8f6 100644
--- a/admin/menubar.php
+++ b/admin/menubar.php
@@ -157,6 +157,6 @@ foreach ($mb_conf as $id => $pos )
       )
      );
 }
-$template->set_filename( 'menubar_admin_content', 'admin/menubar.tpl' );
+$template->set_filename( 'menubar_admin_content', 'menubar.tpl' );
 $template->assign_var_from_handle( 'ADMIN_CONTENT', 'menubar_admin_content');
 ?>
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index fc0a2d637..829637ea1 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -574,8 +574,8 @@ $template->set_filenames
 (
   array
   (
-    'double_select' => 'admin/double_select.tpl',
-    'notification_by_mail'=>'admin/notification_by_mail.tpl'
+    'double_select' => 'double_select.tpl',
+    'notification_by_mail'=>'notification_by_mail.tpl'
   )
 );
 
diff --git a/admin/permalinks.php b/admin/permalinks.php
index ecae18965..645e65b61 100644
--- a/admin/permalinks.php
+++ b/admin/permalinks.php
@@ -104,7 +104,7 @@ DELETE FROM '.OLD_PERMALINKS_TABLE.'
 }
 
 
-$template->set_filename('permalinks', 'admin/permalinks.tpl' );
+$template->set_filename('permalinks', 'permalinks.tpl' );
 
 $query = '
 SELECT
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 2fbaf901b..d9437eb20 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -194,7 +194,7 @@ $selected_tags = array_from_query($query, 'tag_id');
 
 $template->set_filenames(
   array(
-    'picture_modify' => 'admin/picture_modify.tpl'
+    'picture_modify' => 'picture_modify.tpl'
     )
   );
 
diff --git a/admin/plugins_list.php b/admin/plugins_list.php
index ca8033164..ddae73ce3 100644
--- a/admin/plugins_list.php
+++ b/admin/plugins_list.php
@@ -28,7 +28,7 @@ if( !defined("PHPWG_ROOT_PATH") )
 
 include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
 
-$template->set_filenames(array('plugins' => 'admin/plugins_list.tpl'));
+$template->set_filenames(array('plugins' => 'plugins_list.tpl'));
 
 $order = isset($_GET['order']) ? $_GET['order'] : 'name';
 $base_url = get_root_url().'admin.php?page='.$page['page'].'&order='.$order;
diff --git a/admin/plugins_new.php b/admin/plugins_new.php
index 31171b443..19d2be9a4 100644
--- a/admin/plugins_new.php
+++ b/admin/plugins_new.php
@@ -28,7 +28,7 @@ if( !defined("PHPWG_ROOT_PATH") )
 
 include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
 
-$template->set_filenames(array('plugins' => 'admin/plugins_new.tpl'));
+$template->set_filenames(array('plugins' => 'plugins_new.tpl'));
 
 $order = isset($_GET['order']) ? $_GET['order'] : 'date';
 $base_url = get_root_url().'admin.php?page='.$page['page'].'&order='.$order;
diff --git a/admin/plugins_update.php b/admin/plugins_update.php
index bdb8c5b9d..3c274b14f 100644
--- a/admin/plugins_update.php
+++ b/admin/plugins_update.php
@@ -28,7 +28,7 @@ if( !defined("PHPWG_ROOT_PATH") )
 
 include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
 
-$template->set_filenames(array('plugins' => 'admin/plugins_update.tpl'));
+$template->set_filenames(array('plugins' => 'plugins_update.tpl'));
 
 $base_url = get_root_url().'admin.php?page='.$page['page'];
 
diff --git a/admin/profile.php b/admin/profile.php
index 7c4244494..643f6cca5 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -41,6 +41,6 @@ load_profile_in_template(
   );
 $page['errors'] = array_merge($page['errors'], $errors);
 
-$template->set_filename('profile', 'admin/profile.tpl');
+$template->set_filename('profile', 'profile.tpl');
 $template->assign_var_from_handle('ADMIN_CONTENT', 'profile');
 ?>
diff --git a/admin/rating.php b/admin/rating.php
index 11ed82cb4..53ec75a7f 100644
--- a/admin/rating.php
+++ b/admin/rating.php
@@ -111,7 +111,7 @@ list($nb_images) = mysql_fetch_row(pwg_query($query));
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 
-$template->set_filename('rating', 'admin/rating.tpl');
+$template->set_filename('rating', 'rating.tpl');
 
 $template->assign(
   array(
diff --git a/admin/site_manager.php b/admin/site_manager.php
index def9fe579..b965b26e8 100644
--- a/admin/site_manager.php
+++ b/admin/site_manager.php
@@ -72,7 +72,7 @@ function remote_output($url)
 // +-----------------------------------------------------------------------+
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
-$template->set_filenames(array('site_manager'=>'admin/site_manager.tpl'));
+$template->set_filenames(array('site_manager'=>'site_manager.tpl'));
 
 // +-----------------------------------------------------------------------+
 // |                        new site creation form                         |
diff --git a/admin/site_update.php b/admin/site_update.php
index ba406afe4..5576e83f2 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -830,7 +830,7 @@ SELECT id
 // +-----------------------------------------------------------------------+
 // |                        template initialization                        |
 // +-----------------------------------------------------------------------+
-$template->set_filenames(array('update'=>'admin/site_update.tpl'));
+$template->set_filenames(array('update'=>'site_update.tpl'));
 $result_title = '';
 if (isset($simulate) and $simulate)
 {
diff --git a/admin/stats.php b/admin/stats.php
index 9892127c8..d1d0aa418 100644
--- a/admin/stats.php
+++ b/admin/stats.php
@@ -371,7 +371,7 @@ if (isset($page['day']))
   $period_label = l10n('Hour');
 }
 
-$template->set_filename('stats', 'admin/stats.tpl');
+$template->set_filename('stats', 'stats.tpl');
 
 // TabSheet initialization
 history_tabsheet();
diff --git a/admin/tags.php b/admin/tags.php
index 36e668a3d..34524726f 100644
--- a/admin/tags.php
+++ b/admin/tags.php
@@ -185,7 +185,7 @@ SELECT id
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 
-$template->set_filenames(array('tags' => 'admin/tags.tpl'));
+$template->set_filenames(array('tags' => 'tags.tpl'));
 
 $template->assign(
   array(
diff --git a/admin/template/wigo/admin.tpl b/admin/template/goto/admin.tpl
similarity index 100%
rename from admin/template/wigo/admin.tpl
rename to admin/template/goto/admin.tpl
diff --git a/admin/template/wigo/admin/advanced_feature.tpl b/admin/template/goto/admin/advanced_feature.tpl
similarity index 100%
rename from admin/template/wigo/admin/advanced_feature.tpl
rename to admin/template/goto/admin/advanced_feature.tpl
diff --git a/admin/template/wigo/admin/cat_list.tpl b/admin/template/goto/admin/cat_list.tpl
similarity index 100%
rename from admin/template/wigo/admin/cat_list.tpl
rename to admin/template/goto/admin/cat_list.tpl
diff --git a/admin/template/wigo/admin/cat_modify.tpl b/admin/template/goto/admin/cat_modify.tpl
similarity index 100%
rename from admin/template/wigo/admin/cat_modify.tpl
rename to admin/template/goto/admin/cat_modify.tpl
diff --git a/admin/template/wigo/admin/cat_move.tpl b/admin/template/goto/admin/cat_move.tpl
similarity index 100%
rename from admin/template/wigo/admin/cat_move.tpl
rename to admin/template/goto/admin/cat_move.tpl
diff --git a/admin/template/wigo/admin/cat_options.tpl b/admin/template/goto/admin/cat_options.tpl
similarity index 100%
rename from admin/template/wigo/admin/cat_options.tpl
rename to admin/template/goto/admin/cat_options.tpl
diff --git a/admin/template/wigo/admin/cat_perm.tpl b/admin/template/goto/admin/cat_perm.tpl
similarity index 100%
rename from admin/template/wigo/admin/cat_perm.tpl
rename to admin/template/goto/admin/cat_perm.tpl
diff --git a/admin/template/wigo/admin/check_integrity.tpl b/admin/template/goto/admin/check_integrity.tpl
similarity index 100%
rename from admin/template/wigo/admin/check_integrity.tpl
rename to admin/template/goto/admin/check_integrity.tpl
diff --git a/admin/template/wigo/admin/comments.tpl b/admin/template/goto/admin/comments.tpl
similarity index 100%
rename from admin/template/wigo/admin/comments.tpl
rename to admin/template/goto/admin/comments.tpl
diff --git a/admin/template/wigo/admin/configuration.tpl b/admin/template/goto/admin/configuration.tpl
similarity index 100%
rename from admin/template/wigo/admin/configuration.tpl
rename to admin/template/goto/admin/configuration.tpl
diff --git a/admin/template/wigo/admin/double_select.tpl b/admin/template/goto/admin/double_select.tpl
similarity index 100%
rename from admin/template/wigo/admin/double_select.tpl
rename to admin/template/goto/admin/double_select.tpl
diff --git a/admin/template/wigo/admin/element_set_global.tpl b/admin/template/goto/admin/element_set_global.tpl
similarity index 100%
rename from admin/template/wigo/admin/element_set_global.tpl
rename to admin/template/goto/admin/element_set_global.tpl
diff --git a/admin/template/wigo/admin/element_set_ranks.tpl b/admin/template/goto/admin/element_set_ranks.tpl
similarity index 100%
rename from admin/template/wigo/admin/element_set_ranks.tpl
rename to admin/template/goto/admin/element_set_ranks.tpl
diff --git a/admin/template/wigo/admin/element_set_unit.tpl b/admin/template/goto/admin/element_set_unit.tpl
similarity index 100%
rename from admin/template/wigo/admin/element_set_unit.tpl
rename to admin/template/goto/admin/element_set_unit.tpl
diff --git a/admin/template/wigo/admin/extend_for_templates.tpl b/admin/template/goto/admin/extend_for_templates.tpl
similarity index 100%
rename from admin/template/wigo/admin/extend_for_templates.tpl
rename to admin/template/goto/admin/extend_for_templates.tpl
diff --git a/admin/template/wigo/admin/group_list.tpl b/admin/template/goto/admin/group_list.tpl
similarity index 100%
rename from admin/template/wigo/admin/group_list.tpl
rename to admin/template/goto/admin/group_list.tpl
diff --git a/admin/template/wigo/admin/group_perm.tpl b/admin/template/goto/admin/group_perm.tpl
similarity index 100%
rename from admin/template/wigo/admin/group_perm.tpl
rename to admin/template/goto/admin/group_perm.tpl
diff --git a/admin/template/wigo/admin/history.tpl b/admin/template/goto/admin/history.tpl
similarity index 100%
rename from admin/template/wigo/admin/history.tpl
rename to admin/template/goto/admin/history.tpl
diff --git a/admin/template/wigo/admin/index.php b/admin/template/goto/admin/index.php
similarity index 100%
rename from admin/template/wigo/admin/index.php
rename to admin/template/goto/admin/index.php
diff --git a/admin/template/wigo/admin/intro.tpl b/admin/template/goto/admin/intro.tpl
similarity index 100%
rename from admin/template/wigo/admin/intro.tpl
rename to admin/template/goto/admin/intro.tpl
diff --git a/admin/template/wigo/admin/maintenance.tpl b/admin/template/goto/admin/maintenance.tpl
similarity index 100%
rename from admin/template/wigo/admin/maintenance.tpl
rename to admin/template/goto/admin/maintenance.tpl
diff --git a/admin/template/wigo/admin/menubar.tpl b/admin/template/goto/admin/menubar.tpl
similarity index 100%
rename from admin/template/wigo/admin/menubar.tpl
rename to admin/template/goto/admin/menubar.tpl
diff --git a/admin/template/wigo/admin/notification_by_mail.tpl b/admin/template/goto/admin/notification_by_mail.tpl
similarity index 100%
rename from admin/template/wigo/admin/notification_by_mail.tpl
rename to admin/template/goto/admin/notification_by_mail.tpl
diff --git a/admin/template/wigo/admin/permalinks.tpl b/admin/template/goto/admin/permalinks.tpl
similarity index 100%
rename from admin/template/wigo/admin/permalinks.tpl
rename to admin/template/goto/admin/permalinks.tpl
diff --git a/admin/template/wigo/admin/picture_modify.tpl b/admin/template/goto/admin/picture_modify.tpl
similarity index 100%
rename from admin/template/wigo/admin/picture_modify.tpl
rename to admin/template/goto/admin/picture_modify.tpl
diff --git a/admin/template/wigo/admin/plugins_list.tpl b/admin/template/goto/admin/plugins_list.tpl
similarity index 100%
rename from admin/template/wigo/admin/plugins_list.tpl
rename to admin/template/goto/admin/plugins_list.tpl
diff --git a/admin/template/wigo/admin/plugins_new.tpl b/admin/template/goto/admin/plugins_new.tpl
similarity index 100%
rename from admin/template/wigo/admin/plugins_new.tpl
rename to admin/template/goto/admin/plugins_new.tpl
diff --git a/admin/template/wigo/admin/plugins_update.tpl b/admin/template/goto/admin/plugins_update.tpl
similarity index 100%
rename from admin/template/wigo/admin/plugins_update.tpl
rename to admin/template/goto/admin/plugins_update.tpl
diff --git a/admin/template/wigo/admin/profile.tpl b/admin/template/goto/admin/profile.tpl
similarity index 100%
rename from admin/template/wigo/admin/profile.tpl
rename to admin/template/goto/admin/profile.tpl
diff --git a/admin/template/wigo/admin/rating.tpl b/admin/template/goto/admin/rating.tpl
similarity index 100%
rename from admin/template/wigo/admin/rating.tpl
rename to admin/template/goto/admin/rating.tpl
diff --git a/admin/template/wigo/admin/site_manager.tpl b/admin/template/goto/admin/site_manager.tpl
similarity index 100%
rename from admin/template/wigo/admin/site_manager.tpl
rename to admin/template/goto/admin/site_manager.tpl
diff --git a/admin/template/wigo/admin/site_update.tpl b/admin/template/goto/admin/site_update.tpl
similarity index 100%
rename from admin/template/wigo/admin/site_update.tpl
rename to admin/template/goto/admin/site_update.tpl
diff --git a/admin/template/wigo/admin/stats.tpl b/admin/template/goto/admin/stats.tpl
similarity index 100%
rename from admin/template/wigo/admin/stats.tpl
rename to admin/template/goto/admin/stats.tpl
diff --git a/admin/template/wigo/admin/tabsheet.tpl b/admin/template/goto/admin/tabsheet.tpl
similarity index 100%
rename from admin/template/wigo/admin/tabsheet.tpl
rename to admin/template/goto/admin/tabsheet.tpl
diff --git a/admin/template/wigo/admin/tags.tpl b/admin/template/goto/admin/tags.tpl
similarity index 100%
rename from admin/template/wigo/admin/tags.tpl
rename to admin/template/goto/admin/tags.tpl
diff --git a/admin/template/wigo/admin/thumbnail.tpl b/admin/template/goto/admin/thumbnail.tpl
similarity index 100%
rename from admin/template/wigo/admin/thumbnail.tpl
rename to admin/template/goto/admin/thumbnail.tpl
diff --git a/admin/template/wigo/admin/upload.tpl b/admin/template/goto/admin/upload.tpl
similarity index 100%
rename from admin/template/wigo/admin/upload.tpl
rename to admin/template/goto/admin/upload.tpl
diff --git a/admin/template/wigo/admin/user_list.tpl b/admin/template/goto/admin/user_list.tpl
similarity index 100%
rename from admin/template/wigo/admin/user_list.tpl
rename to admin/template/goto/admin/user_list.tpl
diff --git a/admin/template/wigo/admin/user_perm.tpl b/admin/template/goto/admin/user_perm.tpl
similarity index 100%
rename from admin/template/wigo/admin/user_perm.tpl
rename to admin/template/goto/admin/user_perm.tpl
diff --git a/admin/template/wigo/content.css b/admin/template/goto/content.css
similarity index 100%
rename from admin/template/wigo/content.css
rename to admin/template/goto/content.css
diff --git a/admin/template/wigo/default-colors.css b/admin/template/goto/default-colors.css
similarity index 100%
rename from admin/template/wigo/default-colors.css
rename to admin/template/goto/default-colors.css
diff --git a/admin/template/wigo/default-layout.css b/admin/template/goto/default-layout.css
similarity index 100%
rename from admin/template/wigo/default-layout.css
rename to admin/template/goto/default-layout.css
diff --git a/admin/template/wigo/fix-ie5-ie6.css b/admin/template/goto/fix-ie5-ie6.css
similarity index 100%
rename from admin/template/wigo/fix-ie5-ie6.css
rename to admin/template/goto/fix-ie5-ie6.css
diff --git a/admin/template/wigo/footer.tpl b/admin/template/goto/footer.tpl
similarity index 100%
rename from admin/template/wigo/footer.tpl
rename to admin/template/goto/footer.tpl
diff --git a/admin/template/wigo/header.tpl b/admin/template/goto/header.tpl
similarity index 100%
rename from admin/template/wigo/header.tpl
rename to admin/template/goto/header.tpl
diff --git a/admin/template/goto/icon/category_children.png b/admin/template/goto/icon/category_children.png
new file mode 100644
index 000000000..7205c3f61
Binary files /dev/null and b/admin/template/goto/icon/category_children.png differ
diff --git a/admin/template/goto/icon/category_delete.png b/admin/template/goto/icon/category_delete.png
new file mode 100644
index 000000000..74bea69ed
Binary files /dev/null and b/admin/template/goto/icon/category_delete.png differ
diff --git a/admin/template/goto/icon/category_edit.png b/admin/template/goto/icon/category_edit.png
new file mode 100644
index 000000000..0f3b619ed
Binary files /dev/null and b/admin/template/goto/icon/category_edit.png differ
diff --git a/admin/template/goto/icon/category_elements.png b/admin/template/goto/icon/category_elements.png
new file mode 100644
index 000000000..1d367b38f
Binary files /dev/null and b/admin/template/goto/icon/category_elements.png differ
diff --git a/admin/template/goto/icon/category_jump-to.png b/admin/template/goto/icon/category_jump-to.png
new file mode 100644
index 000000000..62db1f4ee
Binary files /dev/null and b/admin/template/goto/icon/category_jump-to.png differ
diff --git a/admin/template/goto/icon/category_permissions.png b/admin/template/goto/icon/category_permissions.png
new file mode 100644
index 000000000..4780841ae
Binary files /dev/null and b/admin/template/goto/icon/category_permissions.png differ
diff --git a/admin/template/goto/icon/category_representant_random.png b/admin/template/goto/icon/category_representant_random.png
new file mode 100644
index 000000000..dfa69846f
Binary files /dev/null and b/admin/template/goto/icon/category_representant_random.png differ
diff --git a/admin/template/goto/icon/check.png b/admin/template/goto/icon/check.png
new file mode 100644
index 000000000..d9abf2763
Binary files /dev/null and b/admin/template/goto/icon/check.png differ
diff --git a/admin/template/goto/icon/del_favorite.png b/admin/template/goto/icon/del_favorite.png
new file mode 100644
index 000000000..cfc609749
Binary files /dev/null and b/admin/template/goto/icon/del_favorite.png differ
diff --git a/admin/template/goto/icon/delete.png b/admin/template/goto/icon/delete.png
new file mode 100644
index 000000000..af10be03e
Binary files /dev/null and b/admin/template/goto/icon/delete.png differ
diff --git a/admin/template/goto/icon/edit_s.png b/admin/template/goto/icon/edit_s.png
new file mode 100644
index 000000000..e4951d22f
Binary files /dev/null and b/admin/template/goto/icon/edit_s.png differ
diff --git a/admin/template/goto/icon/errors.png b/admin/template/goto/icon/errors.png
new file mode 100644
index 000000000..3c8a37df5
Binary files /dev/null and b/admin/template/goto/icon/errors.png differ
diff --git a/admin/template/goto/icon/exit.png b/admin/template/goto/icon/exit.png
new file mode 100644
index 000000000..2aafbb4cb
Binary files /dev/null and b/admin/template/goto/icon/exit.png differ
diff --git a/admin/template/goto/icon/help.png b/admin/template/goto/icon/help.png
new file mode 100644
index 000000000..c76f68292
Binary files /dev/null and b/admin/template/goto/icon/help.png differ
diff --git a/admin/template/wigo/index.php b/admin/template/goto/icon/index.php
similarity index 100%
rename from admin/template/wigo/index.php
rename to admin/template/goto/icon/index.php
diff --git a/admin/template/goto/icon/infos.png b/admin/template/goto/icon/infos.png
new file mode 100644
index 000000000..dc8c8a457
Binary files /dev/null and b/admin/template/goto/icon/infos.png differ
diff --git a/admin/template/goto/icon/note.png b/admin/template/goto/icon/note.png
new file mode 100644
index 000000000..5849f791b
Binary files /dev/null and b/admin/template/goto/icon/note.png differ
diff --git a/admin/template/goto/icon/page_end.png b/admin/template/goto/icon/page_end.png
new file mode 100644
index 000000000..c8f54fb91
Binary files /dev/null and b/admin/template/goto/icon/page_end.png differ
diff --git a/admin/template/goto/icon/page_top.png b/admin/template/goto/icon/page_top.png
new file mode 100644
index 000000000..8b18f13c3
Binary files /dev/null and b/admin/template/goto/icon/page_top.png differ
diff --git a/admin/template/goto/icon/permissions.png b/admin/template/goto/icon/permissions.png
new file mode 100644
index 000000000..33091eb85
Binary files /dev/null and b/admin/template/goto/icon/permissions.png differ
diff --git a/admin/template/goto/icon/plugin_active.gif b/admin/template/goto/icon/plugin_active.gif
new file mode 100644
index 000000000..fe49227da
Binary files /dev/null and b/admin/template/goto/icon/plugin_active.gif differ
diff --git a/admin/template/goto/icon/plugin_inactive.gif b/admin/template/goto/icon/plugin_inactive.gif
new file mode 100644
index 000000000..19d551865
Binary files /dev/null and b/admin/template/goto/icon/plugin_inactive.gif differ
diff --git a/admin/template/goto/icon/preferences.png b/admin/template/goto/icon/preferences.png
new file mode 100644
index 000000000..0f3b619ed
Binary files /dev/null and b/admin/template/goto/icon/preferences.png differ
diff --git a/admin/template/goto/icon/remove_s.png b/admin/template/goto/icon/remove_s.png
new file mode 100644
index 000000000..c78c38f17
Binary files /dev/null and b/admin/template/goto/icon/remove_s.png differ
diff --git a/admin/template/goto/icon/sync_metadata.png b/admin/template/goto/icon/sync_metadata.png
new file mode 100644
index 000000000..03570ead6
Binary files /dev/null and b/admin/template/goto/icon/sync_metadata.png differ
diff --git a/admin/template/goto/icon/toggle_is_default_group.png b/admin/template/goto/icon/toggle_is_default_group.png
new file mode 100644
index 000000000..9eaa3c601
Binary files /dev/null and b/admin/template/goto/icon/toggle_is_default_group.png differ
diff --git a/admin/template/goto/icon/uncheck.png b/admin/template/goto/icon/uncheck.png
new file mode 100644
index 000000000..2f7df3503
Binary files /dev/null and b/admin/template/goto/icon/uncheck.png differ
diff --git a/admin/template/goto/icon/validate_s.png b/admin/template/goto/icon/validate_s.png
new file mode 100644
index 000000000..400bf8a24
Binary files /dev/null and b/admin/template/goto/icon/validate_s.png differ
diff --git a/admin/template/goto/icon/virt_category.png b/admin/template/goto/icon/virt_category.png
new file mode 100644
index 000000000..15f4f2267
Binary files /dev/null and b/admin/template/goto/icon/virt_category.png differ
diff --git a/admin/template/goto/index.php b/admin/template/goto/index.php
new file mode 100644
index 000000000..c15b15795
--- /dev/null
+++ b/admin/template/goto/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/admin/template/wigo/intro.tpl b/admin/template/goto/intro.tpl
similarity index 100%
rename from admin/template/wigo/intro.tpl
rename to admin/template/goto/intro.tpl
diff --git a/admin/template/wigo/layout.css b/admin/template/goto/layout.css
similarity index 100%
rename from admin/template/wigo/layout.css
rename to admin/template/goto/layout.css
diff --git a/admin/template/wigo/local-layout.css b/admin/template/goto/local-layout.css
similarity index 100%
rename from admin/template/wigo/local-layout.css
rename to admin/template/goto/local-layout.css
diff --git a/admin/template/wigo/menubar.css b/admin/template/goto/menubar.css
similarity index 100%
rename from admin/template/wigo/menubar.css
rename to admin/template/goto/menubar.css
diff --git a/admin/template/wigo/picture.css b/admin/template/goto/picture.css
similarity index 100%
rename from admin/template/wigo/picture.css
rename to admin/template/goto/picture.css
diff --git a/admin/template/wigo/print.css b/admin/template/goto/print.css
similarity index 100%
rename from admin/template/wigo/print.css
rename to admin/template/goto/print.css
diff --git a/admin/template/wigo/profile_content.tpl b/admin/template/goto/profile_content.tpl
similarity index 100%
rename from admin/template/wigo/profile_content.tpl
rename to admin/template/goto/profile_content.tpl
diff --git a/admin/template/wigo/theme/roma/images/active_tab.png b/admin/template/goto/theme/roma/images/active_tab.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/active_tab.png
rename to admin/template/goto/theme/roma/images/active_tab.png
diff --git a/admin/template/wigo/theme/roma/images/active_tab2.png b/admin/template/goto/theme/roma/images/active_tab2.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/active_tab2.png
rename to admin/template/goto/theme/roma/images/active_tab2.png
diff --git a/admin/template/wigo/theme/roma/images/bottom-left-bg.png b/admin/template/goto/theme/roma/images/bottom-left-bg.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/bottom-left-bg.png
rename to admin/template/goto/theme/roma/images/bottom-left-bg.png
diff --git a/admin/template/wigo/theme/roma/images/external_active.png b/admin/template/goto/theme/roma/images/external_active.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/external_active.png
rename to admin/template/goto/theme/roma/images/external_active.png
diff --git a/admin/template/wigo/theme/roma/images/external_inactive.png b/admin/template/goto/theme/roma/images/external_inactive.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/external_inactive.png
rename to admin/template/goto/theme/roma/images/external_inactive.png
diff --git a/admin/template/wigo/theme/roma/images/fillet.png b/admin/template/goto/theme/roma/images/fillet.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/fillet.png
rename to admin/template/goto/theme/roma/images/fillet.png
diff --git a/admin/template/wigo/theme/roma/images/inactive_tab.png b/admin/template/goto/theme/roma/images/inactive_tab.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/inactive_tab.png
rename to admin/template/goto/theme/roma/images/inactive_tab.png
diff --git a/admin/template/wigo/theme/roma/images/inactive_tab2.png b/admin/template/goto/theme/roma/images/inactive_tab2.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/inactive_tab2.png
rename to admin/template/goto/theme/roma/images/inactive_tab2.png
diff --git a/admin/template/wigo/theme/roma/images/menuBoxBottom_new.png b/admin/template/goto/theme/roma/images/menuBoxBottom_new.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/menuBoxBottom_new.png
rename to admin/template/goto/theme/roma/images/menuBoxBottom_new.png
diff --git a/admin/template/wigo/theme/roma/images/menuBoxTop_new.png b/admin/template/goto/theme/roma/images/menuBoxTop_new.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/menuBoxTop_new.png
rename to admin/template/goto/theme/roma/images/menuBoxTop_new.png
diff --git a/admin/template/wigo/theme/roma/images/menubar-detail.png b/admin/template/goto/theme/roma/images/menubar-detail.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/menubar-detail.png
rename to admin/template/goto/theme/roma/images/menubar-detail.png
diff --git a/admin/template/wigo/theme/roma/images/menubar-top.png b/admin/template/goto/theme/roma/images/menubar-top.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/menubar-top.png
rename to admin/template/goto/theme/roma/images/menubar-top.png
diff --git a/admin/template/wigo/theme/roma/images/piwigo_logo_sombre_214x100.png b/admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/piwigo_logo_sombre_214x100.png
rename to admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png
diff --git a/admin/template/wigo/theme/roma/images/top-left-bg.png b/admin/template/goto/theme/roma/images/top-left-bg.png
similarity index 100%
rename from admin/template/wigo/theme/roma/images/top-left-bg.png
rename to admin/template/goto/theme/roma/images/top-left-bg.png
diff --git a/admin/template/wigo/theme/roma/index.php b/admin/template/goto/theme/roma/index.php
similarity index 100%
rename from admin/template/wigo/theme/roma/index.php
rename to admin/template/goto/theme/roma/index.php
diff --git a/admin/template/wigo/theme/roma/mail-css.tpl b/admin/template/goto/theme/roma/mail-css.tpl
similarity index 100%
rename from admin/template/wigo/theme/roma/mail-css.tpl
rename to admin/template/goto/theme/roma/mail-css.tpl
diff --git a/admin/template/wigo/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css
similarity index 100%
rename from admin/template/wigo/theme/roma/theme.css
rename to admin/template/goto/theme/roma/theme.css
diff --git a/admin/template/wigo/theme/roma/themeconf.inc.php b/admin/template/goto/theme/roma/themeconf.inc.php
similarity index 87%
rename from admin/template/wigo/theme/roma/themeconf.inc.php
rename to admin/template/goto/theme/roma/themeconf.inc.php
index 00c86776d..690e3e4b9 100644
--- a/admin/template/wigo/theme/roma/themeconf.inc.php
+++ b/admin/template/goto/theme/roma/themeconf.inc.php
@@ -48,10 +48,10 @@ function selected_admin_menu()
 }
 
 $themeconf = array(
-  'template' => 'wigo',
-  'theme' => 'roma',
+  'template' => 'goto', /* Goto Admin template */
+  'theme' => 'roma',    /* "roma" is the foundation theme of Piwigo */
   'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'template/yoga/icon/admin',
+  '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/wigo/thumbnails.css b/admin/template/goto/thumbnails.css
similarity index 100%
rename from admin/template/wigo/thumbnails.css
rename to admin/template/goto/thumbnails.css
diff --git a/admin/thumbnail.php b/admin/thumbnail.php
index a68395ce4..b2ca11740 100644
--- a/admin/thumbnail.php
+++ b/admin/thumbnail.php
@@ -160,7 +160,7 @@ if (!function_exists('gd_info'))
 // +-----------------------------------------------------------------------+
 // |                       template initialization                         |
 // +-----------------------------------------------------------------------+
-$template->set_filenames( array('thumbnail'=>'admin/thumbnail.tpl') );
+$template->set_filenames( array('thumbnail'=>'thumbnail.tpl') );
 
 $template->assign(array(
   'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=thumbnail',
diff --git a/admin/upload.php b/admin/upload.php
index 6e258f05a..7cc457302 100644
--- a/admin/upload.php
+++ b/admin/upload.php
@@ -135,7 +135,7 @@ DELETE
 }
 
 //----------------------------------------------------- template initialization
-$template->set_filenames(array('upload'=>'admin/upload.tpl'));
+$template->set_filenames(array('upload'=>'upload.tpl'));
 
 // TabSheet initialization
 waiting_tabsheet();
diff --git a/admin/user_list.php b/admin/user_list.php
index 635424b6a..8f0430ee5 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -465,7 +465,7 @@ while ($row = mysql_fetch_array($result))
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
 
-$template->set_filenames(array('user_list'=>'admin/user_list.tpl'));
+$template->set_filenames(array('user_list'=>'user_list.tpl'));
 
 $base_url = PHPWG_ROOT_PATH.'admin.php?page=user_list';
 
diff --git a/admin/user_perm.php b/admin/user_perm.php
index f7002455a..5f84af608 100644
--- a/admin/user_perm.php
+++ b/admin/user_perm.php
@@ -117,8 +117,8 @@ SELECT cat_id
 
 $template->set_filenames(
   array(
-    'user_perm' => 'admin/user_perm.tpl',
-    'double_select' => 'admin/double_select.tpl'
+    'user_perm' => 'user_perm.tpl',
+    'double_select' => 'double_select.tpl'
     )
   );
 
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index b0544ea0e..f89d0a54a 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -617,7 +617,7 @@ $conf['recent_post_dates'] = array(
 // | Set admin layout                                                      |
 // +-----------------------------------------------------------------------+
 
-$conf['admin_layout'] = 'wigo/roma';
+$conf['admin_layout'] = 'goto/roma';
 
 // should we load the active plugins ? true=Yes, false=No
 $conf['enable_plugins']=true;