diff --git a/install/config.sql b/install/config.sql
index d41b31113..59ff1de28 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -1,7 +1,7 @@
 -- initial configuration for PhpWebGallery
 
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_language','en_UK.iso-8859-1','Default gallery language');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_template','yoga','Default gallery style');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_template','yoga/clear','Default gallery style');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_maxwidth','','maximum width authorized for displaying images');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_maxheight','','maximum height authorized for the displaying images');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nb_comment_page','10','number of comments to display on each page');
diff --git a/install/db/2-database.php b/install/db/2-database.php
new file mode 100644
index 000000000..9a249703a
--- /dev/null
+++ b/install/db/2-database.php
@@ -0,0 +1,78 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date: 2005-09-21 00:04:57 +0200 (mer, 21 sep 2005) $
+// | last modifier : $Author: plg $
+// | revision      : $Revision: 870 $
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'Update template preference for every user';
+
+// +-----------------------------------------------------------------------+
+// |                            Upgrade content                            |
+// +-----------------------------------------------------------------------+
+
+// configuration update
+$query = '
+UPDATE '.PREFIX_TABLE.'config
+  SET value = \'yoga/clear\'
+  WHERE param = \'default_template\'
+;';
+pwg_query($query);
+
+// set yoga/clear as default value for user_infos.template column
+$query = '
+ALTER TABLE '.PREFIX_TABLE.'user_infos
+  CHANGE COLUMN template template varchar(255) NOT NULL default \'yoga/clear\'
+;';
+pwg_query($query);
+
+// users having yoga-dark for template now have yoga/dark
+$query = '
+UPDATE '.PREFIX_TABLE.'user_infos
+  SET template = \'yoga/dark\'
+  WHERE template = \'yoga-dark\'
+;';
+pwg_query($query);
+
+// all other users have yoga/clear
+$query = '
+UPDATE '.PREFIX_TABLE.'user_infos
+  SET template = \'yoga/clear\'
+  WHERE template != \'yoga/dark\'
+;';
+pwg_query($query);
+
+echo
+"\n"
+.'Default template modified to yoga/clear'
+."\n"
+.'Template preference modified for every users : yoga/dark'
+.' (for yoga-dark users) and yoga/clear as default'
+."\n"
+;
+?>
diff --git a/install/phpwebgallery_structure.sql b/install/phpwebgallery_structure.sql
index 9f94e28e1..341582cb0 100644
--- a/install/phpwebgallery_structure.sql
+++ b/install/phpwebgallery_structure.sql
@@ -274,7 +274,7 @@ CREATE TABLE `phpwebgallery_user_infos` (
   `expand` enum('true','false') NOT NULL default 'false',
   `show_nb_comments` enum('true','false') NOT NULL default 'false',
   `recent_period` tinyint(3) unsigned NOT NULL default '7',
-  `template` varchar(255) NOT NULL default 'yoga',
+  `template` varchar(255) NOT NULL default 'yoga/clear',
   `registration_date` datetime NOT NULL default '0000-00-00 00:00:00',
   UNIQUE KEY `user_infos_ui1` (`user_id`)
 ) TYPE=MyISAM;