6 files changed, 343 insertions, 270 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index b88bf09282..443ea46718 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -51,6 +51,8 @@ $image_aim = "$url_images/aim.gif";
 $image_yim = "$url_images/yim.gif";
 $image_msnm = "$url_images/msnm.gif";
 
+$theme = array();
+
 // Find Users real IP (if possible)
 $user_ip = ($HTTP_X_FORWARDED_FOR) ? $HTTP_X_FORWARDED_FOR : $REMOTE_ADDR;
 
diff --git a/phpBB/db/mysql_basic.sql b/phpBB/db/mysql_basic.sql
index 158d802415..b5adbb8316 100644
--- a/phpBB/db/mysql_basic.sql
+++ b/phpBB/db/mysql_basic.sql
@@ -1,13 +1,24 @@
-# $id$
-# Some basic inserts to get you started.
+#
+# Basic DB data for phpBB2 devel
+#
+# $id: mysql_basic.sql,v 1.10 2001/04/19 17:26:24 psotfx Exp $
 
+# -- Config
 INSERT INTO phpbb_config VALUES (1,'Test forum',1,1,1,1,1,25,10,50,0,0,'With regards, the Admin','admin@yoursite.com','d M Y h:i:s a','english',0,'Default');
 
+# -- Categories
 INSERT INTO phpbb_categories VALUES (1,'Test category 1','1');
 
+# -- Forums
 INSERT INTO phpbb_forums VALUES (1,'Test Forum 1','This is just a test forum, nothing special here.',1,1,1,1,0,0,0);
 
+# -- Forum Mods
 INSERT INTO phpbb_forum_mods VALUES (1,1,0);
 
+# -- Users
 INSERT INTO phpbb_users VALUES (1,'admin',NOW(),'21232f297a57a5a743894a0e4a801fc3','admin@yourdomain.com','','','','','','This is just a stupid sig',1,1,'','','',0,1,0,0,0,0,'',4,'','','',0,'-8',1, '');
 INSERT INTO phpbb_users VALUES (-1,'Anonymous',NOW(),'','','','','','','','',0,0,'','','',0,0,0,0,0,0,'',0,'','','',0,'-8',1,'Default');
+
+# -- Themes
+INSERT INTO phpbb_themes VALUES ( '1', 'Default', '', 'FFFFFF', '000000', '', '', '', '', '', '', '', '495FA8', '', '', '000000', 'CCCCCC', 'DDDDDD', 'sans-serif', '', '', '2', '0', '0', 'FFFFFF', '000000', '', '', '', '', '');
+INSERT INTO phpbb_themes_name VALUES ( '1', '', '', '', 'Table Header', '', '', 'Table background', 'Row Color 1', 'Row Color 2', '', '', '', 'Titles', '', '', 'Titles', 'General Text', '', '', '', '', '');
diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql
index d5d7936194..f0ac9e94bb 100644
--- a/phpBB/db/mysql_schema.sql
+++ b/phpBB/db/mysql_schema.sql
@@ -1,309 +1,379 @@
-# MySQL dump 8.13
 #
