diff --git a/phpBB/db/schemas/mysql_basic.sql b/phpBB/db/schemas/mysql_basic.sql
index 3626eaf7cd..90f2d66bc1 100644
--- a/phpBB/db/schemas/mysql_basic.sql
+++ b/phpBB/db/schemas/mysql_basic.sql
@@ -155,6 +155,10 @@ INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post
 INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, NULL, 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');
 
 
+# -- Topic icons
+INSERT INTO phpbb_icons (icons_id, icons_url, icons_width, icons_height) VALUES (0, '', 0, 0);
+
+
 # -- Smilies
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy');
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy');
diff --git a/phpBB/db/schemas/mysql_schema.sql b/phpBB/db/schemas/mysql_schema.sql
index fe30b049af..2fcefb6bcc 100644
--- a/phpBB/db/schemas/mysql_schema.sql
+++ b/phpBB/db/schemas/mysql_schema.sql
@@ -51,44 +51,6 @@ CREATE TABLE phpbb_auth_users (
 )
 
 
-# --------------------------------------------------------
-#
-# Table structure for table 'phpbb_user_group'
-#
-CREATE TABLE phpbb_user_group (
-   group_id mediumint(8) DEFAULT '0' NOT NULL,
-   user_id mediumint(8) DEFAULT '0' NOT NULL,
-   user_pending tinyint(1), 
-   KEY group_id (group_id),
-   KEY user_id (user_id)
-);
-
-
-# --------------------------------------------------------
-#
-# Table structure for table 'phpbb_groups'
-#
-CREATE TABLE phpbb_groups (
-   group_id mediumint(8) NOT NULL auto_increment,
-   group_type tinyint(4) DEFAULT '1' NOT NULL, 
-   group_name varchar(40) NOT NULL,
-   group_avatar varchar(100), 
-   group_avatar_type tinyint(4), 
-   group_description varchar(255) NOT NULL,
-   PRIMARY KEY (group_id)
-);
-
-
-# --------------------------------------------------------
-#
-# Table structure for table 'phpbb_groups_moderator'
-#
-CREATE TABLE phpbb_groups_moderator (
-   group_id mediumint(8) NOT NULL, 
-   user_id mediumint(8) NOT NULL 
-);
-
-
 # --------------------------------------------------------
 #
 # Table structure for table 'phpbb_banlist'
@@ -129,7 +91,7 @@ CREATE TABLE phpbb_config (
 
 # --------------------------------------------------------
 #
-# Table structure for table 'phpbb_disallow'
+# Table structure for table 'phpbb_disallow' <- combine with banlist
 #
 CREATE TABLE phpbb_disallow (
    disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
@@ -184,6 +146,32 @@ CREATE TABLE phpbb_forums_watch (
 );
 
 
+# --------------------------------------------------------
+#
+# Table structure for table 'phpbb_groups'
+#
+CREATE TABLE phpbb_groups (
+   group_id mediumint(8) NOT NULL auto_increment,
+   group_type tinyint(4) DEFAULT '1' NOT NULL, 
+   group_name varchar(40) NOT NULL,
+   group_avatar varchar(100), 
+   group_avatar_type tinyint(4), 
+   group_colour varchar(6) DEFAULT '' NOT NULL, 
+   group_description varchar(255) NOT NULL,
+   PRIMARY KEY (group_id)
+);
+
+
+# --------------------------------------------------------
+#
+# Table structure for table 'phpbb_groups_moderator'
+#
+CREATE TABLE phpbb_groups_moderator (
+   group_id mediumint(8) NOT NULL, 
+   user_id mediumint(8) NOT NULL 
+);
+
+
 # --------------------------------------------------------
 #
 # Table structure for table 'phpbb_icons'
@@ -440,7 +428,7 @@ CREATE TABLE phpbb_topics (
    topic_title varchar(60) NOT NULL,
    topic_poster mediumint(8) DEFAULT '0' NOT NULL,
    topic_time int(11) DEFAULT '0' NOT NULL,
-   topic_icon tinyint(4) UNSIGNED, 
+   topic_icon tinyint(4) UNSIGNED DEFAULT '0' NOT NULL, 
    topic_views mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    topic_replies mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    topic_status tinyint(3) DEFAULT '0' NOT NULL, 
@@ -475,6 +463,18 @@ CREATE TABLE phpbb_topics_watch (
 );
 
 
+# --------------------------------------------------------
+#
+# Table structure for table 'phpbb_user_group'
+#
+CREATE TABLE phpbb_user_group (
+   group_id mediumint(8) DEFAULT '0' NOT NULL,
+   user_id mediumint(8) DEFAULT '0' NOT NULL,
+   user_pending tinyint(1), 
+   KEY group_id (group_id),
+   KEY user_id (user_id)
+);
+
 
 # --------------------------------------------------------
 #
@@ -490,7 +490,8 @@ CREATE TABLE phpbb_users (
    user_session_page smallint(5) DEFAULT '0' NOT NULL, 
    user_lastvisit int(11) DEFAULT '0' NOT NULL, 
    user_regdate int(11) DEFAULT '0' NOT NULL, 
-   user_level tinyint(4) DEFAULT '0',
+   user_level tinyint(4) DEFAULT '0', 
+   user_colourise varchar(6) DEFAULT '' NOT NULL, 
    user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    user_lang varchar(50), 
    user_timezone decimal(4,2) DEFAULT '0' NOT NULL,