-# Host: localhost    Database: phpBBtest
-#--------------------------------------------------------
-# Server version	3.23.35
+# phpBB2 - MySQL schema
+#
+# $id: mysql_schema.sql,v 1.10 2001/04/19 17:26:24 psotfx Exp $
+#
 
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_banlist'
 #
 
 CREATE TABLE phpbb_banlist (
-  ban_id int(10) NOT NULL auto_increment,
-  ban_userid int(10) default NULL,
-  ban_ip int(11) default NULL,
-  ban_start int(10) default NULL,
-  ban_end int(10) default NULL,
-  ban_time_type int(10) default NULL,
-  PRIMARY KEY  (ban_id)
-) TYPE=MyISAM;
+   ban_id int(11) NOT NULL auto_increment,
+   ban_userid int(11),
+   ban_ip char(8),
+   ban_start char(8),
+   ban_end char(8),
+   ban_time_type tinyint(4),
+   PRIMARY KEY (ban_id)
+);
+
 
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_categories'
 #
 
 CREATE TABLE phpbb_categories (
-  cat_id int(10) NOT NULL auto_increment,
-  cat_title varchar(100) default NULL,
-  cat_order varchar(10) default NULL,
-  PRIMARY KEY  (cat_id)
-) TYPE=MyISAM;
+   cat_id int(11) NOT NULL auto_increment,
+   cat_title varchar(100),
+   cat_order varchar(10),
+   PRIMARY KEY (cat_id)
+);
 
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_config'
 #
 
 CREATE TABLE phpbb_config (
-  config_id int(10) NOT NULL auto_increment,
-  sitename varchar(100) default NULL,
-  allow_html tinyint(3) default NULL,
-  allow_bbcode tinyint(3) default NULL,
-  allow_sig tinyint(3) default NULL,
-  allow_namechange tinyint(3) default NULL,
-  selected int(2) NOT NULL default '0',
-  posts_per_page int(10) default NULL,
-  hot_threshold int(10) default NULL,
-  topics_per_page int(10) default NULL,
-  allow_theme_create int(10) default NULL,
-  override_themes tinyint(3) default NULL,
-  email_sig varchar(255) default NULL,
-  email_from varchar(100) default NULL,
-  default_dateformat varchar(20) default NULL,
-  default_lang varchar(255) default NULL,
-  system_timezone smallint(6) default NULL,
-  sys_template varchar(20) default NULL,
-  PRIMARY KEY  (config_id),
-  UNIQUE KEY selected (selected)
-) TYPE=MyISAM;
-
+   config_id int(11) NOT NULL auto_increment,
+   sitename varchar(100),
+   allow_html tinyint(3),
+   allow_bbcode tinyint(3),
+   allow_sig tinyint(3),
+   allow_namechange tinyint(3),
+   selected int(2) DEFAULT 0 NOT NULL,
+   posts_per_page int(11),
+   hot_threshold int(11),
+   topics_per_page int(11),
+   allow_theme_create int(11),
+   override_themes tinyint(3),
+   email_sig varchar(255),
+   email_from varchar(100),
+   default_theme int(11) DEFAULT 1 NOT NULL,
+   default_lang varchar(255),
+   default_dateformat varchar(14) DEFAULT d M Y H:m NOT NULL,
+   system_timezone int(11) DEFAULT 0 NOT NULL,
+   sys_template varchar(100) DEFAULT Default NOT NULL,
+   PRIMARY KEY (config_id),
+   UNIQUE selected (selected)
+);
+
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_disallow'
 #
 
 CREATE TABLE phpbb_disallow (
-  disallow_id int(10) NOT NULL auto_increment,
-  disallow_username varchar(50) default NULL,
-  PRIMARY KEY  (disallow_id)
-) TYPE=MyISAM;
+   disallow_id int(11) NOT NULL auto_increment,
+   disallow_username varchar(50),
+   PRIMARY KEY (disallow_id)
+);
+
 
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_forum_access'
 #
 
 CREATE TABLE phpbb_forum_access (
-  forum_id int(10) NOT NULL default '0',
-  user_id int(10) NOT NULL default '0',
-  can_post tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (forum_id,user_id)
-) TYPE=MyISAM;
+   forum_id int(11) NOT NULL,
+   user_id int(11) NOT NULL,
+   can_post tinyint(1) NOT NULL,
+   PRIMARY KEY (forum_id, user_id)
+);
 
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_forum_mods'
 #
 
 CREATE TABLE phpbb_forum_mods (
-  forum_id int(10) NOT NULL default '0',
-  user_id int(10) NOT NULL default '0',
-  mod_notify tinyint(3) default NULL
-) TYPE=MyISAM;
+   forum_id int(11) NOT NULL,
+   user_id int(11) NOT NULL,
+   mod_notify tinyint(3)
+);
+
 
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_forums'
 #
 
 CREATE TABLE phpbb_forums (
-  forum_id int(10) NOT NULL auto_increment,
-  forum_name varchar(150) default NULL,
-  forum_desc text,
-  forum_access tinyint(3) default NULL,
-  cat_id int(10) default NULL,
-  forum_order int(11) NOT NULL default '1',
-  forum_type tinyint(3) default NULL,
-  forum_posts int(11) NOT NULL default '0',
-  forum_topics tinyint(4) NOT NULL default '0',
-  forum_last_post_id int(11) NOT NULL default '0',
-  PRIMARY KEY  (forum_id),
-  KEY forum_id (forum_id),
-  KEY forums_order (forum_order),
-  KEY cat_id (cat_id)
-) TYPE=MyISAM;
-
-#
-# Table structure for table 'phpbb_headermetafooter'
-#
-
-CREATE TABLE phpbb_headermetafooter (
-  header text,
-  meta text,
-  footer text
-) TYPE=MyISAM;
-
+   forum_id int(11) NOT NULL auto_increment,
+   forum_name varchar(150),
+   forum_desc text,
+   forum_access tinyint(3),
+   cat_id int(11),
+   forum_order int(11) DEFAULT 1 NOT NULL,
+   forum_type tinyint(4),
+   forum_posts int(11) NOT NULL,
+   forum_topics tinyint(4) NOT NULL,
+   forum_last_post_id int(11) NOT NULL,
+   PRIMARY KEY (forum_id),
+   KEY forum_id (forum_id),
+   KEY forums_order (forum_order),
+   KEY cat_id (cat_id)
+);
+
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_posts'
 #
 
 CREATE TABLE phpbb_posts (
-  post_id int(10) NOT NULL auto_increment,
-  topic_id int(10) NOT NULL default '0',
-  forum_id int(10) NOT NULL default '0',
-  poster_id int(10) NOT NULL default '0',
-  post_time int(10) NOT NULL default '0',
-  poster_ip int(10) NOT NULL default '0',
-  bbcode_uid varchar(10) NOT NULL default '',
-  PRIMARY KEY  (post_id),
-  KEY forum_id (forum_id),
-  KEY topic_id (topic_id),
-  KEY poster_id (poster_id)
-) TYPE=MyISAM;
-
+   post_id int(11) NOT NULL auto_increment,
+   topic_id int(11) NOT NULL,
+   forum_id int(11) NOT NULL,
+   poster_id int(11) NOT NULL,
+   post_time int(11) NOT NULL,
+   poster_ip char(8) NOT NULL,
+   bbcode_uid varchar(10) NOT NULL,
+   PRIMARY KEY (post_id),
+   KEY forum_id (forum_id),
+   KEY topic_id (topic_id),
+   KEY poster_id (poster_id)
+);
+
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_posts_text'
 #
 
 CREATE TABLE phpbb_posts_text (
-  post_id int(10) NOT NULL default '0',
-  post_text text,
-  PRIMARY KEY  (post_id)
-) TYPE=MyISAM;
+   post_id int(11) NOT NULL,
+   post_text text,
+   PRIMARY KEY (post_id)
+);
+
 
+# --------------------------------------------------------
 #
-# Table structure for table 'phpbb_priv_msgs'
+# Table structure for table 'phpbb_privmsgs'
 #
 
-CREATE TABLE phpbb_priv_msgs (
-  msg_id int(10) NOT NULL auto_increment,
-  from_userid int(10) NOT NULL default '0',
-  to_userid int(10) NOT NULL default '0',
-  msg_time int(10) NOT NULL default '0',
-  poster_ip int(10) NOT NULL default '0',
-  msg_status int(10) NOT NULL default '0',
-  msg_text text NOT NULL,
-  PRIMARY KEY  (msg_id),
-  KEY to_userid (to_userid)
-) TYPE=MyISAM;
+CREATE TABLE phpbb_privmsgs (
+   msg_id int(11) NOT NULL auto_increment,
+   from_userid int(11) NOT NULL,
+   to_userid int(11) NOT NULL,
+   msg_time int(11) NOT NULL,
+   poster_ip char(8) NOT NULL,
+   msg_status int(11) NOT NULL,
+   msg_text text NOT NULL,
+   newmsg tinyint(4) NOT NULL,
+   PRIMARY KEY (msg_id),
+   KEY to_userid (to_userid)
+);
 
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_ranks'
 #
 
 CREATE TABLE phpbb_ranks (
-  rank_id int(11) NOT NULL auto_increment,
-  rank_title varchar(50) NOT NULL default '',
-  rank_min int(11) NOT NULL default '0',
-  rank_max int(11) NOT NULL default '0',
-  rank_special tinyint(4) default '0',
-  rank_image varchar(255) default NULL,
-  PRIMARY KEY  (rank_id),
-  KEY rank_min (rank_min),
-  KEY rank_max (rank_max),
-  KEY rank_id (rank_id)
-) TYPE=MyISAM;
+   rank_id int(11) NOT NULL auto_increment,
+   rank_title varchar(50) NOT NULL,
+   rank_min int(11) NOT NULL,
+   rank_max int(11) NOT NULL,
+   rank_special tinyint(1),
+   rank_image varchar(255),
+   PRIMARY KEY (rank_id),
+   KEY rank_min (rank_min),
+   KEY rank_max (rank_max),
+   KEY rank_id (rank_id)
+);
+
 
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_session'
 #
 
 CREATE TABLE phpbb_session (
-  session_id int(10) unsigned NOT NULL default '0',
-  session_user_id int(10) NOT NULL default '0',
-  session_time int(10) unsigned NOT NULL default '0',
-  session_ip char(10) default NULL,
-  session_page int(10) NOT NULL default '0',
-  session_logged_in tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (session_id)
-) TYPE=MyISAM;
+   session_id int(11) unsigned NOT NULL,
+   session_user_id int(11) NOT NULL,
+   session_time int(11) unsigned NOT NULL,
+   session_ip char(8) NOT NULL,
+   session_page int(11),
+   session_logged_in tinyint(1) NOT NULL,
+   PRIMARY KEY (session_id)
+);
 
+
+# --------------------------------------------------------
+#
+# Table structure for table 'phpbb_smilies'
+#
+
+CREATE TABLE phpbb_smilies (
+   smilies_id int(11) NOT NULL auto_increment,
+   code varchar(50),
+   smile_url varchar(100),
+   emoticon varchar(75),
+   PRIMARY KEY (smilies_id)
+);
+
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_themes'
 #
 
 CREATE TABLE phpbb_themes (
-  theme_id int(10) NOT NULL auto_increment,
-  theme_name varchar(35) default NULL,
-  bgcolor varchar(10) default NULL,
-  textcolor varchar(10) default NULL,
-  color1 varchar(10) default NULL,
-  color2 varchar(10) default NULL,
-  table_bgcolor varchar(10) default NULL,
-  header_image varchar(50) default NULL,
-  newtopic_image varchar(50) default NULL,
-  reply_image varchar(50) default NULL,
-  linkcolor varchar(15) default NULL,
-  vlinkcolor varchar(15) default NULL,
-  theme_default int(2) default '0',
-  fontface varchar(100) default NULL,
-  fontsize1 varchar(5) default NULL,
-  fontsize2 varchar(5) default NULL,
-  fontsize3 varchar(5) default NULL,
-  fontsize4 varchar(5) default NULL,
-  tablewidth varchar(10) default NULL,
-  replylocked_image varchar(255) default NULL,
-  PRIMARY KEY  (theme_id)
-) TYPE=MyISAM;
-
+   themes_id int(11) NOT NULL auto_increment,
+   themes_name varchar(30),
+   body_background varchar(100),
+   body_bgcolor varchar(6),
+   body_text varchar(6),
+   body_link varchar(6),
+   body_vlink varchar(6),
+   body_alink varchar(6),
+   body_hlink varchar(6),
+   tr_color1 varchar(6),
+   tr_color2 varchar(6),
+   tr_color3 varchar(6),
+   th_color1 varchar(6),
+   th_color2 varchar(6),
+   th_color3 varchar(6),
+   td_color1 varchar(6),
+   td_color2 varchar(6),
+   td_color3 varchar(6),
+   fontface1 varchar(15),
+   fontface2 varchar(15),
+   fontface3 varchar(15),
+   fontsize1 tinyint(4),
+   fontsize2 tinyint(4),
+   fontsize3 tinyint(4),
+   fontcolor1 varchar(6),
+   fontcolor2 varchar(6),
+   fontcolor3 varchar(6),
+   img1 varchar(100),
+   img2 varchar(100),
+   img3 varchar(100),
+   img4 varchar(100),
+   PRIMARY KEY (themes_id),
+   KEY themes_name (themes_name)
+);
+
+
+# --------------------------------------------------------
+#
+# Table structure for table 'phpbb_themes_name'
+#
+
+CREATE TABLE phpbb_themes_name (
+   themes_id int(11),
+   tr_color1_name varchar(25),
+   tr_color2_name varchar(25),
+   tr_color3_name varchar(25),
+   th_color1_name varchar(25),
+   th_color2_name varchar(25),
+   th_color3_name varchar(25),
+   td_color1_name varchar(25),
+   td_color2_name varchar(25),
+   td_color3_name varchar(25),
+   fontface1_name varchar(25),
+   fontface2_name varchar(25),
+   fontface3_name varchar(25),
+   fontsize1_name varchar(25),
+   fontsize2_name varchar(25),
+   fontsize3_name varchar(25),
+   fontcolor1_name varchar(25),
+   fontcolor2_name varchar(25),
+   fontcolor3_name varchar(25),
+   img1_name varchar(25),
+   img2_name varchar(25),
+   img3_name varchar(25),
+   img4_name varchar(25),
+   PRIMARY KEY (themes_id)
+);
+
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_topics'
 #
 
 CREATE TABLE phpbb_topics (
-  topic_id int(10) NOT NULL auto_increment,
-  topic_title varchar(100) NOT NULL default '',
-  topic_poster int(10) NOT NULL default '0',
-  topic_time int(10) NOT NULL default '0',
-  topic_views int(10) NOT NULL default '0',
-  topic_replies int(11) NOT NULL default '0',
-  forum_id int(10) NOT NULL default '0',
-  topic_status tinyint(3) NOT NULL default '0',
-  topic_notify tinyint(3) default '0',
-  topic_last_post_id int(11) NOT NULL default '0',
-  PRIMARY KEY  (topic_id),
-  KEY forum_id (forum_id),
-  KEY topic_id (topic_id)
-) TYPE=MyISAM;
-
+   topic_id int(11) NOT NULL auto_increment,
+   topic_title varchar(100) NOT NULL,
+   topic_poster int(11) NOT NULL,
+   topic_time int(11) NOT NULL,
+   topic_views int(11) NOT NULL,
+   topic_replies int(11) NOT NULL,
+   forum_id int(11) NOT NULL,
+   topic_status tinyint(3) NOT NULL,
+   topic_notify tinyint(3),
+   topic_last_post_id int(11) NOT NULL,
+   PRIMARY KEY (topic_id),
+   KEY forum_id (forum_id),
+   KEY topic_id (topic_id)
+);
+
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_users'
 #
 
 CREATE TABLE phpbb_users (
-  user_id int(11) NOT NULL auto_increment,
-  username varchar(40) NOT NULL default '',
-  user_regdate varchar(20) NOT NULL default '',
-  user_password varchar(32) NOT NULL default '',
-  user_email varchar(255) default NULL,
-  user_icq varchar(15) default NULL,
-  user_website varchar(100) default NULL,
-  user_occ varchar(100) default NULL,
-  user_from varchar(100) default NULL,
-  user_intrest varchar(150) default NULL,
-  user_sig varchar(255) default NULL,
-  user_viewemail tinyint(3) default NULL,
-  user_theme int(11) default NULL,
-  user_aim varchar(255) default NULL,
-  user_yim varchar(255) default NULL,
-  user_msnm varchar(255) default NULL,
-  user_posts int(11) default '0',
-  user_attachsig tinyint(3) default NULL,
-  user_desmile tinyint(3) default NULL,
-  user_html tinyint(3) default NULL,
-  user_bbcode tinyint(3) default NULL,
-  user_rank int(11) default '0',
-  user_avatar varchar(100) default NULL,
-  user_level int(11) default '1',
-  user_lang varchar(255) default NULL,
-  user_actkey varchar(32) default NULL,
-  user_newpasswd varchar(32) default NULL,
-  user_notify tinyint(3) default NULL,
-  user_timezone float default NULL,
-  user_active int(2) default NULL,
-  user_template varchar(20) default NULL,
-  PRIMARY KEY  (user_id),
-  KEY user_id (user_id)
-) TYPE=MyISAM;
-
-#
-# Table structure for table 'phpbb_whosonline'
-#
-
-CREATE TABLE phpbb_whosonline (
-  id int(3) NOT NULL auto_increment,
-  ip varchar(255) default NULL,
-  name varchar(255) default NULL,
-  count varchar(255) default NULL,
-  date varchar(255) default NULL,
-  username varchar(40) default NULL,
-  forum int(10) default NULL,
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
+   user_id int(11) NOT NULL auto_increment,
+   username varchar(40) NOT NULL,
+   user_regdate varchar(20) NOT NULL,
+   user_password varchar(32) NOT NULL,
+   user_hint varchar(25) NOT NULL,
+   user_email varchar(255),
+   user_icq varchar(15),
+   user_website varchar(100),
+   user_occ varchar(100),
+   user_from varchar(100),
+   user_interests varchar(255),
+   user_sig varchar(255),
+   user_viewemail tinyint(3),
+   user_theme int(11),
+   user_aim varchar(255),
+   user_yim varchar(255),
+   user_msnm varchar(255),
+   user_posts int(11) DEFAULT 0,
+   user_attachsig tinyint(3),
+   user_desmile tinyint(3),
+   user_html tinyint(3),
+   user_bbcode tinyint(3),
+   user_rank int(11) DEFAULT 0,
+   user_avatar varchar(100),
+   user_level int(11) DEFAULT 1,
+   user_lang varchar(255),
+   user_timezone int(11) DEFAULT 0 NOT NULL,
+   user_dateformat varchar(14) DEFAULT d M Y H:m NOT NULL,
+   user_actkey varchar(32),
+   user_newpasswd varchar(32),
+   user_notify tinyint(3),
+   user_active tinyint(4),
+   user_template varchar(50),
+   PRIMARY KEY (user_id),
+   KEY user_id (user_id)
+);
+
+
+# --------------------------------------------------------
 #
 # Table structure for table 'phpbb_words'
 #
 
 CREATE TABLE phpbb_words (
-  word_id int(10) NOT NULL auto_increment,
-  word varchar(100) NOT NULL default '',
-  replacement varchar(100) NOT NULL default '',
-  PRIMARY KEY  (word_id)
-) TYPE=MyISAM;
+   word_id int(11) NOT NULL auto_increment,
+   word varchar(100) NOT NULL,
+   replacement varchar(100) NOT NULL,
+   PRIMARY KEY (word_id)
+);
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 000c51696c..5970854aa6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -189,7 +189,9 @@ function theme_select($default)
 {
 	global $db;
 
-	$sql = "SELECT theme_id, theme_name FROM ".THEMES_TABLE." ORDER BY theme_name";
+	$sql = "SELECT themes_id, themes_name 
+		FROM ".THEMES_TABLE." 
+		ORDER BY themes_name";
 	if($result = $db->sql_query($sql))
 	{
 		$num = $db->sql_numrows($result);
@@ -197,7 +199,7 @@ function theme_select($default)
 		$theme_select = "<select name=\"theme\">\n";
 		for($i = 0; $i < $num; $i++)
 		{
-			if((stripslashes($rowset[$i]["theme_name"]) == $default) || ($rowset[$i]["theme_id"] == $default))
+			if(stripslashes($rowset[$i]['themes_name']) == $default || $rowset[$i]['themes_id'] == $default)
 			{
 				$selected = " SELECTED";
 			}
@@ -205,7 +207,7 @@ function theme_select($default)
 			{
 				$selected = "";
 			}
-			$theme_select .= "\t<option value=\"".$rowset[$i]["theme_id"]."\"$selected>".stripslashes($rowset[$i]["theme_name"])."</option>\n";
+			$theme_select .= "\t<optio value=\"".$rowset[$i]['themes_id']."\"$selected>".stripslashes($rowset[$i]['themes_name'])."</option>\n";
 		}
 		$theme_select .= "</select>\n";
 	}
@@ -223,10 +225,8 @@ function init_userprefs($userdata)
 {
 
 	global $override_user_theme, $template, $sys_template;
-	global $bgcolor, $table_bgcolor, $textcolor, $category_title, $table_header;
-	global $color1, $color2, $header_image, $newtopic_image;
-	global $reply_locked_image, $reply_image, $linkcolor, $vlinkcolor;
 	global $default_lang, $date_format, $sys_timezone;
+	global $theme;
 
 	if(!$override_user_theme)
 	{
@@ -243,22 +243,6 @@ function init_userprefs($userdata)
 	{
 		$theme = setuptheme($override_user_theme);
 	}
-	if($theme)
-	{
-		$bgcolor = $theme["bgcolor"];
-		$table_bgcolor = $theme["table_bgcolor"];
-		$textcolor = $theme["textcolor"];
-		$category_title = $theme["category_title"];
-		$table_header = $theme["table_header"];
-		$color1 = $theme["color1"];
-		$color2 = $theme["color2"];
-		$header_image = $theme["header_image"];
-		$newtopic_image = $theme["newtopic_image"];
-		$reply_locked_image = $theme["reply_locked_image"];
-		$reply_image = $theme["reply_image"];
-		$linkcolor = $theme["linkcolor"];
-		$vlinkcolor = $theme["vlinkcolor"];
-	}
 	if($userdata["user_lang"] != "")
 	{
 		$default_lang = $userdata["user_lang"];
@@ -311,10 +295,10 @@ function setuptheme($theme)
 
 	$sql = "SELECT *
 		FROM ".THEMES_TABLE."
-		WHERE theme_id = '$theme'";
+		WHERE themes_id = '$theme'";
+
 	if(!$result = $db->sql_query($sql))
 		return(0);
-
 	if(!$myrow = $db->sql_fetchrow($result))
 		return(0);
 
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 61aa198c62..0d333df535 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -97,6 +97,36 @@ $template->assign_vars(array(
 	"S_TOPICS_URL" => POST_TOPIC_URL,
 	"S_USERS_URL" => POST_USERS_URL,
 
+	"T_BODY_BACKGROUND" => $theme['body_background'],
+	"T_BODY_BGCOLOR" => "#".$theme['body_bgcolor'],
+	"T_BODY_TEXT" => "#".$theme['body_text'],
+	"T_BODY_LINK" => "#".$theme['body_link'],
+	"T_BODY_VLINK" => "#".$theme['body_vlink'],
+	"T_BODY_ALINK" => "#".$theme['body_alink'],
+	"T_BODY_HLINK" => "#".$theme['body_hlink'],
+	"T_TR_COLOR1" => "#".$theme['tr_color1'],
+	"T_TR_COLOR2" => "#".$theme['tr_color2'],
+	"T_TR_COLOR3" => "#".$theme['tr_color3'],
+	"T_TH_COLOR1" => "#".$theme['th_color1'],
+	"T_TH_COLOR2" => "#".$theme['th_color2'],
+	"T_TH_COLOR3" => "#".$theme['th_color3'],
+	"T_TD_COLOR1" => "#".$theme['td_color1'],
+	"T_TD_COLOR2" => "#".$theme['td_color2'],
+	"T_TD_COLOR3" => "#".$theme['td_color3'],
+	"T_FONTFACE1" => $theme['fontface1'],
+	"T_FONTFACE2" => $theme['fontface1'],
+	"T_FONTFACE3" => $theme['fontface1'],
+	"T_FONTSIZE1" => $theme['fontsize1'],
+	"T_FONTSIZE2" => $theme['fontsize2'],
+	"T_FONTSIZE3" => $theme['fontsize3'],
+	"T_FONTCOLOR1" => "#".$theme['fontcolor1'],
+	"T_FONTCOLOR2" => "#".$theme['fontcolor2'],
+	"T_FONTCOLOR3" => "#".$theme['fontcolor3'],
+	"T_IMG1" => $theme['img1'],
+	"T_IMG2" => $theme['img2'],
+	"T_IMG3" => $theme['img3'],
+	"T_IMG4" => $theme['img4'],
+
 	"PAGE_TITLE" => $page_title,
 	"LOGIN_STATUS" => $logged_in_status,
 	"META_INFO" => $meta_tags));
@@ -185,10 +215,6 @@ switch($pagetype)
 		$template->pparse("header");
 		break;
 
-	case 'login':
-		$template->set_filenames(array("body" => "login_body.tpl"));
-		break;
-		
 	case 'newtopic':
 		$template->set_filenames(array(
 			"header" => "newtopic_header.tpl",
diff --git a/phpBB/login.php b/phpBB/login.php
index 87e8bc4712..77288de6f9 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -92,34 +92,14 @@ else
 	//
 	// Do a full login page dohickey
 	//
-	$pagetype = "login";
 	$page_title = "Log In";
-
 	include('includes/page_header.'.$phpEx);
+	$template->set_filenames(array("body" => "login_body.tpl"));
 
 	$template->assign_vars(array(
 		"PHPEX" => $phpEx,
 		"PHP_SELF" => $PHP_SELF,
 
-		"T_TR_COLOR1" => "#",
-		"T_TR_COLOR2" => "#",
-		"T_TR_COLOR3" => "#",
-		"T_TH_COLOR1" => "#495FA8",
-		"T_TH_COLOR2" => "#",
-		"T_TH_COLOR3" => "#",
-		"T_TD_COLOR1" => "#000000",
-		"T_TD_COLOR2" => "#CCCCCC",
-		"T_TD_COLOR3" => "#DDDDDD",
-		"T_FONTFACE1" => "sans-serif",
-		"T_FONTFACE2" => "",
-		"T_FONTFACE3" => "",
-		"T_FONTSIZE1" => "2",
-		"T_FONTSIZE2" => "",
-		"T_FONTSIZE3" => "",
-		"T_FONTCOLOR1" => "#FFFFFF",
-		"T_FONTCOLOR2" => "#000000",
-		"T_FONTCOLOR3" => "",
-
 		"L_USERNAME" => $l_username,
 		"L_PASSWORD" => $l_password,
 		"L_SEND_PASSWORD" => $l_resend_password,