108 files changed, 2651 insertions, 2139 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 9586de2d6b..2758e88373 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -43,7 +43,7 @@ $dbms_type_map = array(
 		'TIMESTAMP'	=> 'int(11) UNSIGNED',
 		'DECIMAL'	=> 'decimal(5,2)',
 		'VCHAR_BIN'	=> 'varchar(252) BINARY',
-		'VCHAR_CI'	=> 'varchar(255)',
+		'VCHAR_CI'	=> 'varchar(252)',
 		'VARBINARY'	=> 'varbinary(255)',
 	),
 
@@ -65,7 +65,7 @@ $dbms_type_map = array(
 		'TIMESTAMP'	=> 'INTEGER',
 		'DECIMAL'	=> 'DOUBLE PRECISION',
 		'VCHAR_BIN'	=> 'VARCHAR(252)',
-		'VCHAR_CI'	=> 'VARCHAR(255)',
+		'VCHAR_CI'	=> 'VARCHAR(252)',
 		'VARBINARY'	=> 'CHAR(255)',
 	),
 
@@ -87,7 +87,7 @@ $dbms_type_map = array(
 		'TIMESTAMP'	=> '[int]',
 		'DECIMAL'	=> '[float]',
 		'VCHAR_BIN'	=> '[nvarchar] (252)',
-		'VCHAR_CI'	=> '[varchar] (255)',
+		'VCHAR_CI'	=> '[varchar] (252)',
 		'VARBINARY'	=> '[varbinary] (255)',
 	),
 
@@ -109,18 +109,18 @@ $dbms_type_map = array(
 		'TIMESTAMP'	=> 'number(11)',
 		'DECIMAL'	=> 'number(5, 2)',
 		'VCHAR_BIN'	=> 'varchar2(252)',
-		'VCHAR_CI'	=> 'varchar2(255)',
+		'VCHAR_CI'	=> 'varchar2(252)',
 		'VARBINARY'	=> 'raw(255)',
 	),
 
 	'sqlite'	=> array(
 		'INT:'		=> 'int(%d)',
 		'BINT'		=> 'bigint(20)',
-		'UINT'		=> 'mediumint(8) UNSIGNED',
-		'UINT:'		=> 'int(%d) UNSIGNED',
+		'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
+		'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
 		'TINT:'		=> 'tinyint(%d)',
-		'USINT'		=> 'mediumint(4) UNSIGNED',
-		'BOOL'		=> 'tinyint(1) UNSIGNED',
+		'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
+		'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
 		'VCHAR'		=> 'varchar(255)',
 		'VCHAR:'	=> 'varchar(%d)',
 		'CHAR:'		=> 'char(%d)',
@@ -128,10 +128,10 @@ $dbms_type_map = array(
 		'STEXT'		=> 'text(65535)',
 		'TEXT'		=> 'text(65535)',
 		'MTEXT'		=> 'mediumtext(16777215)',
-		'TIMESTAMP'	=> 'int(11) UNSIGNED',
+		'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
 		'DECIMAL'	=> 'decimal(5,2)',
 		'VCHAR_BIN'	=> 'varchar(252)',
-		'VCHAR_CI'	=> 'varchar(255)',
+		'VCHAR_CI'	=> 'varchar(252)',
 		'VARBINARY'	=> 'blob',
 	),
 
@@ -177,6 +177,7 @@ foreach ($supported_dbms as $dbms)
 
 		case 'firebird':
 			$line = "#\n# Firebird Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n";
+			$line .= custom_data('firebird') . "\n";
 		break;
 
 		case 'sqlite':
@@ -191,13 +192,13 @@ foreach ($supported_dbms as $dbms)
 
 		case 'oracle':
 			$line = "/*\n Oracle Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n";
-			$line .= oracle_custom_data() . "\n";
+			$line .= custom_data('oracle') . "\n";
 		break;
 
 		case 'postgres':
 			$line = "/*\n PostgreSQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n";
 			$line .= "BEGIN;\n\n";
-			$line .= postgres_custom_data() . "\n";
+			$line .= custom_data('postgres') . "\n";
 		break;
 	}
 
@@ -217,7 +218,7 @@ foreach ($supported_dbms as $dbms)
 			case 'mssql':
 			case 'oracle':
 			case 'postgres':
-				fwrite($fp, "/* Table: '{$table_name}' */\n");
+				fwrite($fp, "/*\n\tTable: '{$table_name}'\n*/\n");
 			break;
 		}
 
@@ -286,23 +287,14 @@ foreach ($supported_dbms as $dbms)
 				case 'sqlite':
 					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
 					{
-						$line .= "\t{$column_name} INTEGER ";
+						$line .= "\t{$column_name} INTEGER PRIMARY KEY ";
+						$generator = $column_name;
 					}
 					else
 					{
 						$line .= "\t{$column_name} {$column_type} ";
 					}
 
-					if (isset($table_data['PRIMARY_KEY']))
-					{
-						$table_data['PRIMARY_KEY'] = (!is_array($table_data['PRIMARY_KEY'])) ? array($table_data['PRIMARY_KEY']) : $table_data['PRIMARY_KEY'];
-
-						if (in_array($column_name, $table_data['PRIMARY_KEY']))
-						{
-							$line .= 'PRIMARY KEY ';
-						}
-					}
-
 					$line .= 'NOT NULL ';
 					$line .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
 					$line .= ",\n";
@@ -331,9 +323,18 @@ foreach ($supported_dbms as $dbms)
 					}
 
 					$line .= "\t[{$column_name}] {$column_type} ";
+
 					if (!is_null($column_data[1]))
 					{
-						$line .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
+						// For hexadecimal values do not use single quotes
+						if (strpos($column_data[1], '0x') === 0)
+						{
+							$line .= 'DEFAULT (' . $column_data[1] . ') ';
+						}
+						else
+						{
+							$line .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
+						}
 					}
 
 					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
@@ -348,7 +349,10 @@ foreach ($supported_dbms as $dbms)
 				case 'oracle':
 					$line .= "\t{$column_name} {$column_type} ";
 					$line .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-					$line .= "NOT NULL,\n";
+
+					// In Oracle empty strings ('') are treated as NULL.
+					// Therefore in oracle we allow NULL's for all DEFAULT '' entries
+					$line .= ($column_data[1] === '') ? ",\n" : "NOT NULL,\n";
 
 					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
 					{
@@ -391,12 +395,6 @@ foreach ($supported_dbms as $dbms)
 				$line .= "\n);;\n\n";
 			break;
 
-			case 'sqlite':
-				// Remove last line delimiter...
-				$line = substr($line, 0, -2);
-				$line .= "\n);\n\n";
-			break;
-
 			case 'mssql':
 				$line = substr($line, 0, -2);
 				$line .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n";
@@ -423,6 +421,13 @@ foreach ($supported_dbms as $dbms)
 					$line .= "ALTER TABLE {$table_name} ADD PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ");;\n\n";
 				break;
 
+				case 'sqlite':
+					if ($generator === false || !in_array($generator, $table_data['PRIMARY_KEY']))
+					{
+						$line .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+					}
+				break;
+
 				case 'mssql':
 					$line .= "ALTER TABLE [{$table_name}] WITH NOCHECK ADD \n";
 					$line .= "\tCONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED \n";
@@ -468,6 +473,12 @@ foreach ($supported_dbms as $dbms)
 				$line = substr($line, 0, -2);
 				$line .= "\n);\n\n";
 			break;
+
+			case 'sqlite':
+				// Remove last line delimiter...
+				$line = substr($line, 0, -2);
+				$line .= "\n);\n\n";
+			break;
 		}
 
 		// Write Keys
@@ -518,7 +529,7 @@ foreach ($supported_dbms as $dbms)
 					case 'postgres':
 						$line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
 						$line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
-						
+
 						$line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
 					break;
 				}
@@ -540,7 +551,7 @@ foreach ($supported_dbms as $dbms)
 					$line .= "\nCREATE GENERATOR {$table_name}_gen;;\n";
 					$line .= 'SET GENERATOR ' . $table_name . "_gen TO 0;;\n\n";
 
-					$line .= 'CREATE TRIGGER t_' . $table_name . '_gen FOR ' . $table_name . "\n";
+					$line .= 'CREATE TRIGGER t_' . $table_name . ' FOR ' . $table_name . "\n";
 					$line .= "BEFORE INSERT\nAS\nBEGIN\n";
 					$line .= "\tNEW.{$generator} = GEN_ID({$table_name}_gen, 1);\nEND;;\n\n";
 				}
@@ -551,7 +562,7 @@ foreach ($supported_dbms as $dbms)
 				{
 					$line .= "\nCREATE SEQUENCE {$table_name}_seq\n/\n\n";
 
-					$line .= "CREATE OR REPLACE TRIGGER ai_{$table_name}_seq\n";
+					$line .= "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
 					$line .= "BEFORE INSERT ON {$table_name}\n";
 					$line .= "FOR EACH ROW WHEN (\n";
 					$line .= "\tnew.{$generator} IS NULL OR new.{$generator} = 0\n";
@@ -572,14 +583,69 @@ foreach ($supported_dbms as $dbms)
 	switch ($dbms)
 	{
 		case 'firebird':
-			$line = "\n\nDECLARE EXTERNAL FUNCTION STRLEN\n";
-			$line .= "\tCSTRING(32767)\n";
-			$line .= "RETURNS INTEGER BY VALUE\n";
-			$line .= "ENTRY_POINT 'IB_UDF_strlen' MODULE_NAME 'ib_udf';;\n\n";
-
-			$line .= "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80)\n";
-			$line .= "RETURNS CSTRING(80) FREE_IT \n";
-			$line .= "ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf';;\n\n";
+			$line = <<<EOF
+# Trigger for phpbb_forums bitfields
+CREATE TRIGGER t_phpbb_forums_desc_bitf FOR phpbb_forums
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.forum_desc_bitfield is null) THEN
+		NEW.forum_desc_bitfield = ASCII_CHAR(0);
+END;;
+
+CREATE TRIGGER t_phpbb_forums_rules_bitf FOR phpbb_forums
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.forum_rules_bitfield is null) THEN
+		NEW.forum_rules_bitfield = ASCII_CHAR(0);
+END;;
+
+# Trigger for phpbb_groups bitfields
+CREATE TRIGGER t_phpbb_groups_bitf FOR phpbb_groups
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.group_desc_bitfield is null) THEN
+		NEW.group_desc_bitfield = ASCII_CHAR(0);
+END;;
+
+# Trigger for phpbb_posts bitfields
+CREATE TRIGGER t_phpbb_posts_bitf FOR phpbb_posts
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.bbcode_bitfield is null) THEN
+		NEW.bbcode_bitfield = ASCII_CHAR(0);
+END;;
+
+# Trigger for phpbb_privmsgs bitfields
+CREATE TRIGGER t_phpbb_privmsgs_bitf FOR phpbb_privmsgs
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.bbcode_bitfield is null) THEN
+		NEW.bbcode_bitfield = ASCII_CHAR(0);
+END;;
+
+# Trigger for phpbb_styles_template bitfields
+CREATE TRIGGER t_phpbb_styles_template_bitf FOR phpbb_styles_template
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.bbcode_bitfield is null) THEN
+		NEW.bbcode_bitfield = ASCII_CHAR(144) || ASCII_CHAR(216);
+END;;
+
+# Trigger for phpbb_users bitfields
+CREATE TRIGGER t_phpbb_users_bitf FOR phpbb_users
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.user_sig_bbcode_bitfield is null) THEN
+		NEW.user_sig_bbcode_bitfield = ASCII_CHAR(0);
+END;;
+EOF;
 		break;
 
 		case 'mssql':
@@ -666,8 +732,8 @@ function get_schema_struct()
 			'auth_setting'		=> array('TINT:2', 0),
 		),
 		'KEYS'			=> array(
-			'group_id'			=> array('INDEX', 'group_id'),
-			'auth_option_id'	=> array('INDEX', 'auth_option_id'),
+			'group_id'		=> array('INDEX', 'group_id'),
+			'auth_opt_id'	=> array('INDEX', 'auth_option_id'),
 		),
 	);
 
@@ -753,7 +819,7 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'bbcode_id',
 		'KEYS'			=> array(
-			'display_in_posting'	=> array('INDEX', 'display_on_posting'),
+			'display_on_post'		=> array('INDEX', 'display_on_posting'),
 		),
 	);
 
@@ -786,7 +852,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_config'] = array(
 		'COLUMNS'		=> array(
-			'config_name'		=> array('VCHAR', ''),
+			'config_name'		=> array('VCHAR:252', ''),
 			'config_value'		=> array('VCHAR', ''),
 			'is_dynamic'		=> array('BOOL', 0),
 		),
@@ -809,7 +875,7 @@ function get_schema_struct()
 	$schema_data['phpbb_disallow'] = array(
 		'COLUMNS'		=> array(
 			'disallow_id'		=> array('UINT', NULL, 'auto_increment'),
-			'disallow_username'	=> array('VCHAR', ''),
+			'disallow_username'	=> array('VCHAR:252', ''),
 		),
 		'PRIMARY_KEY'	=> 'disallow_id',
 	);
@@ -898,7 +964,7 @@ function get_schema_struct()
 		'PRIMARY_KEY'	=> 'forum_id',
 		'KEYS'			=> array(
 			'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
-			'forum_last_post_id'	=> array('INDEX', 'forum_last_post_id'),
+			'forum_lastpost_id'		=> array('INDEX', 'forum_last_post_id'),
 		),
 	);
 
@@ -929,7 +995,7 @@ function get_schema_struct()
 		'KEYS'			=> array(
 			'forum_id'				=> array('INDEX', 'forum_id'),
 			'user_id'				=> array('INDEX', 'user_id'),
-			'notify_status'			=> array('INDEX', 'notify_status'),
+			'notify_stat'			=> array('INDEX', 'notify_status'),
 		),
 	);
 
@@ -970,6 +1036,9 @@ function get_schema_struct()
 			'display_on_posting'	=> array('BOOL', 1),
 		),
 		'PRIMARY_KEY'	=> 'icons_id',
+		'KEYS'			=> array(
+			'display_on_posting'	=> array('INDEX', 'display_on_posting'),
+		),
 	);
 
 	$schema_data['phpbb_lang'] = array(
@@ -1014,13 +1083,13 @@ function get_schema_struct()
 		'COLUMNS'		=> array(
 			'forum_id'				=> array('UINT', 0),
 			'user_id'				=> array('UINT', 0),
-			'username'				=> array('VCHAR', ''),
+			'username'				=> array('VCHAR:252', ''),
 			'group_id'				=> array('UINT', 0),
 			'group_name'			=> array('VCHAR', ''),
 			'display_on_index'		=> array('BOOL', 1),
 		),
 		'KEYS'			=> array(
-			'display_on_index'		=> array('INDEX', 'display_on_index'),
+			'disp_idx'				=> array('INDEX', 'display_on_index'),
 			'forum_id'				=> array('INDEX', 'forum_id'),
 		),
 	);
@@ -1055,7 +1124,7 @@ function get_schema_struct()
 			'poll_option_total'		=> array('UINT', 0),
 		),
 		'KEYS'			=> array(
-			'poll_option_id'		=> array('INDEX', 'poll_option_id'),
+			'poll_opt_id'			=> array('INDEX', 'poll_option_id'),
 			'topic_id'				=> array('INDEX', 'topic_id'),
 		),
 	);
@@ -1089,7 +1158,7 @@ function get_schema_struct()
 			'enable_smilies'		=> array('BOOL', 1),
 			'enable_magic_url'		=> array('BOOL', 1),
 			'enable_sig'			=> array('BOOL', 1),
-			'post_username'			=> array('VCHAR', ''),
+			'post_username'			=> array('VCHAR:252', ''),
 			'post_subject'			=> array('XSTEXT', ''),
 			'post_text'				=> array('MTEXT', ''),
 			'post_checksum'			=> array('VCHAR:32', ''),
@@ -1193,7 +1262,7 @@ function get_schema_struct()
 		),
 		'KEYS'			=> array(
 			'msg_id'				=> array('INDEX', 'msg_id'),
-			'user_folder_id'		=> array('INDEX', array('user_id', 'folder_id')),
+			'usr_flder_id'			=> array('INDEX', array('user_id', 'folder_id')),
 		),
 	);
 
@@ -1218,8 +1287,8 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'field_id',
 		'KEYS'			=> array(
-			'field_type'			=> array('INDEX', 'field_type'),
-			'field_order'			=> array('INDEX', 'field_order'),
+			'fld_type'			=> array('INDEX', 'field_type'),
+			'fld_ordr'			=> array('INDEX', 'field_order'),
 		),
 	);
 
@@ -1299,13 +1368,13 @@ function get_schema_struct()
 
 	$schema_data['phpbb_search_wordlist'] = array(
 		'COLUMNS'		=> array(
-			'word_text'			=> array('VCHAR_BIN', ''),
 			'word_id'			=> array('UINT', NULL, 'auto_increment'),
+			'word_text'			=> array('VCHAR_BIN', ''),
 			'word_common'		=> array('BOOL', 0),
 		),
-		'PRIMARY_KEY'	=> 'word_text',
+		'PRIMARY_KEY'	=> 'word_id',
 		'KEYS'			=> array(
-			'word_id'			=> array('INDEX', 'word_id'),
+			'wrd_txt'			=> array('UNIQUE', 'word_text'),
 		),
 	);
 
@@ -1377,14 +1446,14 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'smiley_id',
 		'KEYS'			=> array(
-			'display_on_posting'	=> array('INDEX', 'display_on_posting'),
+			'display_on_post'		=> array('INDEX', 'display_on_posting'),
 		),
 	);
 
 	$schema_data['phpbb_styles'] = array(
 		'COLUMNS'		=> array(
 			'style_id'				=> array('TINT:4', NULL, 'auto_increment'),
-			'style_name'			=> array('VCHAR', ''),
+			'style_name'			=> array('VCHAR:252', ''),
 			'style_copyright'		=> array('VCHAR', ''),
 			'style_active'			=> array('BOOL', 1),
 			'template_id'			=> array('TINT:4', 0),
@@ -1403,7 +1472,7 @@ function get_schema_struct()
 	$schema_data['phpbb_styles_template'] = array(
 		'COLUMNS'		=> array(
 			'template_id'			=> array('TINT:4', NULL, 'auto_increment'),
-			'template_name'			=> array('VCHAR', ''),
+			'template_name'			=> array('VCHAR:252', ''),
 			'template_copyright'	=> array('VCHAR', ''),
 			'template_path'			=> array('VCHAR:100', ''),
 			'bbcode_bitfield'		=> array('VARBINARY', array('default' => '', 'mysql' => '0x90D8', 'mssql' => '0x90D8', 'oracle' => '90D8', 'postgres' => '\220\330')),
@@ -1411,7 +1480,7 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'template_id',
 		'KEYS'			=> array(
-			'template_name'			=> array('UNIQUE', 'template_name'),
+			'tmplte_nm'				=> array('UNIQUE', 'template_name'),
 		),
 	);
 
@@ -1424,15 +1493,15 @@ function get_schema_struct()
 			'template_data'			=> array('MTEXT', ''),
 		),
 		'KEYS'			=> array(
-			'template_id'			=> array('INDEX', 'template_id'),
-			'template_filename'		=> array('INDEX', 'template_filename'),
+			'tid'					=> array('INDEX', 'template_id'),
+			'tfn'					=> array('INDEX', 'template_filename'),
 		),
 	);
 
 	$schema_data['phpbb_styles_theme'] = array(
 		'COLUMNS'		=> array(
 			'theme_id'				=> array('TINT:4', NULL, 'auto_increment'),
-			'theme_name'			=> array('VCHAR', ''),
+			'theme_name'			=> array('VCHAR:252', ''),
 			'theme_copyright'		=> array('VCHAR', ''),
 			'theme_path'			=> array('VCHAR:100', ''),
 			'theme_storedb'			=> array('BOOL', 0),
@@ -1448,89 +1517,108 @@ function get_schema_struct()
 	$schema_data['phpbb_styles_imageset'] = array(
 		'COLUMNS'		=> array(
 			'imageset_id'				=> array('TINT:4', NULL, 'auto_increment'),
-			'imageset_name'				=> array('VCHAR', ''),
+			'imageset_name'				=> array('VCHAR:252', ''),
 			'imageset_copyright'		=> array('VCHAR', ''),
 			'imageset_path'				=> array('VCHAR:100', ''),
+
 			'site_logo'					=> array('VCHAR:200', ''),
-			'btn_post'					=> array('VCHAR:200', ''),
-			'btn_post_pm'				=> array('VCHAR:200', ''),
-			'btn_reply'					=> array('VCHAR:200', ''),
-			'btn_reply_pm'				=> array('VCHAR:200', ''),
-			'btn_locked'				=> array('VCHAR:200', ''),
-			'btn_profile'				=> array('VCHAR:200', ''),
-			'btn_pm'					=> array('VCHAR:200', ''),
-			'btn_delete'				=> array('VCHAR:200', ''),
-			'btn_info'					=> array('VCHAR:200', ''),
-			'btn_quote'					=> array('VCHAR:200', ''),
-			'btn_search'				=> array('VCHAR:200', ''),
-			'btn_edit'					=> array('VCHAR:200', ''),
-			'btn_report'				=> array('VCHAR:200', ''),
-			'btn_warn'					=> array('VCHAR:200', ''),
-			'btn_email'					=> array('VCHAR:200', ''),
-			'btn_www'					=> array('VCHAR:200', ''),
-			'btn_icq'					=> array('VCHAR:200', ''),
-			'btn_aim'					=> array('VCHAR:200', ''),
-			'btn_yim'					=> array('VCHAR:200', ''),
-			'btn_msnm'					=> array('VCHAR:200', ''),
-			'btn_jabber'				=> array('VCHAR:200', ''),
-			'btn_online'				=> array('VCHAR:200', ''),
-			'btn_offline'				=> array('VCHAR:200', ''),
-			'btn_friend'				=> array('VCHAR:200', ''),
-			'btn_foe'					=> array('VCHAR:200', ''),
-			'icon_unapproved'			=> array('VCHAR:200', ''),
-			'icon_reported'				=> array('VCHAR:200', ''),
-			'icon_attach'				=> array('VCHAR:200', ''),
-			'icon_post'					=> array('VCHAR:200', ''),
-			'icon_post_new'				=> array('VCHAR:200', ''),
-			'icon_post_latest'			=> array('VCHAR:200', ''),
-			'icon_post_newest'			=> array('VCHAR:200', ''),
-			'forum'						=> array('VCHAR:200', ''),
-			'forum_new'					=> array('VCHAR:200', ''),
-			'forum_locked'				=> array('VCHAR:200', ''),
-			'forum_link'				=> array('VCHAR:200', ''),
-			'sub_forum'					=> array('VCHAR:200', ''),
-			'sub_forum_new'				=> array('VCHAR:200', ''),
-			'folder'					=> array('VCHAR:200', ''),
-			'folder_moved'				=> array('VCHAR:200', ''),
-			'folder_post'				=> array('VCHAR:200', ''),
-			'folder_new'				=> array('VCHAR:200', ''),
-			'folder_new_post'			=> array('VCHAR:200', ''),
-			'folder_hot'				=> array('VCHAR:200', ''),
-			'folder_hot_post'			=> array('VCHAR:200', ''),
-			'folder_hot_new'			=> array('VCHAR:200', ''),
-			'folder_hot_new_post'		=> array('VCHAR:200', ''),
-			'folder_lock'				=> array('VCHAR:200', ''),
-			'folder_lock_post'			=> array('VCHAR:200', ''),
-			'folder_lock_new'			=> array('VCHAR:200', ''),
-			'folder_lock_new_post'		=> array('VCHAR:200', ''),
-			'folder_lock_announce'		=> array('VCHAR:200', ''),
-			'folder_lock_announce_new'		=> array('VCHAR:200', ''),
-			'folder_lock_announce_post'		=> array('VCHAR:200', ''),
-			'folder_lock_announce_new_post'	=> array('VCHAR:200', ''),
-			'folder_lock_global'			=> array('VCHAR:200', ''),
-			'folder_lock_global_new'		=> array('VCHAR:200', ''),
-			'folder_lock_global_post'		=> array('VCHAR:200', ''),
-			'folder_lock_global_new_post'	=> array('VCHAR:200', ''),
-			'folder_lock_sticky'			=> array('VCHAR:200', ''),
-			'folder_lock_sticky_new'		=> array('VCHAR:200', ''),
-			'folder_lock_sticky_post'		=> array('VCHAR:200', ''),
-			'folder_lock_sticky_new_post'	=> array('VCHAR:200', ''),
-			'folder_sticky'				=> array('VCHAR:200', ''),
-			'folder_sticky_post'		=> array('VCHAR:200', ''),
-			'folder_sticky_new'			=> array('VCHAR:200', ''),
-			'folder_sticky_new_post'	=> array('VCHAR:200', ''),
-			'folder_announce'			=> array('VCHAR:200', ''),
-			'folder_announce_post'		=> array('VCHAR:200', ''),
-			'folder_announce_new'		=> array('VCHAR:200', ''),
-			'folder_announce_new_post'	=> array('VCHAR:200', ''),
-			'folder_global'				=> array('VCHAR:200', ''),
-			'folder_global_post'		=> array('VCHAR:200', ''),
-			'folder_global_new'			=> array('VCHAR:200', ''),
-			'folder_global_new_post'	=> array('VCHAR:200', ''),
+			'upload_bar'				=> array('VCHAR:200', ''),
 			'poll_left'					=> array('VCHAR:200', ''),
 			'poll_center'				=> array('VCHAR:200', ''),
 			'poll_right'				=> array('VCHAR:200', ''),
-			'attach_progress_bar'		=> array('VCHAR:200', ''),
+			'icon_friend'				=> array('VCHAR:200', ''),
+			'icon_foe'					=> array('VCHAR:200', ''),
+
+			'forum_link'				=> array('VCHAR:200', ''),
+			'forum_read'				=> array('VCHAR:200', ''),
+			'forum_read_locked'			=> array('VCHAR:200', ''),
+			'forum_read_subforum'		=> array('VCHAR:200', ''),
+			'forum_unread'				=> array('VCHAR:200', ''),
+			'forum_unread_locked'		=> array('VCHAR:200', ''),
+			'forum_unread_subforum'		=> array('VCHAR:200', ''),
+
+			'topic_moved'				=> array('VCHAR:200', ''),
+
+			'topic_read'				=> array('VCHAR:200', ''),
+			'topic_read_mine'			=> array('VCHAR:200', ''),
+			'topic_read_hot'			=> array('VCHAR:200', ''),
+			'topic_read_hot_mine'		=> array('VCHAR:200', ''),
+			'topic_read_locked'			=> array('VCHAR:200', ''),
+			'topic_read_locked_mine'	=> array('VCHAR:200', ''),
+
+			'topic_unread'				=> array('VCHAR:200', ''),
+			'topic_unread_mine'			=> array('VCHAR:200', ''),
+			'topic_unread_hot'			=> array('VCHAR:200', ''),
+			'topic_unread_hot_mine'		=> array('VCHAR:200', ''),
+			'topic_unread_locked'		=> array('VCHAR:200', ''),
+			'topic_unread_locked_mine'	=> array('VCHAR:200', ''),
+
+			'sticky_read'				=> array('VCHAR:200', ''),
+			'sticky_read_mine'			=> array('VCHAR:200', ''),
+			'sticky_read_locked'		=> array('VCHAR:200', ''),
+			'sticky_read_locked_mine'	=> array('VCHAR:200', ''),
+			'sticky_unread'				=> array('VCHAR:200', ''),
+			'sticky_unread_mine'		=> array('VCHAR:200', ''),
+			'sticky_unread_locked'		=> array('VCHAR:200', ''),
+			'sticky_unread_locked_mine'	=> array('VCHAR:200', ''),
+
+			'announce_read'				=> array('VCHAR:200', ''),
+			'announce_read_mine'		=> array('VCHAR:200', ''),
+			'announce_read_locked'		=> array('VCHAR:200', ''),
+			'announce_read_locked_mine'	=> array('VCHAR:200', ''),
+			'announce_unread'			=> array('VCHAR:200', ''),
+			'announce_unread_mine'		=> array('VCHAR:200', ''),
+			'announce_unread_locked'	=> array('VCHAR:200', ''),
+			'announce_unread_locked_mine'	=> array('VCHAR:200', ''),
+
+			'global_read'				=> array('VCHAR:200', ''),
+			'global_read_mine'			=> array('VCHAR:200', ''),
+			'global_read_locked'		=> array('VCHAR:200', ''),
+			'global_read_locked_mine'	=> array('VCHAR:200', ''),
+			'global_unread'				=> array('VCHAR:200', ''),
+			'global_unread_mine'		=> array('VCHAR:200', ''),
+			'global_unread_locked'		=> array('VCHAR:200', ''),
+			'global_unread_locked_mine'	=> array('VCHAR:200', ''),
+
+			'pm_read'					=> array('VCHAR:200', ''),
+			'pm_unread'					=> array('VCHAR:200', ''),
+
+			'icon_contact_aim'			=> array('VCHAR:200', ''),
+			'icon_contact_email'		=> array('VCHAR:200', ''),
+			'icon_contact_icq'			=> array('VCHAR:200', ''),
+			'icon_contact_jabber'		=> array('VCHAR:200', ''),
+			'icon_contact_msnm'			=> array('VCHAR:200', ''),
+			'icon_contact_pm'			=> array('VCHAR:200', ''),
+			'icon_contact_yahoo'		=> array('VCHAR:200', ''),
+			'icon_contact_www'			=> array('VCHAR:200', ''),
+
+			'icon_post_delete'			=> array('VCHAR:200', ''),
+			'icon_post_edit'			=> array('VCHAR:200', ''),
+			'icon_post_info'			=> array('VCHAR:200', ''),
+			'icon_post_quote'			=> array('VCHAR:200', ''),
+			'icon_post_report'			=> array('VCHAR:200', ''),
+			'icon_post_target'			=> array('VCHAR:200', ''),
+			'icon_post_target_unread'	=> array('VCHAR:200', ''),
+
+			'icon_topic_attach'			=> array('VCHAR:200', ''),
+			'icon_topic_latest'			=> array('VCHAR:200', ''),
+			'icon_topic_newest'			=> array('VCHAR:200', ''),
+			'icon_topic_reported'		=> array('VCHAR:200', ''),
+			'icon_topic_unapproved'		=> array('VCHAR:200', ''),
+
+			'icon_user_online'			=> array('VCHAR:200', ''),
+			'icon_user_offline'			=> array('VCHAR:200', ''),
+			'icon_user_profile'			=> array('VCHAR:200', ''),
+			'icon_user_search'			=> array('VCHAR:200', ''),
+			'icon_user_warn'			=> array('VCHAR:200', ''),
+
+			'button_pm_forward'			=> array('VCHAR:200', ''),
+			'button_pm_new'				=> array('VCHAR:200', ''),
+			'button_pm_reply'			=> array('VCHAR:200', ''),
+			'button_topic_locked'		=> array('VCHAR:200', ''),
+			'button_topic_new'			=> array('VCHAR:200', ''),
+			'button_topic_reply'		=> array('VCHAR:200', ''),
+
 			'user_icon1'				=> array('VCHAR:200', ''),
 			'user_icon2'				=> array('VCHAR:200', ''),
 			'user_icon3'				=> array('VCHAR:200', ''),
@@ -1544,7 +1632,7 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'		=> 'imageset_id',
 		'KEYS'				=> array(
-			'imageset_name'			=> array('UNIQUE', 'imageset_name'),
+			'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
 		),
 	);
 
@@ -1584,9 +1672,9 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'topic_id',
 		'KEYS'			=> array(
-			'forum_id'				=> array('INDEX', 'forum_id'),
-			'forum_id_type'			=> array('INDEX', array('forum_id', 'topic_type')),
-			'topic_last_post_time'	=> array('INDEX', 'topic_last_post_time'),
+			'forum_id'			=> array('INDEX', 'forum_id'),
+			'forum_id_type'		=> array('INDEX', array('forum_id', 'topic_type')),
+			'last_post_time'	=> array('INDEX', 'topic_last_post_time'),
 		),
 	);
 
@@ -1621,7 +1709,7 @@ function get_schema_struct()
 		'KEYS'			=> array(
 			'topic_id'			=> array('INDEX', 'topic_id'),
 			'user_id'			=> array('INDEX', 'user_id'),
-			'notify_status'		=> array('INDEX', 'notify_status'),
+			'notify_stat'		=> array('INDEX', 'notify_status'),
 		),
 	);
 
@@ -1758,11 +1846,14 @@ function get_schema_struct()
 
 
 /**
-* Data put into the header for oracle
+* Data put into the header for various dbms
 */
-function oracle_custom_data()
+function custom_data($dbms)
 {
-	return <<<EOF
+	switch ($dbms)
+	{
+		case 'oracle':
+			return <<<EOF
 /*
   This first section is optional, however its probably the best method
   of running phpBB on Oracle. If you already have a tablespace and user created
@@ -1775,7 +1866,7 @@ function oracle_custom_data()
 /*
 CREATE TABLESPACE "PHPBB"
 	LOGGING 
-	DATAFILE \'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora\' 
+	DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora' 
 	SIZE 10M
 	AUTOEXTEND ON NEXT 10M
 	MAXSIZE 100M;
@@ -1801,18 +1892,19 @@ DISCONNECT;
 CONNECT phpbb/phpbb_password;
 */
 EOF;
-}
 
-/**
-* Data put into the header for postgreSQL
+		break;
+
+		case 'postgres':
+			return <<<EOF
+/*
+	Domain definition
 */
-function postgres_custom_data()
-{
-	return <<<EOF
-/* Domain definition */
-CREATE DOMAIN varchar_ci AS varchar(255) NOT NULL DEFAULT ''::character varying;
+CREATE DOMAIN varchar_ci AS varchar(252) NOT NULL DEFAULT ''::character varying;
 
-/* Operation Functions */
+/*
+	Operation Functions
+*/
 CREATE FUNCTION _varchar_ci_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) = LOWER($2)' LANGUAGE SQL STRICT;
 CREATE FUNCTION _varchar_ci_not_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) != LOWER($2)' LANGUAGE SQL STRICT;
 CREATE FUNCTION _varchar_ci_less_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) < LOWER($2)' LANGUAGE SQL STRICT;
@@ -1820,7 +1912,9 @@ CREATE FUNCTION _varchar_ci_less_equal(varchar_ci, varchar_ci) RETURNS boolean A
 CREATE FUNCTION _varchar_ci_greater_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) > LOWER($2)' LANGUAGE SQL STRICT;
 CREATE FUNCTION _varchar_ci_greater_equals(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) >= LOWER($2)' LANGUAGE SQL STRICT;
 
-/* Operators */
+/*
+	Operators
+*/
 CREATE OPERATOR <(
   PROCEDURE = _varchar_ci_less_than,
   LEFTARG = varchar_ci,
@@ -1879,6 +1973,31 @@ CREATE OPERATOR =(
   SORT1= <);
 
 EOF;
+		break;
+
+		case 'firebird':
+			return <<<EOF
+
+# Emulation of STRLEN, might need to be checked out for FB 2.0
+DECLARE EXTERNAL FUNCTION STRLEN CSTRING(32767)
+RETURNS INTEGER BY VALUE
+ENTRY_POINT 'IB_UDF_strlen' MODULE_NAME 'ib_udf';;
+
+# Emulation of LOWER, might need to be checked out for FB 2.0
+DECLARE EXTERNAL FUNCTION LOWER CSTRING(80)
+RETURNS CSTRING(80) FREE_IT 
+ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf';;
+
+# Only used for insertion of binary strings as defaults
+DECLARE EXTERNAL FUNCTION ASCII_CHAR INTEGER
+RETURNS CSTRING(1) FREE_IT
+ENTRY_POINT 'IB_UDF_ascii_char' MODULE_NAME 'ib_udf';;
+
+EOF;
+		break;
+	}
+
+	return '';
 }
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index f75d878a9e..f6f6e0de9d 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -159,6 +159,7 @@ class acp_email
 					$messenger->assign_vars(array(
 						'SITENAME'		=> $config['sitename'],
 						'CONTACT_EMAIL' => $config['board_contact'],
+						'EMAIL_SIG'		=> str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
 						'MESSAGE'		=> html_entity_decode($message))
 					);
 	
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 824c266780..2d9415bbf6 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -711,8 +711,10 @@ class acp_modules
 					WHERE module_class = '" . $db->sql_escape($this->module_class) . "'
 						AND module_id = {$module_data['parent_id']}";
 				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
 
-				if (!$row = $db->sql_fetchrow($result))
+				if (!$row)
 				{
 					if ($run_inline)
 					{
@@ -721,7 +723,6 @@ class acp_modules
 
 					trigger_error($user->lang['PARENT_NO_EXIST']);
 				}
-				$db->sql_freeresult($result);
 
 				$sql = 'UPDATE ' . MODULES_TABLE . "
 					SET left_id = left_id + 2, right_id = right_id + 2
diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php
index 90ec2ddb55..402663ad90 100644
--- a/phpBB/includes/acp/acp_reasons.php
+++ b/phpBB/includes/acp/acp_reasons.php
@@ -76,7 +76,7 @@ class acp_reasons
 					{
 						$sql = 'SELECT reason_id
 							FROM ' . REPORTS_REASONS_TABLE . "
-							WHERE LOWER(reason_title) = '" . strtolower($reason_row['reason_title']) . "'";
+							WHERE LOWER(reason_title) = '" . strtolower($db->sql_escape($reason_row['reason_title'])) . "'";
 						$result = $db->sql_query($sql);
 						$row = $db->sql_fetchrow($result);
 						$db->sql_freeresult($result);
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index c2989174a1..c69cbec65e 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -89,7 +89,32 @@ parse_css_file = {PARSE_CSS_FILE}
 pagination_sep = \'{PAGINATION_SEP}\'
 ';
 
-		$this->imageset_keys = 'site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_warn, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_post, folder_new, folder_new_post, folder_hot, folder_hot_post, folder_hot_new, folder_hot_new_post, folder_lock, folder_lock_post, folder_lock_new, folder_lock_new_post, folder_lock_announce, folder_lock_announce_new, folder_lock_announce_post, folder_lock_announce_new_post, folder_lock_global, folder_lock_global_new, folder_lock_global_post, folder_lock_global_new_post, folder_lock_sticky, folder_lock_sticky_new, folder_lock_sticky_post, folder_lock_sticky_new_post, folder_sticky, folder_sticky_post, folder_sticky_new, folder_sticky_new_post, folder_announce, folder_announce_post, folder_announce_new, folder_announce_new_post, folder_global, folder_global_post, folder_global_new, folder_global_new_post, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10';
+		$this->imageset_keys = array(
+			'logos' => array(
+				'site_logo',
+			),
+			'buttons'	=> array(
+				'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply',
+			),
+			'icons'		=> array(
+				'icon_post_target', 'icon_post_target_unread', 'icon_topic_attach', 'icon_topic_latest', 'icon_topic_newest', 'icon_topic_reported', 'icon_topic_unapproved', 'icon_friend', 'icon_foe',
+			),
+			'forums'	=> array(
+				'forum_link', 'forum_read', 'forum_read_locked', 'forum_read_subforum', 'forum_unread', 'forum_unread_locked', 'forum_unread_subforum',
+			),
+			'folders'	=> array(
+				'topic_moved', 'topic_read', 'topic_read_mine', 'topic_read_hot', 'topic_read_hot_mine', 'topic_read_locked', 'topic_read_locked_mine', 'topic_unread', 'topic_unread_mine', 'topic_unread_hot', 'topic_unread_hot_mine', 'topic_unread_locked', 'topic_unread_locked_mine', 'sticky_read', 'sticky_read_mine', 'sticky_read_locked', 'sticky_read_locked_mine', 'sticky_unread', 'sticky_unread_mine', 'sticky_unread_locked', 'sticky_unread_locked_mine', 'announce_read', 'announce_read_mine', 'announce_read_locked', 'announce_read_locked_mine', 'announce_unread', 'announce_unread_mine', 'announce_unread_locked', 'announce_unread_locked_mine', 'global_read', 'global_read_mine', 'global_read_locked', 'global_read_locked_mine', 'global_unread', 'global_unread_mine', 'global_unread_locked', 'global_unread_locked_mine', 'pm_read', 'pm_unread',
+			),
+			'polls'		=> array(
+				'poll_left', 'poll_center', 'poll_right',
+			),
+			'ui'		=> array(
+				'upload_bar',
+			),
+			'user'		=> array(
+				'user_icon1', 'user_icon2', 'user_icon3', 'user_icon4', 'user_icon5', 'user_icon6', 'user_icon7', 'user_icon8', 'user_icon9', 'user_icon10',
+			),
+		);
 
 		// Execute overall actions
 		switch ($action)
@@ -958,7 +983,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 			$css_elements = array_diff(array_map('trim', explode("\n", preg_replace("#;[\n]*#s", "\n", $css_data))), array(''));
 
 			// Grab list of potential images for the "images" type
-			$imglist = filelist($phpbb_root_path . 'styles/' . $theme_info['theme_name'] . '/theme');
+			$img_filelist = filelist($phpbb_root_path . 'styles/' . $theme_info['theme_name'] . '/theme');
 
 			foreach ($match_elements as $type => $match_ary)
 			{
@@ -1035,7 +1060,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 						case 'images':
 							// generate a list of images for this setting
 							$s_imglist = '';
-							foreach ($imglist as $path => $img_ary)
+							foreach ($img_filelist as $path => $img_ary)
 							{
 								foreach ($img_ary as $img)
 								{
@@ -1080,7 +1105,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 				$s_hidden_fields['cssother'] = implode(' ;; ', $css_elements);
 			}
 
-			unset($imglist, $css_elements);
+			unset($img_filelist, $css_elements);
 		}
 		// else if we are showing raw css or the user submitted data from the simple view
 		// then we need to turn the given information into raw css
@@ -1272,34 +1297,8 @@ pagination_sep = \'{PAGINATION_SEP}\'
 
 			// Check to see whether the selected image exists in the table
 			$valid_name = ($update) ? false : true;
-			$imglist = array(
-				'logos' => array(
-					'site_logo',
-				),
-				'buttons'	=> array(
-					'btn_post', 'btn_reply', 'btn_locked', 'btn_quote', 'btn_edit', 'btn_delete', 'btn_report', 'btn_warn', 'btn_post_pm', 'btn_reply_pm', 'btn_profile', 'btn_pm', 'btn_info', 'btn_search', 'btn_email', 'btn_www', 'btn_icq', 'btn_aim', 'btn_yim', 'btn_msnm', 'btn_jabber', 'btn_online', 'btn_offline', 'btn_friend', 'btn_foe',
-				),
-				'icons'		=> array(
-					'icon_unapproved', 'icon_reported', 'icon_attach', 'icon_post', 'icon_post_new', 'icon_post_latest', 'icon_post_newest',
-				),
-				'forums'	=> array(
-					'forum', 'forum_new', 'forum_locked', 'forum_link', 'sub_forum', 'sub_forum_new',
-				),
-				'folders'	=> array(
-					'folder', 'folder_moved', 'folder_post', 'folder_new', 'folder_new_post', 'folder_hot', 'folder_hot_post', 'folder_hot_new', 'folder_hot_new_post', 'folder_lock', 'folder_lock_post', 'folder_lock_new', 'folder_lock_new_post', 'folder_lock_announce', 'folder_lock_announce_new', 'folder_lock_announce_post', 'folder_lock_announce_new_post', 'folder_lock_global', 'folder_lock_global_new', 'folder_lock_global_post', 'folder_lock_global_new_post', 'folder_lock_sticky', 'folder_lock_sticky_new', 'folder_lock_sticky_post', 'folder_lock_sticky_new_post', 'folder_sticky', 'folder_sticky_post', 'folder_sticky_new', 'folder_sticky_new_post', 'folder_announce', 'folder_announce_post', 'folder_announce_new', 'folder_announce_new_post', 'folder_global', 'folder_global_post', 'folder_global_new', 'folder_global_new_post',
-				),
-				'polls'		=> array(
-					'poll_left', 'poll_center', 'poll_right',
-				),
-				'ui'		=> array(
-					'attach_progress_bar',
-				),
-				'user'		=> array(
-					'user_icon1', 'user_icon2', 'user_icon3', 'user_icon4', 'user_icon5', 'user_icon6', 'user_icon7', 'user_icon8', 'user_icon9', 'user_icon10',
-				),
-			);
 
-			foreach ($imglist as $category => $img_ary)
+			foreach ($this->imageset_keys as $category => $img_ary)
 			{
 				if (in_array($imgname, $img_ary))
 				{
@@ -1342,11 +1341,12 @@ pagination_sep = \'{PAGINATION_SEP}\'
 
 		// Generate list of image options
 		$img_options = '';
-		foreach ($imglist as $category => $img_ary)
+		foreach ($this->imageset_keys as $category => $img_ary)
 		{
 			$template->assign_block_vars('category', array(
 				'NAME'			=> $user->lang['IMG_CAT_' . strtoupper($category)]
 			));
+
 			foreach ($img_ary as $img)
 			{
 				$template->assign_block_vars('category.images', array(
@@ -1770,11 +1770,12 @@ pagination_sep = \'{PAGINATION_SEP}\'
 			{
 				$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], $config['version']), $this->imageset_cfg);
 
-				$imageset_definitions = explode(', ', $this->imageset_keys);
-
-				foreach ($imageset_definitions as $key)
+				foreach ($this->imageset_keys as $topic => $key_array)
 				{
-					$imageset_cfg .= "\n" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $style_row[$key]);
+					foreach ($key_array as $key)
+					{
+						$imageset_cfg .= "\n" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $style_row[$key]);
+					}
 				}
 
 				$files[] = array(
@@ -2927,7 +2928,12 @@ pagination_sep = \'{PAGINATION_SEP}\'
 		else
 		{
 			$cfg_data = parse_cfg_file("$root_path$mode/imageset.cfg");
-			$imageset_definitions = explode(', ', $this->imageset_keys);
+
+			$imageset_definitions = array();
+			foreach ($this->imageset_keys as $topic => $key_array)
+			{
+				$imageset_definitions = array_merge($imageset_definitions, $key_array);
+			}
 
 			foreach ($cfg_data as $key => $value)
 			{
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 152adfa42c..8bea1a3198 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -26,6 +26,7 @@ if (!defined('SQL_LAYER'))
 
 /**
 * Sqlite Database Abstraction Layer
+* Minimum Requirement: 2.8.2+
 * @package dbal
 */
 class dbal_sqlite extends dbal
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 95fd0d21b8..2d9512c779 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -273,14 +273,14 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			}
 
 			$l_subforums = (sizeof($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': ';
-			$folder_image = ($forum_unread) ? 'sub_forum_new' : 'sub_forum';
+			$folder_image = ($forum_unread) ? 'forum_unread_subforum' : 'forum_read_subforum';
 		}
 		else
 		{
 			switch ($row['forum_type'])
 			{
 				case FORUM_POST:
-					$folder_image = ($forum_unread) ? 'forum_new' : 'forum';
+					$folder_image = ($forum_unread) ? 'forum_unread' : 'forum_read';
 				break;
 
 				case FORUM_LINK:
@@ -292,7 +292,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		// Which folder should we display?
 		if ($row['forum_status'] == ITEM_LOCKED)
 		{
-			$folder_image = 'forum_locked';
+			$folder_image = ($forum_unread) ? 'forum_unread_locked' : 'forum_read_locked';
 			$folder_alt = 'FORUM_LOCKED';
 		}
 		else
@@ -358,7 +358,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		'U_MARK_FORUMS'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $root_data['forum_id'] . '&amp;mark=forums'),
 		'S_HAS_SUBFORUM'	=> ($visible_forums) ? true : false,
 		'L_SUBFORUM'		=> ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'],
-		'LAST_POST_IMG'		=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'))
+		'LAST_POST_IMG'		=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'))
 	);
 
 	if ($return_moderators)
@@ -626,7 +626,7 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
 	if ($topic_row['topic_status'] == ITEM_MOVED)
 	{
 		$topic_type = $user->lang['VIEW_TOPIC_MOVED'];
-		$folder_img = 'folder_moved';
+		$folder_img = 'topic_moved';
 		$folder_alt = 'VIEW_TOPIC_MOVED';
 	}
 	else
@@ -635,73 +635,50 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
 		{
 			case POST_GLOBAL:
 				$topic_type = $user->lang['VIEW_TOPIC_GLOBAL'];
-				$folder = 'folder_global';
-				$folder_new = 'folder_global_new';
-
-				if ($topic_row['topic_status'] == ITEM_LOCKED)
-				{
-					$topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
-					$folder = 'folder_lock_global';
-					$folder_new = 'folder_lock_global_new';
-				}
+				$folder = 'global_read';
+				$folder_new = 'global_unread';
 			break;
 
 			case POST_ANNOUNCE:
 				$topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'];
-				$folder = 'folder_announce';
-				$folder_new = 'folder_announce_new';
-
-				if ($topic_row['topic_status'] == ITEM_LOCKED)
-				{
-					$topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
-					$folder = 'folder_lock_announce';
-					$folder_new = 'folder_lock_announce_new';
-				}
+				$folder = 'announce_read';
+				$folder_new = 'announce_unread';
 			break;
 
 			case POST_STICKY:
 				$topic_type = $user->lang['VIEW_TOPIC_STICKY'];
-				$folder = 'folder_sticky';
-				$folder_new = 'folder_sticky_new';
-
-				if ($topic_row['topic_status'] == ITEM_LOCKED)
-				{
-					$topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
-					$folder = 'folder_lock_sticky';
-					$folder_new = 'folder_lock_sticky_new';
-				}
+				$folder = 'sticky_read';
+				$folder_new = 'sticky_unread';
 			break;
 
 			default:
 				$topic_type = '';
+				$folder = 'topic_read';
+				$folder_new = 'topic_unread';
 
 				if ($config['hot_threshold'] && $replies >= $config['hot_threshold'])
 				{
-					$folder = 'folder_hot';
-					$folder_new = 'folder_hot_new';
-				}
-				else
-				{
-					$folder = 'folder';
-					$folder_new = 'folder_new';
-				}
-
-				if ($topic_row['topic_status'] == ITEM_LOCKED)
-				{
-					$topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
-					$folder = 'folder_lock';
-					$folder_new = 'folder_lock_new';
+					$folder .= '_hot';
+					$folder_new .= '_hot';
 				}
 			break;
 		}
 
+		if ($topic_row['topic_status'] == ITEM_LOCKED)
+		{
+			$topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
+			$folder .= '_locked';
+			$folder_new .= '_locked';
+		}
+
+
 		$folder_img = ($unread_topic) ? $folder_new : $folder;
 		$folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($topic_row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');
 
 		// Posted image?
 		if (!empty($topic_row['topic_posted']) && $topic_row['topic_posted'])
 		{
-			$folder_img .= '_post';
+			$folder_img .= '_mine';
 		}
 	}
 
@@ -747,9 +724,9 @@ function display_attachments($forum_id, $blockname, &$attachment_data, &$update_
 
 		if (isset($extensions[$attachment['extension']]))
 		{
-			if ($user->img('icon_attach', '') && !$extensions[$attachment['extension']]['upload_icon'])
+			if ($user->img('icon_topic_attach', '') && !$extensions[$attachment['extension']]['upload_icon'])
 			{
-				$upload_icon = $user->img('icon_attach', '');
+				$upload_icon = $user->img('icon_topic_attach', '');
 			}
 			else if ($extensions[$attachment['extension']]['upload_icon'])
 			{
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 0fb2f72b2c..3d1b8aa96a 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -892,7 +892,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 		$template->assign_block_vars($mode . '_row', array(
 			'POSTER_NAME'		=> $poster,
 			'POST_SUBJECT'		=> $post_subject,
-			'MINI_POST_IMG'		=> $user->img('icon_post', $user->lang['POST']),
+			'MINI_POST_IMG'		=> $user->img('icon_post_target', $user->lang['POST']),
 			'POST_DATE'			=> $user->format_date($row['post_time']),
 			'MESSAGE'			=> str_replace("\n", '<br />', $message), 
 			'DECODED_MESSAGE'	=> $decoded_message,
@@ -907,7 +907,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 
 	if ($mode == 'topic_review')
 	{
-		$template->assign_var('QUOTE_IMG', $user->img('btn_quote', $user->lang['REPLY_WITH_QUOTE']));
+		$template->assign_var('QUOTE_IMG', $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE']));
 	}
 
 	return true;
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 872670f02d..36211ab5b0 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -65,8 +65,8 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 		'FORUM_NAME'			=> $forum_info['forum_name'],
 		'FORUM_DESCRIPTION'		=> generate_text_for_display($forum_info['forum_desc'], $forum_info['forum_desc_uid'], $forum_info['forum_desc_bitfield'], $forum_info['forum_desc_options']),
 
-		'REPORTED_IMG'			=> $user->img('icon_reported', 'TOPIC_REPORTED'),
-		'UNAPPROVED_IMG'		=> $user->img('icon_unapproved', 'TOPIC_UNAPPROVED'),
+		'REPORTED_IMG'			=> $user->img('icon_topic_reported', 'TOPIC_REPORTED'),
+		'UNAPPROVED_IMG'		=> $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'),
 
 		'S_CAN_DELETE'			=> $auth->acl_get('m_delete', $forum_id),
 		'S_CAN_MOVE'			=> $auth->acl_get('m_move', $forum_id),
@@ -129,13 +129,13 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 			'U_MCP_QUEUE'		=> $u_mcp_queue,
 			'U_MCP_REPORT'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=topic_view&amp;t=' . $row['topic_id'] . '&amp;action=reports'),
 
-			'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+			'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
 			'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 			'TOPIC_FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, false, '', 'src'),
 			'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
 			'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
 			'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-			'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? $user->img('icon_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
+			'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
 
 			'TOPIC_TYPE'		=> $topic_type,
 			'TOPIC_TITLE'		=> $topic_title,
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 03fe3319fc..08bcc713f8 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -131,9 +131,9 @@ function mcp_post_details($id, $mode, $action)
 		
 		'RETURN_TOPIC'			=> sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_info['forum_id']}&amp;p=$post_id") . "#p$post_id\">", '</a>'),
 		'RETURN_FORUM'			=> sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", "f={$post_info['forum_id']}&amp;start={$start}") . '">', '</a>'),
-		'REPORTED_IMG'			=> $user->img('icon_reported', $user->lang['POST_REPORTED']),
-		'UNAPPROVED_IMG'		=> $user->img('icon_unapproved', $user->lang['POST_UNAPPROVED']),
-		'EDIT_IMG'				=> $user->img('btn_edit', $user->lang['EDIT_POST']),
+		'REPORTED_IMG'			=> $user->img('icon_topic_reported', $user->lang['POST_REPORTED']),
+		'UNAPPROVED_IMG'		=> $user->img('icon_topic_unapproved', $user->lang['POST_UNAPPROVED']),
+		'EDIT_IMG'				=> $user->img('icon_post_edit', $user->lang['EDIT_POST']),
 
 		'POSTER_NAME'			=> $poster,
 		'POST_PREVIEW'			=> $message,
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index e09dfb4d09..25fdc0a90a 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -136,9 +136,9 @@ class mcp_queue
 					'U_VIEW_TOPIC'			=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']),
 
 					'RETURN_QUEUE'			=> sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&amp;mode=unapproved_topics' : '&amp;mode=unapproved_posts')) . "&amp;start=$start\">", '</a>'),
-					'REPORTED_IMG'			=> $user->img('icon_reported', $user->lang['POST_REPORTED']),
-					'UNAPPROVED_IMG'		=> $user->img('icon_unapproved', $user->lang['POST_UNAPPROVED']),
-					'EDIT_IMG'				=> $user->img('btn_edit', $user->lang['EDIT_POST']),
+					'REPORTED_IMG'			=> $user->img('icon_topic_reported', $user->lang['POST_REPORTED']),
+					'UNAPPROVED_IMG'		=> $user->img('icon_topic_unapproved', $user->lang['POST_UNAPPROVED']),
+					'EDIT_IMG'				=> $user->img('icon_post_edit', $user->lang['EDIT_POST']),
 
 					'POSTER_NAME'			=> $poster,
 					'POST_PREVIEW'			=> $message,
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 956ac511f3..7f1c0b60fd 100755
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -147,11 +147,11 @@ class mcp_reports
 					'U_VIEW_REPORTER_PROFILE'	=> ($report['user_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $report['user_id']) : '',
 					'U_VIEW_TOPIC'				=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']),
 
-					'EDIT_IMG'				=> $user->img('btn_edit', $user->lang['EDIT_POST']),
-					'UNAPPROVED_IMG'		=> $user->img('icon_unapproved', $user->lang['POST_UNAPPROVED']),
+					'EDIT_IMG'				=> $user->img('icon_post_edit', $user->lang['EDIT_POST']),
+					'UNAPPROVED_IMG'		=> $user->img('icon_topic_unapproved', $user->lang['POST_UNAPPROVED']),
 
 					'RETURN_REPORTS'			=> sprintf($user->lang['RETURN_REPORTS'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports' . (($post_info['post_reported']) ? '&amp;mode=reports' : '&amp;mode=reports_closed') . '&amp;start=' . $start) . '">', '</a>'),
-					'REPORTED_IMG'				=> $user->img('icon_reported', $user->lang['POST_REPORTED']),
+					'REPORTED_IMG'				=> $user->img('icon_topic_reported', $user->lang['POST_REPORTED']),
 					'REPORT_REASON_TITLE'		=> $reason['title'],
 					'REPORT_REASON_DESCRIPTION'	=> $reason['description'],
 					'REPORTER_NAME'				=> ($report['user_id'] == ANONYMOUS) ? $user->lang['GUEST'] : $report['username'],
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index d9d84959c2..b2c3e21170 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -132,7 +132,7 @@ function mcp_topic_view($id, $mode, $action)
 			'POST_ID'		=> $row['post_id'],
 			'RETURN_TOPIC'	=> sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id) . '">', '</a>'),
 
-			'MINI_POST_IMG'		=> ($row['post_time'] > $user->data['user_lastvisit'] && $user->data['is_registered']) ? $user->img('icon_post_new', $user->lang['NEW_POST']) : $user->img('icon_post', $user->lang['POST']),
+			'MINI_POST_IMG'		=> ($row['post_time'] > $user->data['user_lastvisit'] && $user->data['is_registered']) ? $user->img('icon_post_target_unread', $user->lang['NEW_POST']) : $user->img('icon_post_target', $user->lang['POST']),
 
 			'S_POST_REPORTED'	=> ($row['post_reported']) ? true : false,
 			'S_POST_UNAPPROVED'	=> ($row['post_approved']) ? false : true,
@@ -186,8 +186,8 @@ function mcp_topic_view($id, $mode, $action)
 		'POSTS_PER_PAGE'	=> $posts_per_page,
 		'ACTION'			=> $action,
 
-		'REPORTED_IMG'		=> $user->img('icon_reported', 'POST_REPORTED', false, true),
-		'UNAPPROVED_IMG'	=> $user->img('icon_unapproved', 'POST_UNAPPROVED', false, true),
+		'REPORTED_IMG'		=> $user->img('icon_topic_reported', 'POST_REPORTED', false, true),
+		'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true),
 
 		'S_MCP_ACTION'		=> "$url&amp;i=$id&amp;mode=$mode&amp;action=$action&amp;start=$start",
 		'S_FORUM_SELECT'	=> '<select name="to_forum_id">' . (($to_forum_id) ? make_forum_select($to_forum_id) : make_forum_select($topic_info['forum_id'])) . '</select>',
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 5ca9b6fb8f..e0c54cebc5 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -122,11 +122,11 @@ class ucp_main
 						'TOPIC_TITLE'		=> censor_text($row['topic_title']),
 						'TOPIC_TYPE'		=> $topic_type,
 
-						'LAST_POST_IMG'			=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
-						'NEWEST_POST_IMG'		=> $user->img('icon_post_newest', 'VIEW_NEWEST_POST'),
+						'LAST_POST_IMG'			=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
+						'NEWEST_POST_IMG'		=> $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
 						'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 						'TOPIC_FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, false, '', 'src'),
-						'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '',
+						'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', '') : '',
 
 						'S_USER_POSTED'		=> (!empty($row['topic_posted']) && $row['topic_posted']) ? true : false,
 						'S_UNREAD'			=> $unread_topic,
@@ -295,7 +295,7 @@ class ucp_main
 						'FORUM_FOLDER_IMG'		=> $user->img($folder_image, $folder_alt),
 						'FORUM_FOLDER_IMG_SRC'	=> $user->img($folder_image, $folder_alt, false, '', 'src'),
 						'FORUM_NAME'			=> $row['forum_name'],
-						'LAST_POST_IMG'			=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
+						'LAST_POST_IMG'			=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
 						'LAST_POST_TIME'		=> $last_post_time,
 						'LAST_POST_AUTHOR'		=> $last_poster,
 
@@ -425,14 +425,14 @@ class ucp_main
 						'TOPIC_TITLE'		=> censor_text($row['topic_title']),
 						'TOPIC_TYPE'		=> $topic_type,
 
-						'LAST_POST_IMG'			=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
-						'NEWEST_POST_IMG'		=> $user->img('icon_post_newest', 'VIEW_NEWEST_POST'),
+						'LAST_POST_IMG'			=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
+						'NEWEST_POST_IMG'		=> $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
 						'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 						'TOPIC_FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, false, '', 'src'),
 						'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
 						'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
 						'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-						'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+						'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
 
 						'S_TOPIC_TYPE'			=> $row['topic_type'],
 						'S_USER_POSTED'			=> (!empty($row['topic_posted'])) ? true : false,
@@ -584,8 +584,8 @@ class ucp_main
 
 						'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 						'TOPIC_FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, false, '', 'src'),
-						'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '',
-						'LAST_POST_IMG'			=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
+						'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', '') : '',
+						'LAST_POST_IMG'			=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
 
 						'U_LAST_POST'			=> $view_topic_url . '&amp;p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'],
 						'U_LAST_POST_AUTHOR'	=> ($row['topic_last_poster_id'] != ANONYMOUS && $row['topic_last_poster_id']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $row['topic_last_poster_id']) : '',
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 8ba12650c1..27a9735d35 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -787,7 +787,7 @@ function compose_pm($id, $mode, $action)
 		'IMG_STATUS'			=> ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
 		'FLASH_STATUS'			=> ($flash_status) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],
 		'SMILIES_STATUS'		=> ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
-		'MINI_POST_IMG'			=> $user->img('icon_post', $user->lang['PM']),
+		'MINI_POST_IMG'			=> $user->img('icon_post_target', $user->lang['PM']),
 		'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
 
 		'S_EDIT_POST'			=> ($action == 'edit'),
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index f0ca471613..ef245e9d11 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -177,7 +177,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 			{
 				$row = &$folder_info['rowset'][$message_id];
 
-				$folder_img = ($row['pm_unread']) ? 'folder_new' : 'folder';
+				$folder_img = ($row['pm_unread']) ? 'pm_unread' : 'pm_read';
 				$folder_alt = ($row['pm_unread']) ? 'NEW_MESSAGES' : 'NO_NEW_MESSAGES';
 
 				// Generate all URIs ...
@@ -212,7 +212,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 					'FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 					'FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, false, '', 'src'),
 					'PM_IMG'			=> ($row_indicator) ? $user->img('pm_' . $row_indicator, '') : '',
-					'ATTACH_ICON_IMG'	=> ($auth->acl_get('u_pm_download') && $row['message_attachment'] && $config['allow_pm_attach']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+					'ATTACH_ICON_IMG'	=> ($auth->acl_get('u_pm_download') && $row['message_attachment'] && $config['allow_pm_attach']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
 
 					'S_PM_DELETED'		=> ($row['pm_deleted']) ? true : false,
 
@@ -468,7 +468,7 @@ function get_pm_from($folder_id, $folder, $user_id)
 		'PAGE_NUMBER'		=> on_page($pm_count, $config['topics_per_page'], $start),
 		'TOTAL_MESSAGES'	=> (($pm_count == 1) ? $user->lang['VIEW_PM_MESSAGE'] : sprintf($user->lang['VIEW_PM_MESSAGES'], $pm_count)),
 
-		'POST_IMG'		=> (!$auth->acl_get('u_sendpm')) ? $user->img('btn_locked', 'PM_LOCKED') : $user->img('btn_post_pm', 'POST_PM'),
+		'POST_IMG'		=> (!$auth->acl_get('u_sendpm')) ? $user->img('button_topic_locked', 'PM_LOCKED') : $user->img('button_pm_new', 'POST_PM'),
 
 		'L_NO_MESSAGES'	=> (!$auth->acl_get('u_sendpm')) ? $user->lang['POST_PM_LOCKED'] : $user->lang['NO_MESSAGES'],
 
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 3df09a4a0c..a4db5bd3e0 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -172,16 +172,16 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'AUTHOR_POSTS'		=> (!empty($user_info['user_posts'])) ? $user_info['user_posts'] : '',
 		'AUTHOR_FROM'		=> (!empty($user_info['user_from'])) ? $user_info['user_from'] : '',
 
-		'ONLINE_IMG'		=> (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('btn_online', $user->lang['ONLINE']) : $user->img('btn_offline', $user->lang['OFFLINE'])),
+		'ONLINE_IMG'		=> (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])),
 		'S_ONLINE'			=> (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false),
-		'DELETE_IMG'		=> $user->img('btn_delete', $user->lang['DELETE_MESSAGE']),
-		'INFO_IMG'			=> $user->img('btn_info', $user->lang['VIEW_PM_INFO']),
-		'PROFILE_IMG'		=> $user->img('btn_profile', $user->lang['READ_PROFILE']),
-		'EMAIL_IMG'			=> $user->img('btn_email', $user->lang['SEND_EMAIL']),
-		'QUOTE_IMG'			=> $user->img('btn_quote', $user->lang['POST_QUOTE_PM']),
-		'REPLY_IMG'			=> $user->img('btn_reply_pm', $user->lang['POST_REPLY_PM']),
-		'EDIT_IMG'			=> $user->img('btn_edit', $user->lang['POST_EDIT_PM']),
-		'MINI_POST_IMG'		=> $user->img('icon_post', $user->lang['PM']),
+		'DELETE_IMG'		=> $user->img('icon_post_delete', $user->lang['DELETE_MESSAGE']),
+		'INFO_IMG'			=> $user->img('icon_post_info', $user->lang['VIEW_PM_INFO']),
+		'PROFILE_IMG'		=> $user->img('icon_user_profile', $user->lang['READ_PROFILE']),
+		'EMAIL_IMG'			=> $user->img('icon_contact_email', $user->lang['SEND_EMAIL']),
+		'QUOTE_IMG'			=> $user->img('icon_post_quote', $user->lang['POST_QUOTE_PM']),
+		'REPLY_IMG'			=> $user->img('button_pm_reply', $user->lang['POST_REPLY_PM']),
+		'EDIT_IMG'			=> $user->img('icon_post_edit', $user->lang['POST_EDIT_PM']),
+		'MINI_POST_IMG'		=> $user->img('icon_post_target', $user->lang['PM']),
 
 		'SENT_DATE'			=> $user->format_date($message_row['message_time']),
 		'SUBJECT'			=> $message_row['message_subject'],
@@ -355,7 +355,7 @@ function message_history($msg_id, $user_id, $message_row, $folder)
 	}
 
 	$template->assign_vars(array(
-		'QUOTE_IMG'	=> $user->img('btn_quote', $user->lang['REPLY_WITH_QUOTE']),
+		'QUOTE_IMG'	=> $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE']),
 		'TITLE'		=> $title,
 
 		'U_VIEW_NEXT_HISTORY'		=> "$url&amp;p=" . (($next_history_pm) ? $next_history_pm : $msg_id),
diff --git a/phpBB/index.php b/phpBB/index.php
index 5cf918cda2..d1655267e4 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -83,9 +83,10 @@ $template->assign_vars(array(
 	'LEGEND'		=> $legend,
 	'BIRTHDAY_LIST'	=> $birthday_list,
 
-	'FORUM_IMG'			=> $user->img('forum', 'NO_NEW_POSTS'),
-	'FORUM_NEW_IMG'		=> $user->img('forum_new', 'NEW_POSTS'),
-	'FORUM_LOCKED_IMG'	=> $user->img('forum_locked', 'NO_NEW_POSTS_LOCKED'),
+	'FORUM_IMG'			=> $user->img('forum_read', 'NO_NEW_POSTS'),
+	'FORUM_NEW_IMG'		=> $user->img('forum_unread', 'NEW_POSTS'),
+	'FORUM_LOCKED_IMG'	=> $user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'),
+	'FORUM_NEW_LOCKED_IMG'	=> $user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'),
 
 	'S_LOGIN_ACTION'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'),
 	'S_DISPLAY_BIRTHDAY_LIST'	=> ($config['load_birthdays']) ? true : false,
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 6539fee1b3..a75c94295d 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -574,6 +574,12 @@ class module
 			'MESSAGE_TEXT'		=> '<p>' . basename($file) . ' [ ' . $line . ' ]</p><p>SQL : ' . $sql . '</p><p><b>' . $error . '</b></p>',
 		));
 
+		// Rollback if in transaction
+		if ($db->transaction)
+		{
+			$db->sql_transaction('rollback');
+		}
+
 		$this->page_footer();
 	}
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 6e63f38b31..38317bac3f 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1361,7 +1361,7 @@ class install_install extends module
 	
 				$_module->move_module_by($row, 'move_up', 4);
 			}
-	
+
 			// And now for the special ones
 			// (these are modules which appear in multiple categories and thus get added manually to some for more control)
 			if (isset($this->module_extras[$module_class]))
@@ -1871,7 +1871,7 @@ class install_install extends module
 			'COMMENTS'		=> 'remove_comments'
 		),
 		'postgres' => array(
-			'LABEL'			=> 'PostgreSQL 7.x',
+			'LABEL'			=> 'PostgreSQL 7.x/8.x',
 			'SCHEMA'		=> 'postgres',
 			'MODULE'		=> 'pgsql', 
 			'DELIM'			=> ';',
@@ -1881,7 +1881,7 @@ class install_install extends module
 			'LABEL'			=> 'SQLite',
 			'SCHEMA'		=> 'sqlite',
 			'MODULE'		=> 'sqlite', 
-			'DELIM'			=> ';;',
+			'DELIM'			=> ';',
 			'COMMENTS'		=> 'remove_remarks'
 		),
 	);
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index c7b9a2d1b7..74c6c32446 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -4,7 +4,6 @@
 # $Id$
 #
 
-# Function declarations
 
 # Emulation of STRLEN, might need to be checked out for FB 2.0
 DECLARE EXTERNAL FUNCTION STRLEN CSTRING(32767)
@@ -21,7 +20,6 @@ DECLARE EXTERNAL FUNCTION ASCII_CHAR INTEGER
 RETURNS CSTRING(1) FREE_IT
 ENTRY_POINT 'IB_UDF_ascii_char' MODULE_NAME 'ib_udf';;
 
-
 # Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
 	attach_id INTEGER NOT NULL,
@@ -51,13 +49,14 @@ CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments(filesize);;
 CREATE GENERATOR phpbb_attachments_gen;;
 SET GENERATOR phpbb_attachments_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_attachments_gen FOR phpbb_attachments
+CREATE TRIGGER t_phpbb_attachments FOR phpbb_attachments
 BEFORE INSERT
 AS
 BEGIN
 	NEW.attach_id = GEN_ID(phpbb_attachments_gen, 1);
 END;;
 
+
 # Table: 'phpbb_acl_groups'
 CREATE TABLE phpbb_acl_groups (
 	group_id INTEGER DEFAULT 0 NOT NULL,
@@ -68,7 +67,7 @@ CREATE TABLE phpbb_acl_groups (
 );;
 
 CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups(group_id);;
-CREATE INDEX phpbb_acl_groups_auth_option_id ON phpbb_acl_groups(auth_option_id);;
+CREATE INDEX phpbb_acl_groups_auth_opt_id ON phpbb_acl_groups(auth_option_id);;
 
 # Table: 'phpbb_acl_options'
 CREATE TABLE phpbb_acl_options (
@@ -86,7 +85,7 @@ CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options(auth_option);;
 CREATE GENERATOR phpbb_acl_options_gen;;
 SET GENERATOR phpbb_acl_options_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_acl_options_gen FOR phpbb_acl_options
+CREATE TRIGGER t_phpbb_acl_options FOR phpbb_acl_options
 BEFORE INSERT
 AS
 BEGIN
@@ -111,7 +110,7 @@ CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles(role_order);;
 CREATE GENERATOR phpbb_acl_roles_gen;;
 SET GENERATOR phpbb_acl_roles_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_acl_roles_gen FOR phpbb_acl_roles
+CREATE TRIGGER t_phpbb_acl_roles FOR phpbb_acl_roles
 BEFORE INSERT
 AS
 BEGIN
@@ -160,7 +159,7 @@ ALTER TABLE phpbb_banlist ADD PRIMARY KEY (ban_id);;
 CREATE GENERATOR phpbb_banlist_gen;;
 SET GENERATOR phpbb_banlist_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_banlist_gen FOR phpbb_banlist
+CREATE TRIGGER t_phpbb_banlist FOR phpbb_banlist
 BEFORE INSERT
 AS
 BEGIN
@@ -184,7 +183,7 @@ CREATE TABLE phpbb_bbcodes (
 
 ALTER TABLE phpbb_bbcodes ADD PRIMARY KEY (bbcode_id);;
 
-CREATE INDEX phpbb_bbcodes_display_in_post ON phpbb_bbcodes(display_on_posting);;
+CREATE INDEX phpbb_bbcodes_display_on_post ON phpbb_bbcodes(display_on_posting);;
 
 # Table: 'phpbb_bookmarks'
 CREATE TABLE phpbb_bookmarks (
@@ -213,7 +212,7 @@ CREATE INDEX phpbb_bots_bot_active ON phpbb_bots(bot_active);;
 CREATE GENERATOR phpbb_bots_gen;;
 SET GENERATOR phpbb_bots_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_bots_gen FOR phpbb_bots
+CREATE TRIGGER t_phpbb_bots FOR phpbb_bots
 BEFORE INSERT
 AS
 BEGIN
@@ -246,7 +245,7 @@ ALTER TABLE phpbb_confirm ADD PRIMARY KEY (session_id, confirm_id);;
 # Table: 'phpbb_disallow'
 CREATE TABLE phpbb_disallow (
 	disallow_id INTEGER NOT NULL,
-	disallow_username VARCHAR(255) DEFAULT '' NOT NULL
+	disallow_username VARCHAR(252) DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_disallow ADD PRIMARY KEY (disallow_id);;
@@ -255,7 +254,7 @@ ALTER TABLE phpbb_disallow ADD PRIMARY KEY (disallow_id);;
 CREATE GENERATOR phpbb_disallow_gen;;
 SET GENERATOR phpbb_disallow_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_disallow_gen FOR phpbb_disallow
+CREATE TRIGGER t_phpbb_disallow FOR phpbb_disallow
 BEFORE INSERT
 AS
 BEGIN
@@ -281,7 +280,7 @@ CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts(save_time);;
 CREATE GENERATOR phpbb_drafts_gen;;
 SET GENERATOR phpbb_drafts_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_drafts_gen FOR phpbb_drafts
+CREATE TRIGGER t_phpbb_drafts FOR phpbb_drafts
 BEFORE INSERT
 AS
 BEGIN
@@ -302,7 +301,7 @@ ALTER TABLE phpbb_extensions ADD PRIMARY KEY (extension_id);;
 CREATE GENERATOR phpbb_extensions_gen;;
 SET GENERATOR phpbb_extensions_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_extensions_gen FOR phpbb_extensions
+CREATE TRIGGER t_phpbb_extensions FOR phpbb_extensions
 BEFORE INSERT
 AS
 BEGIN
@@ -329,7 +328,7 @@ ALTER TABLE phpbb_extension_groups ADD PRIMARY KEY (group_id);;
 CREATE GENERATOR phpbb_extension_groups_gen;;
 SET GENERATOR phpbb_extension_groups_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_extension_groups_gen FOR phpbb_extension_groups
+CREATE TRIGGER t_phpbb_extension_groups FOR phpbb_extension_groups
 BEFORE INSERT
 AS
 BEGIN
@@ -382,34 +381,18 @@ CREATE TABLE phpbb_forums (
 ALTER TABLE phpbb_forums ADD PRIMARY KEY (forum_id);;
 
 CREATE INDEX phpbb_forums_left_right_id ON phpbb_forums(left_id, right_id);;
-CREATE INDEX phpbb_forums_forum_last_post_id ON phpbb_forums(forum_last_post_id);;
+CREATE INDEX phpbb_forums_forum_lastpost_id ON phpbb_forums(forum_last_post_id);;
 
 CREATE GENERATOR phpbb_forums_gen;;
 SET GENERATOR phpbb_forums_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_forums_gen FOR phpbb_forums
+CREATE TRIGGER t_phpbb_forums FOR phpbb_forums
 BEFORE INSERT
 AS
 BEGIN
 	NEW.forum_id = GEN_ID(phpbb_forums_gen, 1);
 END;;
 
-CREATE TRIGGER t_phpbb_forums_desc_bitf FOR phpbb_forums
-ACTIVE BEFORE INSERT OR UPDATE POSITION 0
-AS
-BEGIN
-	IF (NEW.forum_desc_bitfield is null) THEN
-		NEW.forum_desc_bitfield = ASCII_CHAR(0);
-END;;
-
-CREATE TRIGGER t_phpbb_forums_rules_bitf FOR phpbb_forums
-ACTIVE BEFORE INSERT OR UPDATE POSITION 0
-AS
-BEGIN
-	IF (NEW.forum_rules_bitfield is null) THEN
-		NEW.forum_rules_bitfield = ASCII_CHAR(0);
-END;;
-
 
 # Table: 'phpbb_forums_access'
 CREATE TABLE phpbb_forums_access (
@@ -446,7 +429,7 @@ CREATE INDEX phpbb_forums_watch_notify_stat ON phpbb_forums_watch(notify_status)
 CREATE TABLE phpbb_groups (
 	group_id INTEGER NOT NULL,
 	group_type INTEGER DEFAULT 1 NOT NULL,
-	group_name VARCHAR(255) DEFAULT '' NOT NULL,
+	group_name VARCHAR(252) DEFAULT '' NOT NULL,
 	group_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	group_desc_bitfield CHAR(255) DEFAULT '' NOT NULL,
 	group_desc_options INTEGER DEFAULT 0 NOT NULL,
@@ -471,21 +454,13 @@ CREATE INDEX phpbb_groups_group_legend ON phpbb_groups(group_legend);;
 CREATE GENERATOR phpbb_groups_gen;;
 SET GENERATOR phpbb_groups_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_groups_gen FOR phpbb_groups
+CREATE TRIGGER t_phpbb_groups FOR phpbb_groups
 BEFORE INSERT
 AS
 BEGIN
 	NEW.group_id = GEN_ID(phpbb_groups_gen, 1);
 END;;
 
-CREATE TRIGGER t_phpbb_groups_bitf FOR phpbb_groups
-ACTIVE BEFORE INSERT OR UPDATE POSITION 0
-AS
-BEGIN
-	IF (NEW.group_desc_bitfield is null) THEN
-		NEW.group_desc_bitfield = ASCII_CHAR(0);
-END;;
-
 
 # Table: 'phpbb_icons'
 CREATE TABLE phpbb_icons (
@@ -499,11 +474,12 @@ CREATE TABLE phpbb_icons (
 
 ALTER TABLE phpbb_icons ADD PRIMARY KEY (icons_id);;
 
+CREATE INDEX phpbb_icons_display_on_posting ON phpbb_icons(display_on_posting);;
 
 CREATE GENERATOR phpbb_icons_gen;;
 SET GENERATOR phpbb_icons_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_icons_gen FOR phpbb_icons
+CREATE TRIGGER t_phpbb_icons FOR phpbb_icons
 BEFORE INSERT
 AS
 BEGIN
@@ -528,7 +504,7 @@ CREATE INDEX phpbb_lang_lang_iso ON phpbb_lang(lang_iso);;
 CREATE GENERATOR phpbb_lang_gen;;
 SET GENERATOR phpbb_lang_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_lang_gen FOR phpbb_lang
+CREATE TRIGGER t_phpbb_lang FOR phpbb_lang
 BEFORE INSERT
 AS
 BEGIN
@@ -561,7 +537,7 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log(user_id);;
 CREATE GENERATOR phpbb_log_gen;;
 SET GENERATOR phpbb_log_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_log_gen FOR phpbb_log
+CREATE TRIGGER t_phpbb_log FOR phpbb_log
 BEFORE INSERT
 AS
 BEGIN
@@ -573,13 +549,13 @@ END;;
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
-	username VARCHAR(255) DEFAULT '' NOT NULL,
+	username VARCHAR(252) DEFAULT '' NOT NULL,
 	group_id INTEGER DEFAULT 0 NOT NULL,
 	group_name VARCHAR(255) DEFAULT '' NOT NULL,
 	display_on_index INTEGER DEFAULT 1 NOT NULL
 );;
 
-CREATE INDEX phpbb_moderator_cche_dis_on_idx ON phpbb_moderator_cache(display_on_index);;
+CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache(display_on_index);;
 CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache(forum_id);;
 
 # Table: 'phpbb_modules'
@@ -606,7 +582,7 @@ CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules(module_class, left_id)
 CREATE GENERATOR phpbb_modules_gen;;
 SET GENERATOR phpbb_modules_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_modules_gen FOR phpbb_modules
+CREATE TRIGGER t_phpbb_modules FOR phpbb_modules
 BEFORE INSERT
 AS
 BEGIN
@@ -652,7 +628,7 @@ CREATE TABLE phpbb_posts (
 	enable_smilies INTEGER DEFAULT 1 NOT NULL,
 	enable_magic_url INTEGER DEFAULT 1 NOT NULL,
 	enable_sig INTEGER DEFAULT 1 NOT NULL,
-	post_username VARCHAR(255) DEFAULT '' NOT NULL,
+	post_username VARCHAR(252) DEFAULT '' NOT NULL,
 	post_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	post_text BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	post_checksum VARCHAR(32) DEFAULT '' NOT NULL,
@@ -681,21 +657,13 @@ CREATE INDEX phpbb_posts_post_time ON phpbb_posts(post_time);;
 CREATE GENERATOR phpbb_posts_gen;;
 SET GENERATOR phpbb_posts_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_posts_gen FOR phpbb_posts
+CREATE TRIGGER t_phpbb_posts FOR phpbb_posts
 BEFORE INSERT
 AS
 BEGIN
 	NEW.post_id = GEN_ID(phpbb_posts_gen, 1);
 END;;
 
-CREATE TRIGGER t_phpbb_posts_bitf FOR phpbb_posts
-ACTIVE BEFORE INSERT OR UPDATE POSITION 0
-AS
-BEGIN
-	IF (NEW.bbcode_bitfield is null) THEN
-		NEW.bbcode_bitfield = ASCII_CHAR(0);
-END;;
-
 
 # Table: 'phpbb_privmsgs'
 CREATE TABLE phpbb_privmsgs (
@@ -733,21 +701,13 @@ CREATE INDEX phpbb_privmsgs_root_level ON phpbb_privmsgs(root_level);;
 CREATE GENERATOR phpbb_privmsgs_gen;;
 SET GENERATOR phpbb_privmsgs_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_privmsgs_gen FOR phpbb_privmsgs
+CREATE TRIGGER t_phpbb_privmsgs FOR phpbb_privmsgs
 BEFORE INSERT
 AS
 BEGIN
 	NEW.msg_id = GEN_ID(phpbb_privmsgs_gen, 1);
 END;;
 
-CREATE TRIGGER t_phpbb_privmsgs_bitf FOR phpbb_privmsgs
-ACTIVE BEFORE INSERT OR UPDATE POSITION 0
-AS
-BEGIN
-	IF (NEW.bbcode_bitfield is null) THEN
-		NEW.bbcode_bitfield = ASCII_CHAR(0);
-END;;
-
 
 # Table: 'phpbb_privmsgs_folder'
 CREATE TABLE phpbb_privmsgs_folder (
@@ -764,7 +724,7 @@ CREATE INDEX phpbb_privmsgs_folder_user_id ON phpbb_privmsgs_folder(user_id);;
 CREATE GENERATOR phpbb_privmsgs_folder_gen;;
 SET GENERATOR phpbb_privmsgs_folder_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_privmsgs_folder_gen FOR phpbb_privmsgs_folder
+CREATE TRIGGER t_phpbb_privmsgs_folder FOR phpbb_privmsgs_folder
 BEFORE INSERT
 AS
 BEGIN
@@ -791,7 +751,7 @@ ALTER TABLE phpbb_privmsgs_rules ADD PRIMARY KEY (rule_id);;
 CREATE GENERATOR phpbb_privmsgs_rules_gen;;
 SET GENERATOR phpbb_privmsgs_rules_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_privmsgs_rules_gen FOR phpbb_privmsgs_rules
+CREATE TRIGGER t_phpbb_privmsgs_rules FOR phpbb_privmsgs_rules
 BEFORE INSERT
 AS
 BEGIN
@@ -838,13 +798,13 @@ CREATE TABLE phpbb_profile_fields (
 
 ALTER TABLE phpbb_profile_fields ADD PRIMARY KEY (field_id);;
 
-CREATE INDEX phpbb_profile_fields_field_type ON phpbb_profile_fields(field_type);;
-CREATE INDEX phpbb_profile_fields_field_ordr ON phpbb_profile_fields(field_order);;
+CREATE INDEX phpbb_profile_fields_fld_type ON phpbb_profile_fields(field_type);;
+CREATE INDEX phpbb_profile_fields_fld_ordr ON phpbb_profile_fields(field_order);;
 
 CREATE GENERATOR phpbb_profile_fields_gen;;
 SET GENERATOR phpbb_profile_fields_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_profile_fields_gen FOR phpbb_profile_fields
+CREATE TRIGGER t_phpbb_profile_fields FOR phpbb_profile_fields
 BEFORE INSERT
 AS
 BEGIN
@@ -899,7 +859,7 @@ ALTER TABLE phpbb_ranks ADD PRIMARY KEY (rank_id);;
 CREATE GENERATOR phpbb_ranks_gen;;
 SET GENERATOR phpbb_ranks_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_ranks_gen FOR phpbb_ranks
+CREATE TRIGGER t_phpbb_ranks FOR phpbb_ranks
 BEFORE INSERT
 AS
 BEGIN
@@ -925,7 +885,7 @@ ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
 CREATE GENERATOR phpbb_reports_gen;;
 SET GENERATOR phpbb_reports_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_reports_gen FOR phpbb_reports
+CREATE TRIGGER t_phpbb_reports FOR phpbb_reports
 BEFORE INSERT
 AS
 BEGIN
@@ -947,7 +907,7 @@ ALTER TABLE phpbb_reports_reasons ADD PRIMARY KEY (reason_id);;
 CREATE GENERATOR phpbb_reports_reasons_gen;;
 SET GENERATOR phpbb_reports_reasons_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_reports_reasons_gen FOR phpbb_reports_reasons
+CREATE TRIGGER t_phpbb_reports_reasons FOR phpbb_reports_reasons
 BEFORE INSERT
 AS
 BEGIN
@@ -968,19 +928,19 @@ ALTER TABLE phpbb_search_results ADD PRIMARY KEY (search_key);;
 
 # Table: 'phpbb_search_wordlist'
 CREATE TABLE phpbb_search_wordlist (
-	word_text VARCHAR(252) DEFAULT '' NOT NULL,
 	word_id INTEGER NOT NULL,
+	word_text VARCHAR(252) DEFAULT '' NOT NULL,
 	word_common INTEGER DEFAULT 0 NOT NULL
 );;
 
-ALTER TABLE phpbb_search_wordlist ADD PRIMARY KEY (word_text);;
+ALTER TABLE phpbb_search_wordlist ADD PRIMARY KEY (word_id);;
 
-CREATE INDEX phpbb_search_wordlist_word_id ON phpbb_search_wordlist(word_id);;
+CREATE UNIQUE INDEX phpbb_search_wordlist_wrd_txt ON phpbb_search_wordlist(word_text);;
 
 CREATE GENERATOR phpbb_search_wordlist_gen;;
 SET GENERATOR phpbb_search_wordlist_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_search_wordlist_gen FOR phpbb_search_wordlist
+CREATE TRIGGER t_phpbb_search_wordlist FOR phpbb_search_wordlist
 BEFORE INSERT
 AS
 BEGIN
@@ -1043,7 +1003,7 @@ ALTER TABLE phpbb_sitelist ADD PRIMARY KEY (site_id);;
 CREATE GENERATOR phpbb_sitelist_gen;;
 SET GENERATOR phpbb_sitelist_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_sitelist_gen FOR phpbb_sitelist
+CREATE TRIGGER t_phpbb_sitelist FOR phpbb_sitelist
 BEFORE INSERT
 AS
 BEGIN
@@ -1065,12 +1025,12 @@ CREATE TABLE phpbb_smilies (
 
 ALTER TABLE phpbb_smilies ADD PRIMARY KEY (smiley_id);;
 
-CREATE INDEX phpbb_smilies_display_on_postng ON phpbb_smilies(display_on_posting);;
+CREATE INDEX phpbb_smilies_display_on_post ON phpbb_smilies(display_on_posting);;
 
 CREATE GENERATOR phpbb_smilies_gen;;
 SET GENERATOR phpbb_smilies_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_smilies_gen FOR phpbb_smilies
+CREATE TRIGGER t_phpbb_smilies FOR phpbb_smilies
 BEFORE INSERT
 AS
 BEGIN
@@ -1099,7 +1059,7 @@ CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles(imageset_id);;
 CREATE GENERATOR phpbb_styles_gen;;
 SET GENERATOR phpbb_styles_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_styles_gen FOR phpbb_styles
+CREATE TRIGGER t_phpbb_styles FOR phpbb_styles
 BEFORE INSERT
 AS
 BEGIN
@@ -1124,21 +1084,13 @@ CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template(tem
 CREATE GENERATOR phpbb_styles_template_gen;;
 SET GENERATOR phpbb_styles_template_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_styles_template_gen FOR phpbb_styles_template
+CREATE TRIGGER t_phpbb_styles_template FOR phpbb_styles_template
 BEFORE INSERT
 AS
 BEGIN
 	NEW.template_id = GEN_ID(phpbb_styles_template_gen, 1);
 END;;
 
-CREATE TRIGGER t_phpbb_styles_template_bitf FOR phpbb_styles_template
-ACTIVE BEFORE INSERT OR UPDATE POSITION 0
-AS
-BEGIN
-	IF (NEW.bbcode_bitfield is null) THEN
-		NEW.bbcode_bitfield = ASCII_CHAR(144) || ASCII_CHAR(216);
-END;;
-
 
 # Table: 'phpbb_styles_template_data'
 CREATE TABLE phpbb_styles_template_data (
@@ -1149,13 +1101,13 @@ CREATE TABLE phpbb_styles_template_data (
 	template_data BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL
 );;
 
-CREATE INDEX phpbb_styles_tmplte_dt_tmplt_id ON phpbb_styles_template_data(template_id);;
-CREATE INDEX phpbb_styles_tmplte_d_tmpl_flnm ON phpbb_styles_template_data(template_filename);;
+CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data(template_id);;
+CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data(template_filename);;
 
 CREATE GENERATOR phpbb_styles_template_data_gen;;
 SET GENERATOR phpbb_styles_template_data_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_styles_templte_data_gen FOR phpbb_styles_template_data
+CREATE TRIGGER t_phpbb_styles_template_data FOR phpbb_styles_template_data
 BEFORE INSERT
 AS
 BEGIN
@@ -1181,7 +1133,7 @@ CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme(theme_na
 CREATE GENERATOR phpbb_styles_theme_gen;;
 SET GENERATOR phpbb_styles_theme_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_styles_theme_gen FOR phpbb_styles_theme
+CREATE TRIGGER t_phpbb_styles_theme FOR phpbb_styles_theme
 BEFORE INSERT
 AS
 BEGIN
@@ -1196,85 +1148,89 @@ CREATE TABLE phpbb_styles_imageset (
 	imageset_copyright VARCHAR(255) DEFAULT '' NOT NULL,
 	imageset_path VARCHAR(100) DEFAULT '' NOT NULL,
 	site_logo VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_post VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_post_pm VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_reply VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_reply_pm VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_locked VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_profile VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_pm VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_delete VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_info VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_quote VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_search VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_edit VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_report VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_warn VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_email VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_www VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_icq VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_aim VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_yim VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_msnm VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_jabber VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_online VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_offline VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_friend VARCHAR(200) DEFAULT '' NOT NULL,
-	btn_foe VARCHAR(200) DEFAULT '' NOT NULL,
-	icon_unapproved VARCHAR(200) DEFAULT '' NOT NULL,
-	icon_reported VARCHAR(200) DEFAULT '' NOT NULL,
-	icon_attach VARCHAR(200) DEFAULT '' NOT NULL,
-	icon_post VARCHAR(200) DEFAULT '' NOT NULL,
-	icon_post_new VARCHAR(200) DEFAULT '' NOT NULL,
-	icon_post_latest VARCHAR(200) DEFAULT '' NOT NULL,
-	icon_post_newest VARCHAR(200) DEFAULT '' NOT NULL,
-	forum VARCHAR(200) DEFAULT '' NOT NULL,
-	forum_new VARCHAR(200) DEFAULT '' NOT NULL,
-	forum_locked VARCHAR(200) DEFAULT '' NOT NULL,
-	forum_link VARCHAR(200) DEFAULT '' NOT NULL,
-	sub_forum VARCHAR(200) DEFAULT '' NOT NULL,
-	sub_forum_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_moved VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_new_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_hot VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_hot_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_hot_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_hot_new_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_new_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_announce VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_new_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_global VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_global_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_global_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_global_new_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_new_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_sticky VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_sticky_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_sticky_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_sticky_new_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_announce VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_announce_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_announce_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_announce_new_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_global VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_global_post VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_global_new VARCHAR(200) DEFAULT '' NOT NULL,
-	folder_global_new_post VARCHAR(200) DEFAULT '' NOT NULL,
+	upload_bar VARCHAR(200) DEFAULT '' NOT NULL,
 	poll_left VARCHAR(200) DEFAULT '' NOT NULL,
 	poll_center VARCHAR(200) DEFAULT '' NOT NULL,
 	poll_right VARCHAR(200) DEFAULT '' NOT NULL,
-	attach_progress_bar VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_friend VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_foe VARCHAR(200) DEFAULT '' NOT NULL,
+	forum_link VARCHAR(200) DEFAULT '' NOT NULL,
+	forum_read VARCHAR(200) DEFAULT '' NOT NULL,
+	forum_read_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	forum_read_subforum VARCHAR(200) DEFAULT '' NOT NULL,
+	forum_unread VARCHAR(200) DEFAULT '' NOT NULL,
+	forum_unread_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	forum_unread_subforum VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_moved VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_read VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_read_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_read_hot VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_read_hot_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_read_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_read_locked_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_unread VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_unread_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_unread_hot VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_unread_hot_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_unread_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	topic_unread_locked_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	sticky_read VARCHAR(200) DEFAULT '' NOT NULL,
+	sticky_read_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	sticky_read_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	sticky_read_locked_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	sticky_unread VARCHAR(200) DEFAULT '' NOT NULL,
+	sticky_unread_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	sticky_unread_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	sticky_unread_locked_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	announce_read VARCHAR(200) DEFAULT '' NOT NULL,
+	announce_read_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	announce_read_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	announce_read_locked_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	announce_unread VARCHAR(200) DEFAULT '' NOT NULL,
+	announce_unread_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	announce_unread_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	announce_unread_locked_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	global_read VARCHAR(200) DEFAULT '' NOT NULL,
+	global_read_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	global_read_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	global_read_locked_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	global_unread VARCHAR(200) DEFAULT '' NOT NULL,
+	global_unread_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	global_unread_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	global_unread_locked_mine VARCHAR(200) DEFAULT '' NOT NULL,
+	pm_read VARCHAR(200) DEFAULT '' NOT NULL,
+	pm_unread VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_contact_aim VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_contact_email VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_contact_icq VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_contact_jabber VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_contact_msnm VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_contact_pm VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_contact_yahoo VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_contact_www VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_post_delete VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_post_edit VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_post_info VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_post_quote VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_post_report VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_post_target VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_post_target_unread VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_topic_attach VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_topic_latest VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_topic_newest VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_topic_reported VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_topic_unapproved VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_user_online VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_user_offline VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_user_profile VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_user_search VARCHAR(200) DEFAULT '' NOT NULL,
+	icon_user_warn VARCHAR(200) DEFAULT '' NOT NULL,
+	button_pm_forward VARCHAR(200) DEFAULT '' NOT NULL,
+	button_pm_new VARCHAR(200) DEFAULT '' NOT NULL,
+	button_pm_reply VARCHAR(200) DEFAULT '' NOT NULL,
+	button_topic_locked VARCHAR(200) DEFAULT '' NOT NULL,
+	button_topic_new VARCHAR(200) DEFAULT '' NOT NULL,
+	button_topic_reply VARCHAR(200) DEFAULT '' NOT NULL,
 	user_icon1 VARCHAR(200) DEFAULT '' NOT NULL,
 	user_icon2 VARCHAR(200) DEFAULT '' NOT NULL,
 	user_icon3 VARCHAR(200) DEFAULT '' NOT NULL,
@@ -1291,14 +1247,14 @@ ALTER TABLE phpbb_styles_imageset ADD PRIMARY KEY (imageset_id);;
 
 CREATE UNIQUE INDEX phpbb_styles_imageset_imgset_nm ON phpbb_styles_imageset(imageset_name);;
 
-CREATE GENERATOR t_phpbb_styles_imageset_gen;;
-SET GENERATOR t_phpbb_styles_imageset_gen TO 0;;
+CREATE GENERATOR phpbb_styles_imageset_gen;;
+SET GENERATOR phpbb_styles_imageset_gen TO 0;;
 
-CREATE TRIGGER phpbb_styles_imageset_imgset_nm FOR phpbb_styles_imageset
+CREATE TRIGGER t_phpbb_styles_imageset FOR phpbb_styles_imageset
 BEFORE INSERT
 AS
 BEGIN
-	NEW.imageset_id = GEN_ID(t_phpbb_styles_imageset_gen, 1);
+	NEW.imageset_id = GEN_ID(phpbb_styles_imageset_gen, 1);
 END;;
 
 
@@ -1341,12 +1297,12 @@ ALTER TABLE phpbb_topics ADD PRIMARY KEY (topic_id);;
 
 CREATE INDEX phpbb_topics_forum_id ON phpbb_topics(forum_id);;
 CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics(forum_id, topic_type);;
-CREATE INDEX phpbb_topics_topic_last_pst_tme ON phpbb_topics(topic_last_post_time);;
+CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics(topic_last_post_time);;
 
 CREATE GENERATOR phpbb_topics_gen;;
 SET GENERATOR phpbb_topics_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_topics_gen FOR phpbb_topics
+CREATE TRIGGER t_phpbb_topics FOR phpbb_topics
 BEFORE INSERT
 AS
 BEGIN
@@ -1482,21 +1438,13 @@ CREATE INDEX phpbb_users_username ON phpbb_users(username);;
 CREATE GENERATOR phpbb_users_gen;;
 SET GENERATOR phpbb_users_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_users_gen FOR phpbb_users
+CREATE TRIGGER t_phpbb_users FOR phpbb_users
 BEFORE INSERT
 AS
 BEGIN
 	NEW.user_id = GEN_ID(phpbb_users_gen, 1);
 END;;
 
-CREATE TRIGGER t_phpbb_users_bitf FOR phpbb_users
-ACTIVE BEFORE INSERT OR UPDATE POSITION 0
-AS
-BEGIN
-	IF (NEW.user_sig_bbcode_bitfield is null) THEN
-		NEW.user_sig_bbcode_bitfield = ASCII_CHAR(0);
-END;;
-
 
 # Table: 'phpbb_warnings'
 CREATE TABLE phpbb_warnings (
@@ -1513,7 +1461,7 @@ ALTER TABLE phpbb_warnings ADD PRIMARY KEY (warning_id);;
 CREATE GENERATOR phpbb_warnings_gen;;
 SET GENERATOR phpbb_warnings_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_warnings_gen FOR phpbb_warnings
+CREATE TRIGGER t_phpbb_warnings FOR phpbb_warnings
 BEFORE INSERT
 AS
 BEGIN
@@ -1534,7 +1482,7 @@ ALTER TABLE phpbb_words ADD PRIMARY KEY (word_id);;
 CREATE GENERATOR phpbb_words_gen;;
 SET GENERATOR phpbb_words_gen TO 0;;
 
-CREATE TRIGGER t_phpbb_words_gen FOR phpbb_words
+CREATE TRIGGER t_phpbb_words FOR phpbb_words
 BEFORE INSERT
 AS
 BEGIN
@@ -1551,4 +1499,66 @@ CREATE TABLE phpbb_zebra (
 );;
 
 CREATE INDEX phpbb_zebra_user_id ON phpbb_zebra(user_id);;
-CREATE INDEX phpbb_zebra_zebra_id ON phpbb_zebra(zebra_id);;
-\ No newline at end of file
+CREATE INDEX phpbb_zebra_zebra_id ON phpbb_zebra(zebra_id);;
+
+# Trigger for phpbb_forums bitfields
+CREATE TRIGGER t_phpbb_forums_desc_bitf FOR phpbb_forums
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.forum_desc_bitfield is null) THEN
+		NEW.forum_desc_bitfield = ASCII_CHAR(0);
+END;;
+
+CREATE TRIGGER t_phpbb_forums_rules_bitf FOR phpbb_forums
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.forum_rules_bitfield is null) THEN
+		NEW.forum_rules_bitfield = ASCII_CHAR(0);
+END;;
+
+# Trigger for phpbb_groups bitfields
+CREATE TRIGGER t_phpbb_groups_bitf FOR phpbb_groups
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.group_desc_bitfield is null) THEN
+		NEW.group_desc_bitfield = ASCII_CHAR(0);
+END;;
+
+# Trigger for phpbb_posts bitfields
+CREATE TRIGGER t_phpbb_posts_bitf FOR phpbb_posts
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.bbcode_bitfield is null) THEN
+		NEW.bbcode_bitfield = ASCII_CHAR(0);
+END;;
+
+# Trigger for phpbb_privmsgs bitfields
+CREATE TRIGGER t_phpbb_privmsgs_bitf FOR phpbb_privmsgs
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.bbcode_bitfield is null) THEN
+		NEW.bbcode_bitfield = ASCII_CHAR(0);
+END;;
+
+# Trigger for phpbb_styles_template bitfields
+CREATE TRIGGER t_phpbb_styles_template_bitf FOR phpbb_styles_template
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.bbcode_bitfield is null) THEN
+		NEW.bbcode_bitfield = ASCII_CHAR(144) || ASCII_CHAR(216);
+END;;
+
+# Trigger for phpbb_users bitfields
+CREATE TRIGGER t_phpbb_users_bitf FOR phpbb_users
+ACTIVE BEFORE INSERT OR UPDATE POSITION 0
+AS
+BEGIN
+	IF (NEW.user_sig_bbcode_bitfield is null) THEN
+		NEW.user_sig_bbcode_bitfield = ASCII_CHAR(0);
+END;;
+\ No newline at end of file
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 241fdc3be8..d8c0e2f598 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -8,7 +8,9 @@
 BEGIN TRANSACTION
 GO
 
-/* Table: 'phpbb_attachments' */
+/*
+	Table: 'phpbb_attachments'
+*/
 CREATE TABLE [phpbb_attachments] (
 	[attach_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[post_msg_id] [int] DEFAULT (0) NOT NULL ,
@@ -50,7 +52,9 @@ CREATE  INDEX [filesize] ON [phpbb_attachments]([filesize]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_acl_groups' */
+/*
+	Table: 'phpbb_acl_groups'
+*/
 CREATE TABLE [phpbb_acl_groups] (
 	[group_id] [int] DEFAULT (0) NOT NULL ,
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
@@ -63,11 +67,13 @@ GO
 CREATE  INDEX [group_id] ON [phpbb_acl_groups]([group_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [auth_option_id] ON [phpbb_acl_groups]([auth_option_id]) ON [PRIMARY]
+CREATE  INDEX [auth_opt_id] ON [phpbb_acl_groups]([auth_option_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_acl_options' */
+/*
+	Table: 'phpbb_acl_options'
+*/
 CREATE TABLE [phpbb_acl_options] (
 	[auth_option_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[auth_option] [varchar] (50) DEFAULT ('') NOT NULL ,
@@ -88,7 +94,9 @@ CREATE  INDEX [auth_option] ON [phpbb_acl_options]([auth_option]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_acl_roles' */
+/*
+	Table: 'phpbb_acl_roles'
+*/
 CREATE TABLE [phpbb_acl_roles] (
 	[role_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[role_name] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -112,7 +120,9 @@ CREATE  INDEX [role_order] ON [phpbb_acl_roles]([role_order]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_acl_roles_data' */
+/*
+	Table: 'phpbb_acl_roles_data'
+*/
 CREATE TABLE [phpbb_acl_roles_data] (
 	[role_id] [int] DEFAULT (0) NOT NULL ,
 	[auth_option_id] [int] DEFAULT (0) NOT NULL ,
@@ -129,7 +139,9 @@ ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_acl_users' */
+/*
+	Table: 'phpbb_acl_users'
+*/
 CREATE TABLE [phpbb_acl_users] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
@@ -146,7 +158,9 @@ CREATE  INDEX [auth_option_id] ON [phpbb_acl_users]([auth_option_id]) ON [PRIMAR
 GO
 
 
-/* Table: 'phpbb_banlist' */
+/*
+	Table: 'phpbb_banlist'
+*/
 CREATE TABLE [phpbb_banlist] (
 	[ban_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[ban_userid] [int] DEFAULT (0) NOT NULL ,
@@ -168,11 +182,13 @@ ALTER TABLE [phpbb_banlist] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_bbcodes' */
+/*
+	Table: 'phpbb_bbcodes'
+*/
 CREATE TABLE [phpbb_bbcodes] (
 	[bbcode_id] [int] DEFAULT (0) NOT NULL ,
 	[bbcode_tag] [varchar] (16) DEFAULT ('') NOT NULL ,
-	[bbcode_helpline] [varchar] (255) DEFAULT ('') NOT NULL,
+	[bbcode_helpline] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[display_on_posting] [int] DEFAULT (0) NOT NULL ,
 	[bbcode_match] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[bbcode_tpl] [text] DEFAULT ('') NOT NULL ,
@@ -190,11 +206,13 @@ ALTER TABLE [phpbb_bbcodes] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [display_in_posting] ON [phpbb_bbcodes]([display_on_posting]) ON [PRIMARY]
+CREATE  INDEX [display_on_post] ON [phpbb_bbcodes]([display_on_posting]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_bookmarks' */
+/*
+	Table: 'phpbb_bookmarks'
+*/
 CREATE TABLE [phpbb_bookmarks] (
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -209,7 +227,9 @@ CREATE  INDEX [topic_user_id] ON [phpbb_bookmarks]([topic_id], [user_id]) ON [PR
 GO
 
 
-/* Table: 'phpbb_bots' */
+/*
+	Table: 'phpbb_bots'
+*/
 CREATE TABLE [phpbb_bots] (
 	[bot_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[bot_active] [int] DEFAULT (1) NOT NULL ,
@@ -231,9 +251,11 @@ CREATE  INDEX [bot_active] ON [phpbb_bots]([bot_active]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_config' */
+/*
+	Table: 'phpbb_config'
+*/
 CREATE TABLE [phpbb_config] (
-	[config_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[config_name] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[config_value] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[is_dynamic] [int] DEFAULT (0) NOT NULL 
 ) ON [PRIMARY]
@@ -250,7 +272,9 @@ CREATE  INDEX [is_dynamic] ON [phpbb_config]([is_dynamic]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_confirm' */
+/*
+	Table: 'phpbb_confirm'
+*/
 CREATE TABLE [phpbb_confirm] (
 	[confirm_id] [char] (32) DEFAULT ('') NOT NULL ,
 	[session_id] [char] (32) DEFAULT ('') NOT NULL ,
@@ -268,10 +292,12 @@ ALTER TABLE [phpbb_confirm] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_disallow' */
+/*
+	Table: 'phpbb_disallow'
+*/
 CREATE TABLE [phpbb_disallow] (
 	[disallow_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[disallow_username] [varchar] (255) DEFAULT ('') NOT NULL 
+	[disallow_username] [varchar] (252) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
 
@@ -283,7 +309,9 @@ ALTER TABLE [phpbb_disallow] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_drafts' */
+/*
+	Table: 'phpbb_drafts'
+*/
 CREATE TABLE [phpbb_drafts] (
 	[draft_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -306,7 +334,9 @@ CREATE  INDEX [save_time] ON [phpbb_drafts]([save_time]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_extensions' */
+/*
+	Table: 'phpbb_extensions'
+*/
 CREATE TABLE [phpbb_extensions] (
 	[extension_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[group_id] [int] DEFAULT (0) NOT NULL ,
@@ -322,7 +352,9 @@ ALTER TABLE [phpbb_extensions] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_extension_groups' */
+/*
+	Table: 'phpbb_extension_groups'
+*/
 CREATE TABLE [phpbb_extension_groups] (
 	[group_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[group_name] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -344,7 +376,9 @@ ALTER TABLE [phpbb_extension_groups] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_forums' */
+/*
+	Table: 'phpbb_forums'
+*/
 CREATE TABLE [phpbb_forums] (
 	[forum_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[parent_id] [int] DEFAULT (0) NOT NULL ,
@@ -397,11 +431,13 @@ GO
 CREATE  INDEX [left_right_id] ON [phpbb_forums]([left_id], [right_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [forum_last_post_id] ON [phpbb_forums]([forum_last_post_id]) ON [PRIMARY]
+CREATE  INDEX [forum_lastpost_id] ON [phpbb_forums]([forum_last_post_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_forums_access' */
+/*
+	Table: 'phpbb_forums_access'
+*/
 CREATE TABLE [phpbb_forums_access] (
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -419,7 +455,9 @@ ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_forums_track' */
+/*
+	Table: 'phpbb_forums_track'
+*/
 CREATE TABLE [phpbb_forums_track] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
@@ -436,7 +474,9 @@ ALTER TABLE [phpbb_forums_track] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_forums_watch' */
+/*
+	Table: 'phpbb_forums_watch'
+*/
 CREATE TABLE [phpbb_forums_watch] (
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -450,15 +490,17 @@ GO
 CREATE  INDEX [user_id] ON [phpbb_forums_watch]([user_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [notify_status] ON [phpbb_forums_watch]([notify_status]) ON [PRIMARY]
+CREATE  INDEX [notify_stat] ON [phpbb_forums_watch]([notify_status]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_groups' */
+/*
+	Table: 'phpbb_groups'
+*/
 CREATE TABLE [phpbb_groups] (
 	[group_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[group_type] [int] DEFAULT (1) NOT NULL ,
-	[group_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[group_name] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[group_desc] [varchar] (8000) DEFAULT ('') NOT NULL ,
 	[group_desc_bitfield] [varbinary] (255) DEFAULT (0x) NOT NULL ,
 	[group_desc_options] [int] DEFAULT (0) NOT NULL ,
@@ -488,7 +530,9 @@ CREATE  INDEX [group_legend] ON [phpbb_groups]([group_legend]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_icons' */
+/*
+	Table: 'phpbb_icons'
+*/
 CREATE TABLE [phpbb_icons] (
 	[icons_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[icons_url] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -506,8 +550,13 @@ ALTER TABLE [phpbb_icons] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
+CREATE  INDEX [display_on_posting] ON [phpbb_icons]([display_on_posting]) ON [PRIMARY]
+GO
+
 
-/* Table: 'phpbb_lang' */
+/*
+	Table: 'phpbb_lang'
+*/
 CREATE TABLE [phpbb_lang] (
 	[lang_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[lang_iso] [varchar] (30) DEFAULT ('') NOT NULL ,
@@ -529,7 +578,9 @@ CREATE  INDEX [lang_iso] ON [phpbb_lang]([lang_iso]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_log' */
+/*
+	Table: 'phpbb_log'
+*/
 CREATE TABLE [phpbb_log] (
 	[log_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[log_type] [int] DEFAULT (0) NOT NULL ,
@@ -567,25 +618,29 @@ CREATE  INDEX [user_id] ON [phpbb_log]([user_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_moderator_cache' */
+/*
+	Table: 'phpbb_moderator_cache'
+*/
 CREATE TABLE [phpbb_moderator_cache] (
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
-	[username] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[username] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[group_id] [int] DEFAULT (0) NOT NULL ,
 	[group_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[display_on_index] [int] DEFAULT (1) NOT NULL 
 ) ON [PRIMARY]
 GO
 
-CREATE  INDEX [display_on_index] ON [phpbb_moderator_cache]([display_on_index]) ON [PRIMARY]
+CREATE  INDEX [disp_idx] ON [phpbb_moderator_cache]([display_on_index]) ON [PRIMARY]
 GO
 
 CREATE  INDEX [forum_id] ON [phpbb_moderator_cache]([forum_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_modules' */
+/*
+	Table: 'phpbb_modules'
+*/
 CREATE TABLE [phpbb_modules] (
 	[module_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[module_enabled] [int] DEFAULT (1) NOT NULL ,
@@ -618,7 +673,9 @@ CREATE  INDEX [class_left_id] ON [phpbb_modules]([module_class], [left_id]) ON [
 GO
 
 
-/* Table: 'phpbb_poll_options' */
+/*
+	Table: 'phpbb_poll_options'
+*/
 CREATE TABLE [phpbb_poll_options] (
 	[poll_option_id] [int] DEFAULT (0) NOT NULL ,
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
@@ -627,14 +684,16 @@ CREATE TABLE [phpbb_poll_options] (
 ) ON [PRIMARY]
 GO
 
-CREATE  INDEX [poll_option_id] ON [phpbb_poll_options]([poll_option_id]) ON [PRIMARY]
+CREATE  INDEX [poll_opt_id] ON [phpbb_poll_options]([poll_option_id]) ON [PRIMARY]
 GO
 
 CREATE  INDEX [topic_id] ON [phpbb_poll_options]([topic_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_poll_votes' */
+/*
+	Table: 'phpbb_poll_votes'
+*/
 CREATE TABLE [phpbb_poll_votes] (
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
 	[poll_option_id] [int] DEFAULT (0) NOT NULL ,
@@ -653,7 +712,9 @@ CREATE  INDEX [vote_user_ip] ON [phpbb_poll_votes]([vote_user_ip]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_posts' */
+/*
+	Table: 'phpbb_posts'
+*/
 CREATE TABLE [phpbb_posts] (
 	[post_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
@@ -668,7 +729,7 @@ CREATE TABLE [phpbb_posts] (
 	[enable_smilies] [int] DEFAULT (1) NOT NULL ,
 	[enable_magic_url] [int] DEFAULT (1) NOT NULL ,
 	[enable_sig] [int] DEFAULT (1) NOT NULL ,
-	[post_username] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[post_username] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[post_subject] [varchar] (1000) DEFAULT ('') NOT NULL ,
 	[post_text] [text] DEFAULT ('') NOT NULL ,
 	[post_checksum] [varchar] (32) DEFAULT ('') NOT NULL ,
@@ -714,7 +775,9 @@ CREATE  INDEX [post_time] ON [phpbb_posts]([post_time]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_privmsgs' */
+/*
+	Table: 'phpbb_privmsgs'
+*/
 CREATE TABLE [phpbb_privmsgs] (
 	[msg_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[root_level] [int] DEFAULT (0) NOT NULL ,
@@ -761,7 +824,9 @@ CREATE  INDEX [root_level] ON [phpbb_privmsgs]([root_level]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_privmsgs_folder' */
+/*
+	Table: 'phpbb_privmsgs_folder'
+*/
 CREATE TABLE [phpbb_privmsgs_folder] (
 	[folder_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -781,7 +846,9 @@ CREATE  INDEX [user_id] ON [phpbb_privmsgs_folder]([user_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_privmsgs_rules' */
+/*
+	Table: 'phpbb_privmsgs_rules'
+*/
 CREATE TABLE [phpbb_privmsgs_rules] (
 	[rule_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -803,7 +870,9 @@ ALTER TABLE [phpbb_privmsgs_rules] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_privmsgs_to' */
+/*
+	Table: 'phpbb_privmsgs_to'
+*/
 CREATE TABLE [phpbb_privmsgs_to] (
 	[msg_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -821,11 +890,13 @@ GO
 CREATE  INDEX [msg_id] ON [phpbb_privmsgs_to]([msg_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [user_folder_id] ON [phpbb_privmsgs_to]([user_id], [folder_id]) ON [PRIMARY]
+CREATE  INDEX [usr_flder_id] ON [phpbb_privmsgs_to]([user_id], [folder_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_profile_fields' */
+/*
+	Table: 'phpbb_profile_fields'
+*/
 CREATE TABLE [phpbb_profile_fields] (
 	[field_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[field_name] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -853,14 +924,16 @@ ALTER TABLE [phpbb_profile_fields] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [field_type] ON [phpbb_profile_fields]([field_type]) ON [PRIMARY]
+CREATE  INDEX [fld_type] ON [phpbb_profile_fields]([field_type]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [field_order] ON [phpbb_profile_fields]([field_order]) ON [PRIMARY]
+CREATE  INDEX [fld_ordr] ON [phpbb_profile_fields]([field_order]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_profile_fields_data' */
+/*
+	Table: 'phpbb_profile_fields_data'
+*/
 CREATE TABLE [phpbb_profile_fields_data] (
 	[user_id] [int] DEFAULT (0) NOT NULL 
 ) ON [PRIMARY]
@@ -874,7 +947,9 @@ ALTER TABLE [phpbb_profile_fields_data] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_profile_fields_lang' */
+/*
+	Table: 'phpbb_profile_fields_lang'
+*/
 CREATE TABLE [phpbb_profile_fields_lang] (
 	[field_id] [int] DEFAULT (0) NOT NULL ,
 	[lang_id] [int] DEFAULT (0) NOT NULL ,
@@ -894,7 +969,9 @@ ALTER TABLE [phpbb_profile_fields_lang] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_profile_lang' */
+/*
+	Table: 'phpbb_profile_lang'
+*/
 CREATE TABLE [phpbb_profile_lang] (
 	[field_id] [int] DEFAULT (0) NOT NULL ,
 	[lang_id] [int] DEFAULT (0) NOT NULL ,
@@ -913,7 +990,9 @@ ALTER TABLE [phpbb_profile_lang] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_ranks' */
+/*
+	Table: 'phpbb_ranks'
+*/
 CREATE TABLE [phpbb_ranks] (
 	[rank_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[rank_title] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -931,7 +1010,9 @@ ALTER TABLE [phpbb_ranks] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_reports' */
+/*
+	Table: 'phpbb_reports'
+*/
 CREATE TABLE [phpbb_reports] (
 	[report_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[reason_id] [int] DEFAULT (0) NOT NULL ,
@@ -952,7 +1033,9 @@ ALTER TABLE [phpbb_reports] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_reports_reasons' */
+/*
+	Table: 'phpbb_reports_reasons'
+*/
 CREATE TABLE [phpbb_reports_reasons] (
 	[reason_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[reason_title] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -969,7 +1052,9 @@ ALTER TABLE [phpbb_reports_reasons] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_search_results' */
+/*
+	Table: 'phpbb_search_results'
+*/
 CREATE TABLE [phpbb_search_results] (
 	[search_key] [varchar] (32) DEFAULT ('') NOT NULL ,
 	[search_time] [int] DEFAULT (0) NOT NULL ,
@@ -986,10 +1071,12 @@ ALTER TABLE [phpbb_search_results] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_search_wordlist' */
+/*
+	Table: 'phpbb_search_wordlist'
+*/
 CREATE TABLE [phpbb_search_wordlist] (
-	[word_text] [nvarchar] (252) DEFAULT ('') NOT NULL ,
 	[word_id] [int] IDENTITY (1, 1) NOT NULL ,
+	[word_text] [nvarchar] (252) DEFAULT ('') NOT NULL ,
 	[word_common] [int] DEFAULT (0) NOT NULL 
 ) ON [PRIMARY]
 GO
@@ -997,15 +1084,17 @@ GO
 ALTER TABLE [phpbb_search_wordlist] WITH NOCHECK ADD 
 	CONSTRAINT [PK_phpbb_search_wordlist] PRIMARY KEY  CLUSTERED 
 	(
-		[word_text]
+		[word_id]
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [word_id] ON [phpbb_search_wordlist]([word_id]) ON [PRIMARY]
+CREATE  UNIQUE  INDEX [wrd_txt] ON [phpbb_search_wordlist]([word_text]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_search_wordmatch' */
+/*
+	Table: 'phpbb_search_wordmatch'
+*/
 CREATE TABLE [phpbb_search_wordmatch] (
 	[post_id] [int] DEFAULT (0) NOT NULL ,
 	[word_id] [int] DEFAULT (0) NOT NULL ,
@@ -1017,7 +1106,9 @@ CREATE  INDEX [word_id] ON [phpbb_search_wordmatch]([word_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_sessions' */
+/*
+	Table: 'phpbb_sessions'
+*/
 CREATE TABLE [phpbb_sessions] (
 	[session_id] [char] (32) DEFAULT ('') NOT NULL ,
 	[session_user_id] [int] DEFAULT (0) NOT NULL ,
@@ -1047,7 +1138,9 @@ CREATE  INDEX [session_user_id] ON [phpbb_sessions]([session_user_id]) ON [PRIMA
 GO
 
 
-/* Table: 'phpbb_sessions_keys' */
+/*
+	Table: 'phpbb_sessions_keys'
+*/
 CREATE TABLE [phpbb_sessions_keys] (
 	[key_id] [char] (32) DEFAULT ('') NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -1068,7 +1161,9 @@ CREATE  INDEX [last_login] ON [phpbb_sessions_keys]([last_login]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_sitelist' */
+/*
+	Table: 'phpbb_sitelist'
+*/
 CREATE TABLE [phpbb_sitelist] (
 	[site_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[site_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
@@ -1085,7 +1180,9 @@ ALTER TABLE [phpbb_sitelist] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_smilies' */
+/*
+	Table: 'phpbb_smilies'
+*/
 CREATE TABLE [phpbb_smilies] (
 	[smiley_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[code] [varchar] (50) DEFAULT ('') NOT NULL ,
@@ -1105,14 +1202,16 @@ ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [display_on_posting] ON [phpbb_smilies]([display_on_posting]) ON [PRIMARY]
+CREATE  INDEX [display_on_post] ON [phpbb_smilies]([display_on_posting]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_styles' */
+/*
+	Table: 'phpbb_styles'
+*/
 CREATE TABLE [phpbb_styles] (
 	[style_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[style_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[style_name] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[style_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[style_active] [int] DEFAULT (1) NOT NULL ,
 	[template_id] [int] DEFAULT (0) NOT NULL ,
@@ -1141,10 +1240,12 @@ CREATE  INDEX [imageset_id] ON [phpbb_styles]([imageset_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_styles_template' */
+/*
+	Table: 'phpbb_styles_template'
+*/
 CREATE TABLE [phpbb_styles_template] (
 	[template_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[template_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[template_name] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[template_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[template_path] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[bbcode_bitfield] [varbinary] (255) DEFAULT (0x90D8) NOT NULL ,
@@ -1159,11 +1260,13 @@ ALTER TABLE [phpbb_styles_template] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  UNIQUE  INDEX [template_name] ON [phpbb_styles_template]([template_name]) ON [PRIMARY]
+CREATE  UNIQUE  INDEX [tmplte_nm] ON [phpbb_styles_template]([template_name]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_styles_template_data' */
+/*
+	Table: 'phpbb_styles_template_data'
+*/
 CREATE TABLE [phpbb_styles_template_data] (
 	[template_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[template_filename] [varchar] (100) DEFAULT ('') NOT NULL ,
@@ -1173,17 +1276,19 @@ CREATE TABLE [phpbb_styles_template_data] (
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-CREATE  INDEX [template_id] ON [phpbb_styles_template_data]([template_id]) ON [PRIMARY]
+CREATE  INDEX [tid] ON [phpbb_styles_template_data]([template_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [template_filename] ON [phpbb_styles_template_data]([template_filename]) ON [PRIMARY]
+CREATE  INDEX [tfn] ON [phpbb_styles_template_data]([template_filename]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_styles_theme' */
+/*
+	Table: 'phpbb_styles_theme'
+*/
 CREATE TABLE [phpbb_styles_theme] (
 	[theme_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[theme_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[theme_name] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[theme_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[theme_path] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[theme_storedb] [int] DEFAULT (0) NOT NULL ,
@@ -1203,92 +1308,98 @@ CREATE  UNIQUE  INDEX [theme_name] ON [phpbb_styles_theme]([theme_name]) ON [PRI
 GO
 
 
-/* Table: 'phpbb_styles_imageset' */
+/*
+	Table: 'phpbb_styles_imageset'
+*/
 CREATE TABLE [phpbb_styles_imageset] (
 	[imageset_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[imageset_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[imageset_name] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[imageset_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[imageset_path] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[site_logo] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_post_pm] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_reply] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_reply_pm] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_profile] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_pm] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_delete] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_info] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_quote] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_search] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_edit] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_report] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_warn] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_email] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_www] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_icq] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_aim] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_yim] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_msnm] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_jabber] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_online] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_offline] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_friend] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[btn_foe] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[icon_unapproved] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[icon_reported] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[icon_attach] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[icon_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[icon_post_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[icon_post_latest] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[icon_post_newest] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[forum] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[forum_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[forum_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[forum_link] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[sub_forum] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[sub_forum_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_moved] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_hot] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_hot_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_hot_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_hot_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_announce] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_announce_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_announce_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_announce_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_global] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_global_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_global_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_global_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_sticky] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_sticky_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_sticky_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_lock_sticky_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_sticky] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_sticky_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_sticky_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_sticky_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_announce] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_announce_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_announce_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_announce_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_global] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_global_post] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_global_new] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[folder_global_new_post] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[upload_bar] [varchar] (200) DEFAULT ('') NOT NULL ,
 	[poll_left] [varchar] (200) DEFAULT ('') NOT NULL ,
 	[poll_center] [varchar] (200) DEFAULT ('') NOT NULL ,
 	[poll_right] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[attach_progress_bar] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_friend] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_foe] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[forum_link] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[forum_read] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[forum_read_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[forum_read_subforum] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[forum_unread] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[forum_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[forum_unread_subforum] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_moved] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_read] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_read_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_read_hot] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_read_hot_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_read_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_read_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_unread] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_unread_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_unread_hot] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_unread_hot_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[topic_unread_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[sticky_read] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[sticky_read_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[sticky_read_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[sticky_read_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[sticky_unread] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[sticky_unread_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[sticky_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[sticky_unread_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[announce_read] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[announce_read_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[announce_read_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[announce_read_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[announce_unread] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[announce_unread_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[announce_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[announce_unread_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[global_read] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[global_read_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[global_read_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[global_read_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[global_unread] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[global_unread_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[global_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[global_unread_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[pm_read] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[pm_unread] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_contact_aim] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_contact_email] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_contact_icq] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_contact_jabber] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_contact_msnm] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_contact_pm] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_contact_yahoo] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_contact_www] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_post_delete] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_post_edit] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_post_info] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_post_quote] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_post_report] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_post_target] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_post_target_unread] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_topic_attach] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_topic_latest] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_topic_newest] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_topic_reported] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_topic_unapproved] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_user_online] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_user_offline] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_user_profile] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_user_search] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[icon_user_warn] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[button_pm_forward] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[button_pm_new] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[button_pm_reply] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[button_topic_locked] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[button_topic_new] [varchar] (200) DEFAULT ('') NOT NULL ,
+	[button_topic_reply] [varchar] (200) DEFAULT ('') NOT NULL ,
 	[user_icon1] [varchar] (200) DEFAULT ('') NOT NULL ,
 	[user_icon2] [varchar] (200) DEFAULT ('') NOT NULL ,
 	[user_icon3] [varchar] (200) DEFAULT ('') NOT NULL ,
@@ -1309,11 +1420,13 @@ ALTER TABLE [phpbb_styles_imageset] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  UNIQUE  INDEX [imageset_name] ON [phpbb_styles_imageset]([imageset_name]) ON [PRIMARY]
+CREATE  UNIQUE  INDEX [imgset_nm] ON [phpbb_styles_imageset]([imageset_name]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_topics' */
+/*
+	Table: 'phpbb_topics'
+*/
 CREATE TABLE [phpbb_topics] (
 	[topic_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
@@ -1362,11 +1475,13 @@ GO
 CREATE  INDEX [forum_id_type] ON [phpbb_topics]([forum_id], [topic_type]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [topic_last_post_time] ON [phpbb_topics]([topic_last_post_time]) ON [PRIMARY]
+CREATE  INDEX [last_post_time] ON [phpbb_topics]([topic_last_post_time]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_topics_track' */
+/*
+	Table: 'phpbb_topics_track'
+*/
 CREATE TABLE [phpbb_topics_track] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
@@ -1387,7 +1502,9 @@ CREATE  INDEX [forum_id] ON [phpbb_topics_track]([forum_id]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_topics_posted' */
+/*
+	Table: 'phpbb_topics_posted'
+*/
 CREATE TABLE [phpbb_topics_posted] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
@@ -1404,7 +1521,9 @@ ALTER TABLE [phpbb_topics_posted] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_topics_watch' */
+/*
+	Table: 'phpbb_topics_watch'
+*/
 CREATE TABLE [phpbb_topics_watch] (
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -1418,11 +1537,13 @@ GO
 CREATE  INDEX [user_id] ON [phpbb_topics_watch]([user_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [notify_status] ON [phpbb_topics_watch]([notify_status]) ON [PRIMARY]
+CREATE  INDEX [notify_stat] ON [phpbb_topics_watch]([notify_status]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_user_group' */
+/*
+	Table: 'phpbb_user_group'
+*/
 CREATE TABLE [phpbb_user_group] (
 	[group_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -1441,7 +1562,9 @@ CREATE  INDEX [group_leader] ON [phpbb_user_group]([group_leader]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_users' */
+/*
+	Table: 'phpbb_users'
+*/
 CREATE TABLE [phpbb_users] (
 	[user_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[user_type] [int] DEFAULT (0) NOT NULL ,
@@ -1450,7 +1573,7 @@ CREATE TABLE [phpbb_users] (
 	[user_perm_from] [int] DEFAULT (0) NOT NULL ,
 	[user_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
 	[user_regdate] [int] DEFAULT (0) NOT NULL ,
-	[username] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[username] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[user_password] [varchar] (40) DEFAULT ('') NOT NULL ,
 	[user_passchg] [int] DEFAULT (0) NOT NULL ,
 	[user_email] [varchar] (100) DEFAULT ('') NOT NULL ,
@@ -1535,7 +1658,9 @@ CREATE  INDEX [username] ON [phpbb_users]([username]) ON [PRIMARY]
 GO
 
 
-/* Table: 'phpbb_warnings' */
+/*
+	Table: 'phpbb_warnings'
+*/
 CREATE TABLE [phpbb_warnings] (
 	[warning_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
@@ -1553,7 +1678,9 @@ ALTER TABLE [phpbb_warnings] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_words' */
+/*
+	Table: 'phpbb_words'
+*/
 CREATE TABLE [phpbb_words] (
 	[word_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[word] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -1569,7 +1696,9 @@ ALTER TABLE [phpbb_words] WITH NOCHECK ADD
 GO
 
 
-/* Table: 'phpbb_zebra' */
+/*
+	Table: 'phpbb_zebra'
+*/
 CREATE TABLE [phpbb_zebra] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[zebra_id] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 8d2ceebe7d..8e6115120b 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -37,7 +37,7 @@ CREATE TABLE phpbb_acl_groups (
 	auth_role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	auth_setting tinyint(2) DEFAULT '0' NOT NULL,
 	KEY group_id (group_id),
-	KEY auth_option_id (auth_option_id)
+	KEY auth_opt_id (auth_option_id)
 );
 
 
@@ -115,7 +115,7 @@ CREATE TABLE phpbb_bbcodes (
 	second_pass_match varchar(255) DEFAULT '' NOT NULL,
 	second_pass_replace mediumtext DEFAULT '' NOT NULL,
 	PRIMARY KEY (bbcode_id),
-	KEY display_in_posting (display_on_posting)
+	KEY display_on_post (display_on_posting)
 );
 
 
@@ -144,7 +144,7 @@ CREATE TABLE phpbb_bots (
 
 # Table: 'phpbb_config'
 CREATE TABLE phpbb_config (
-	config_name varchar(255) DEFAULT '' NOT NULL,
+	config_name varchar(252) DEFAULT '' NOT NULL,
 	config_value varchar(255) DEFAULT '' NOT NULL,
 	is_dynamic tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (config_name),
@@ -165,7 +165,7 @@ CREATE TABLE phpbb_confirm (
 # Table: 'phpbb_disallow'
 CREATE TABLE phpbb_disallow (
 	disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	disallow_username varchar(255) DEFAULT '' NOT NULL,
+	disallow_username varchar(252) DEFAULT '' NOT NULL,
 	PRIMARY KEY (disallow_id)
 );
 
@@ -250,7 +250,7 @@ CREATE TABLE phpbb_forums (
 	prune_freq tinyint(4) DEFAULT '0' NOT NULL,
 	PRIMARY KEY (forum_id),
 	KEY left_right_id (left_id, right_id),
-	KEY forum_last_post_id (forum_last_post_id)
+	KEY forum_lastpost_id (forum_last_post_id)
 );
 
 
@@ -279,7 +279,7 @@ CREATE TABLE phpbb_forums_watch (
 	notify_status tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	KEY forum_id (forum_id),
 	KEY user_id (user_id),
-	KEY notify_status (notify_status)
+	KEY notify_stat (notify_status)
 );
 
 
@@ -287,7 +287,7 @@ CREATE TABLE phpbb_forums_watch (
 CREATE TABLE phpbb_groups (
 	group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	group_type tinyint(4) DEFAULT '1' NOT NULL,
-	group_name varchar(255) DEFAULT '' NOT NULL,
+	group_name varchar(252) DEFAULT '' NOT NULL,
 	group_desc text DEFAULT '' NOT NULL,
 	group_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	group_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
@@ -316,7 +316,8 @@ CREATE TABLE phpbb_icons (
 	icons_height tinyint(4) DEFAULT '0' NOT NULL,
 	icons_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	PRIMARY KEY (icons_id)
+	PRIMARY KEY (icons_id),
+	KEY display_on_posting (display_on_posting)
 );
 
 
@@ -358,11 +359,11 @@ CREATE TABLE phpbb_log (
 CREATE TABLE phpbb_moderator_cache (
 	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	username varchar(255) DEFAULT '' NOT NULL,
+	username varchar(252) DEFAULT '' NOT NULL,
 	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	group_name varchar(255) DEFAULT '' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	KEY display_on_index (display_on_index),
+	KEY disp_idx (display_on_index),
 	KEY forum_id (forum_id)
 );
 
@@ -393,7 +394,7 @@ CREATE TABLE phpbb_poll_options (
 	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	poll_option_text text DEFAULT '' NOT NULL,
 	poll_option_total mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	KEY poll_option_id (poll_option_id),
+	KEY poll_opt_id (poll_option_id),
 	KEY topic_id (topic_id)
 );
 
@@ -425,7 +426,7 @@ CREATE TABLE phpbb_posts (
 	enable_smilies tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_magic_url tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_sig tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	post_username varchar(255) DEFAULT '' NOT NULL,
+	post_username varchar(252) DEFAULT '' NOT NULL,
 	post_subject text DEFAULT '' NOT NULL,
 	post_text mediumtext DEFAULT '' NOT NULL,
 	post_checksum varchar(32) DEFAULT '' NOT NULL,
@@ -521,7 +522,7 @@ CREATE TABLE phpbb_privmsgs_to (
 	pm_forwarded tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	folder_id int(4) DEFAULT '0' NOT NULL,
 	KEY msg_id (msg_id),
-	KEY user_folder_id (user_id, folder_id)
+	KEY usr_flder_id (user_id, folder_id)
 );
 
 
@@ -544,8 +545,8 @@ CREATE TABLE phpbb_profile_fields (
 	field_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (field_id),
-	KEY field_type (field_type),
-	KEY field_order (field_order)
+	KEY fld_type (field_type),
+	KEY fld_ordr (field_order)
 );
 
 
@@ -625,11 +626,11 @@ CREATE TABLE phpbb_search_results (
 
 # Table: 'phpbb_search_wordlist'
 CREATE TABLE phpbb_search_wordlist (
-	word_text varchar(252) BINARY DEFAULT '' NOT NULL,
 	word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	word_text varchar(252) BINARY DEFAULT '' NOT NULL,
 	word_common tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (word_text),
-	KEY word_id (word_id)
+	PRIMARY KEY (word_id),
+	UNIQUE wrd_txt (word_text)
 );
 
 
@@ -693,14 +694,14 @@ CREATE TABLE phpbb_smilies (
 	smiley_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	PRIMARY KEY (smiley_id),
-	KEY display_on_posting (display_on_posting)
+	KEY display_on_post (display_on_posting)
 );
 
 
 # Table: 'phpbb_styles'
 CREATE TABLE phpbb_styles (
 	style_id tinyint(4) NOT NULL auto_increment,
-	style_name varchar(255) DEFAULT '' NOT NULL,
+	style_name varchar(252) DEFAULT '' NOT NULL,
 	style_copyright varchar(255) DEFAULT '' NOT NULL,
 	style_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	template_id tinyint(4) DEFAULT '0' NOT NULL,
@@ -717,13 +718,13 @@ CREATE TABLE phpbb_styles (
 # Table: 'phpbb_styles_template'
 CREATE TABLE phpbb_styles_template (
 	template_id tinyint(4) NOT NULL auto_increment,
-	template_name varchar(255) DEFAULT '' NOT NULL,
+	template_name varchar(252) DEFAULT '' NOT NULL,
 	template_copyright varchar(255) DEFAULT '' NOT NULL,
 	template_path varchar(100) DEFAULT '' NOT NULL,
 	bbcode_bitfield varbinary(255) DEFAULT 0x90D8 NOT NULL,
 	template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (template_id),
-	UNIQUE template_name (template_name)
+	UNIQUE tmplte_nm (template_name)
 );
 
 
@@ -734,15 +735,15 @@ CREATE TABLE phpbb_styles_template_data (
 	template_included text DEFAULT '' NOT NULL,
 	template_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	template_data mediumtext DEFAULT '' NOT NULL,
-	KEY template_id (template_id),
-	KEY template_filename (template_filename)
+	KEY tid (template_id),
+	KEY tfn (template_filename)
 );
 
 
 # Table: 'phpbb_styles_theme'
 CREATE TABLE phpbb_styles_theme (
 	theme_id tinyint(4) NOT NULL auto_increment,
-	theme_name varchar(255) DEFAULT '' NOT NULL,
+	theme_name varchar(252) DEFAULT '' NOT NULL,
 	theme_copyright varchar(255) DEFAULT '' NOT NULL,
 	theme_path varchar(100) DEFAULT '' NOT NULL,
 	theme_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
@@ -756,89 +757,93 @@ CREATE TABLE phpbb_styles_theme (
 # Table: 'phpbb_styles_imageset'
 CREATE TABLE phpbb_styles_imageset (
 	imageset_id tinyint(4) NOT NULL auto_increment,
-	imageset_name varchar(255) DEFAULT '' NOT NULL,
+	imageset_name varchar(252) DEFAULT '' NOT NULL,
 	imageset_copyright varchar(255) DEFAULT '' NOT NULL,
 	imageset_path varchar(100) DEFAULT '' NOT NULL,
 	site_logo varchar(200) DEFAULT '' NOT NULL,
-	btn_post varchar(200) DEFAULT '' NOT NULL,
-	btn_post_pm varchar(200) DEFAULT '' NOT NULL,
-	btn_reply varchar(200) DEFAULT '' NOT NULL,
-	btn_reply_pm varchar(200) DEFAULT '' NOT NULL,
-	btn_locked varchar(200) DEFAULT '' NOT NULL,
-	btn_profile varchar(200) DEFAULT '' NOT NULL,
-	btn_pm varchar(200) DEFAULT '' NOT NULL,
-	btn_delete varchar(200) DEFAULT '' NOT NULL,
-	btn_info varchar(200) DEFAULT '' NOT NULL,
-	btn_quote varchar(200) DEFAULT '' NOT NULL,
-	btn_search varchar(200) DEFAULT '' NOT NULL,
-	btn_edit varchar(200) DEFAULT '' NOT NULL,
-	btn_report varchar(200) DEFAULT '' NOT NULL,
-	btn_warn varchar(200) DEFAULT '' NOT NULL,
-	btn_email varchar(200) DEFAULT '' NOT NULL,
-	btn_www varchar(200) DEFAULT '' NOT NULL,
-	btn_icq varchar(200) DEFAULT '' NOT NULL,
-	btn_aim varchar(200) DEFAULT '' NOT NULL,
-	btn_yim varchar(200) DEFAULT '' NOT NULL,
-	btn_msnm varchar(200) DEFAULT '' NOT NULL,
-	btn_jabber varchar(200) DEFAULT '' NOT NULL,
-	btn_online varchar(200) DEFAULT '' NOT NULL,
-	btn_offline varchar(200) DEFAULT '' NOT NULL,
-	btn_friend varchar(200) DEFAULT '' NOT NULL,
-	btn_foe varchar(200) DEFAULT '' NOT NULL,
-	icon_unapproved varchar(200) DEFAULT '' NOT NULL,
-	icon_reported varchar(200) DEFAULT '' NOT NULL,
-	icon_attach varchar(200) DEFAULT '' NOT NULL,
-	icon_post varchar(200) DEFAULT '' NOT NULL,
-	icon_post_new varchar(200) DEFAULT '' NOT NULL,
-	icon_post_latest varchar(200) DEFAULT '' NOT NULL,
-	icon_post_newest varchar(200) DEFAULT '' NOT NULL,
-	forum varchar(200) DEFAULT '' NOT NULL,
-	forum_new varchar(200) DEFAULT '' NOT NULL,
-	forum_locked varchar(200) DEFAULT '' NOT NULL,
-	forum_link varchar(200) DEFAULT '' NOT NULL,
-	sub_forum varchar(200) DEFAULT '' NOT NULL,
-	sub_forum_new varchar(200) DEFAULT '' NOT NULL,
-	folder varchar(200) DEFAULT '' NOT NULL,
-	folder_moved varchar(200) DEFAULT '' NOT NULL,
-	folder_post varchar(200) DEFAULT '' NOT NULL,
-	folder_new varchar(200) DEFAULT '' NOT NULL,
-	folder_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_hot varchar(200) DEFAULT '' NOT NULL,
-	folder_hot_post varchar(200) DEFAULT '' NOT NULL,
-	folder_hot_new varchar(200) DEFAULT '' NOT NULL,
-	folder_hot_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_new varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_announce varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_new varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_global varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_global_new varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_global_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_global_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_new varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_sticky varchar(200) DEFAULT '' NOT NULL,
-	folder_sticky_post varchar(200) DEFAULT '' NOT NULL,
-	folder_sticky_new varchar(200) DEFAULT '' NOT NULL,
-	folder_sticky_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_announce varchar(200) DEFAULT '' NOT NULL,
-	folder_announce_post varchar(200) DEFAULT '' NOT NULL,
-	folder_announce_new varchar(200) DEFAULT '' NOT NULL,
-	folder_announce_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_global varchar(200) DEFAULT '' NOT NULL,
-	folder_global_post varchar(200) DEFAULT '' NOT NULL,
-	folder_global_new varchar(200) DEFAULT '' NOT NULL,
-	folder_global_new_post varchar(200) DEFAULT '' NOT NULL,
+	upload_bar varchar(200) DEFAULT '' NOT NULL,
 	poll_left varchar(200) DEFAULT '' NOT NULL,
 	poll_center varchar(200) DEFAULT '' NOT NULL,
 	poll_right varchar(200) DEFAULT '' NOT NULL,
-	attach_progress_bar varchar(200) DEFAULT '' NOT NULL,
+	icon_friend varchar(200) DEFAULT '' NOT NULL,
+	icon_foe varchar(200) DEFAULT '' NOT NULL,
+	forum_link varchar(200) DEFAULT '' NOT NULL,
+	forum_read varchar(200) DEFAULT '' NOT NULL,
+	forum_read_locked varchar(200) DEFAULT '' NOT NULL,
+	forum_read_subforum varchar(200) DEFAULT '' NOT NULL,
+	forum_unread varchar(200) DEFAULT '' NOT NULL,
+	forum_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	forum_unread_subforum varchar(200) DEFAULT '' NOT NULL,
+	topic_moved varchar(200) DEFAULT '' NOT NULL,
+	topic_read varchar(200) DEFAULT '' NOT NULL,
+	topic_read_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_read_hot varchar(200) DEFAULT '' NOT NULL,
+	topic_read_hot_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_read_locked varchar(200) DEFAULT '' NOT NULL,
+	topic_read_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_unread varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_hot varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_hot_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	sticky_read varchar(200) DEFAULT '' NOT NULL,
+	sticky_read_mine varchar(200) DEFAULT '' NOT NULL,
+	sticky_read_locked varchar(200) DEFAULT '' NOT NULL,
+	sticky_read_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	sticky_unread varchar(200) DEFAULT '' NOT NULL,
+	sticky_unread_mine varchar(200) DEFAULT '' NOT NULL,
+	sticky_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	sticky_unread_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	announce_read varchar(200) DEFAULT '' NOT NULL,
+	announce_read_mine varchar(200) DEFAULT '' NOT NULL,
+	announce_read_locked varchar(200) DEFAULT '' NOT NULL,
+	announce_read_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	announce_unread varchar(200) DEFAULT '' NOT NULL,
+	announce_unread_mine varchar(200) DEFAULT '' NOT NULL,
+	announce_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	announce_unread_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	global_read varchar(200) DEFAULT '' NOT NULL,
+	global_read_mine varchar(200) DEFAULT '' NOT NULL,
+	global_read_locked varchar(200) DEFAULT '' NOT NULL,
+	global_read_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	global_unread varchar(200) DEFAULT '' NOT NULL,
+	global_unread_mine varchar(200) DEFAULT '' NOT NULL,
+	global_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	global_unread_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	pm_read varchar(200) DEFAULT '' NOT NULL,
+	pm_unread varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_aim varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_email varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_icq varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_jabber varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_msnm varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_pm varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_yahoo varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_www varchar(200) DEFAULT '' NOT NULL,
+	icon_post_delete varchar(200) DEFAULT '' NOT NULL,
+	icon_post_edit varchar(200) DEFAULT '' NOT NULL,
+	icon_post_info varchar(200) DEFAULT '' NOT NULL,
+	icon_post_quote varchar(200) DEFAULT '' NOT NULL,
+	icon_post_report varchar(200) DEFAULT '' NOT NULL,
+	icon_post_target varchar(200) DEFAULT '' NOT NULL,
+	icon_post_target_unread varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_attach varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_latest varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_newest varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_reported varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_unapproved varchar(200) DEFAULT '' NOT NULL,
+	icon_user_online varchar(200) DEFAULT '' NOT NULL,
+	icon_user_offline varchar(200) DEFAULT '' NOT NULL,
+	icon_user_profile varchar(200) DEFAULT '' NOT NULL,
+	icon_user_search varchar(200) DEFAULT '' NOT NULL,
+	icon_user_warn varchar(200) DEFAULT '' NOT NULL,
+	button_pm_forward varchar(200) DEFAULT '' NOT NULL,
+	button_pm_new varchar(200) DEFAULT '' NOT NULL,
+	button_pm_reply varchar(200) DEFAULT '' NOT NULL,
+	button_topic_locked varchar(200) DEFAULT '' NOT NULL,
+	button_topic_new varchar(200) DEFAULT '' NOT NULL,
+	button_topic_reply varchar(200) DEFAULT '' NOT NULL,
 	user_icon1 varchar(200) DEFAULT '' NOT NULL,
 	user_icon2 varchar(200) DEFAULT '' NOT NULL,
 	user_icon3 varchar(200) DEFAULT '' NOT NULL,
@@ -850,7 +855,7 @@ CREATE TABLE phpbb_styles_imageset (
 	user_icon9 varchar(200) DEFAULT '' NOT NULL,
 	user_icon10 varchar(200) DEFAULT '' NOT NULL,
 	PRIMARY KEY (imageset_id),
-	UNIQUE imageset_name (imageset_name)
+	UNIQUE imgset_nm (imageset_name)
 );
 
 
@@ -890,7 +895,7 @@ CREATE TABLE phpbb_topics (
 	PRIMARY KEY (topic_id),
 	KEY forum_id (forum_id),
 	KEY forum_id_type (forum_id, topic_type),
-	KEY topic_last_post_time (topic_last_post_time)
+	KEY last_post_time (topic_last_post_time)
 );
 
 
@@ -921,7 +926,7 @@ CREATE TABLE phpbb_topics_watch (
 	notify_status tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	KEY topic_id (topic_id),
 	KEY user_id (user_id),
-	KEY notify_status (notify_status)
+	KEY notify_stat (notify_status)
 );
 
 
@@ -946,7 +951,7 @@ CREATE TABLE phpbb_users (
 	user_perm_from mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_ip varchar(40) DEFAULT '' NOT NULL,
 	user_regdate int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	username varchar(255) DEFAULT '' NOT NULL,
+	username varchar(252) DEFAULT '' NOT NULL,
 	user_password varchar(40) DEFAULT '' NOT NULL,
 	user_passchg int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	user_email varchar(100) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f6a1038d2d..98450307d4 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -17,7 +17,7 @@
 /*
 CREATE TABLESPACE "PHPBB"
 	LOGGING 
-	DATAFILE \'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora\' 
+	DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora' 
 	SIZE 10M
 	AUTOEXTEND ON NEXT 10M
 	MAXSIZE 100M;
@@ -42,19 +42,21 @@ DISCONNECT;
 
 CONNECT phpbb/phpbb_password;
 */
-/* Table: 'phpbb_attachments' */
+/*
+	Table: 'phpbb_attachments'
+*/
 CREATE TABLE phpbb_attachments (
 	attach_id number(8) NOT NULL,
 	post_msg_id number(8) DEFAULT '0' NOT NULL,
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	in_message number(1) DEFAULT '0' NOT NULL,
 	poster_id number(8) DEFAULT '0' NOT NULL,
-	physical_filename varchar2(255) DEFAULT '' NOT NULL,
-	real_filename varchar2(255) DEFAULT '' NOT NULL,
+	physical_filename varchar2(255) DEFAULT '' ,
+	real_filename varchar2(255) DEFAULT '' ,
 	download_count number(8) DEFAULT '0' NOT NULL,
-	attach_comment clob DEFAULT '' NOT NULL,
-	extension varchar2(100) DEFAULT '' NOT NULL,
-	mimetype varchar2(100) DEFAULT '' NOT NULL,
+	attach_comment clob DEFAULT '' ,
+	extension varchar2(100) DEFAULT '' ,
+	mimetype varchar2(100) DEFAULT '' ,
 	filesize number(20) DEFAULT '0' NOT NULL,
 	filetime number(11) DEFAULT '0' NOT NULL,
 	thumbnail number(1) DEFAULT '0' NOT NULL,
@@ -76,7 +78,7 @@ CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize)
 CREATE SEQUENCE phpbb_attachments_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_attachments_seq
+CREATE OR REPLACE TRIGGER t_phpbb_attachments
 BEFORE INSERT ON phpbb_attachments
 FOR EACH ROW WHEN (
 	new.attach_id IS NULL OR new.attach_id = 0
@@ -89,7 +91,9 @@ END;
 /
 
 
-/* Table: 'phpbb_acl_groups' */
+/*
+	Table: 'phpbb_acl_groups'
+*/
 CREATE TABLE phpbb_acl_groups (
 	group_id number(8) DEFAULT '0' NOT NULL,
 	forum_id number(8) DEFAULT '0' NOT NULL,
@@ -101,13 +105,15 @@ CREATE TABLE phpbb_acl_groups (
 
 CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups (group_id)
 /
-CREATE INDEX phpbb_acl_groups_auth_option_id ON phpbb_acl_groups (auth_option_id)
+CREATE INDEX phpbb_acl_groups_auth_opt_id ON phpbb_acl_groups (auth_option_id)
 /
 
-/* Table: 'phpbb_acl_options' */
+/*
+	Table: 'phpbb_acl_options'
+*/
 CREATE TABLE phpbb_acl_options (
 	auth_option_id number(8) NOT NULL,
-	auth_option varchar2(50) DEFAULT '' NOT NULL,
+	auth_option varchar2(50) DEFAULT '' ,
 	is_global number(1) DEFAULT '0' NOT NULL,
 	is_local number(1) DEFAULT '0' NOT NULL,
 	founder_only number(1) DEFAULT '0' NOT NULL,
@@ -121,7 +127,7 @@ CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option)
 CREATE SEQUENCE phpbb_acl_options_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_acl_options_seq
+CREATE OR REPLACE TRIGGER t_phpbb_acl_options
 BEFORE INSERT ON phpbb_acl_options
 FOR EACH ROW WHEN (
 	new.auth_option_id IS NULL OR new.auth_option_id = 0
@@ -134,12 +140,14 @@ END;
 /
 
 
-/* Table: 'phpbb_acl_roles' */
+/*
+	Table: 'phpbb_acl_roles'
+*/
 CREATE TABLE phpbb_acl_roles (
 	role_id number(8) NOT NULL,
-	role_name varchar2(255) DEFAULT '' NOT NULL,
-	role_description clob DEFAULT '' NOT NULL,
-	role_type varchar2(10) DEFAULT '' NOT NULL,
+	role_name varchar2(255) DEFAULT '' ,
+	role_description clob DEFAULT '' ,
+	role_type varchar2(10) DEFAULT '' ,
 	role_order number(4) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_acl_roles PRIMARY KEY (role_id)
 )
@@ -153,7 +161,7 @@ CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles (role_order)
 CREATE SEQUENCE phpbb_acl_roles_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_acl_roles_seq
+CREATE OR REPLACE TRIGGER t_phpbb_acl_roles
 BEFORE INSERT ON phpbb_acl_roles
 FOR EACH ROW WHEN (
 	new.role_id IS NULL OR new.role_id = 0
@@ -166,7 +174,9 @@ END;
 /
 
 
-/* Table: 'phpbb_acl_roles_data' */
+/*
+	Table: 'phpbb_acl_roles_data'
+*/
 CREATE TABLE phpbb_acl_roles_data (
 	role_id number(8) DEFAULT '0' NOT NULL,
 	auth_option_id number(8) DEFAULT '0' NOT NULL,
@@ -176,7 +186,9 @@ CREATE TABLE phpbb_acl_roles_data (
 /
 
 
-/* Table: 'phpbb_acl_users' */
+/*
+	Table: 'phpbb_acl_users'
+*/
 CREATE TABLE phpbb_acl_users (
 	user_id number(8) DEFAULT '0' NOT NULL,
 	forum_id number(8) DEFAULT '0' NOT NULL,
@@ -191,17 +203,19 @@ CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users (user_id)
 CREATE INDEX phpbb_acl_users_auth_option_id ON phpbb_acl_users (auth_option_id)
 /
 
-/* Table: 'phpbb_banlist' */
+/*
+	Table: 'phpbb_banlist'
+*/
 CREATE TABLE phpbb_banlist (
 	ban_id number(8) NOT NULL,
 	ban_userid number(8) DEFAULT '0' NOT NULL,
-	ban_ip varchar2(40) DEFAULT '' NOT NULL,
-	ban_email varchar2(100) DEFAULT '' NOT NULL,
+	ban_ip varchar2(40) DEFAULT '' ,
+	ban_email varchar2(100) DEFAULT '' ,
 	ban_start number(11) DEFAULT '0' NOT NULL,
 	ban_end number(11) DEFAULT '0' NOT NULL,
 	ban_exclude number(1) DEFAULT '0' NOT NULL,
-	ban_reason varchar2(3000) DEFAULT '' NOT NULL,
-	ban_give_reason varchar2(3000) DEFAULT '' NOT NULL,
+	ban_reason varchar2(3000) DEFAULT '' ,
+	ban_give_reason varchar2(3000) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_banlist PRIMARY KEY (ban_id)
 )
 /
@@ -210,7 +224,7 @@ CREATE TABLE phpbb_banlist (
 CREATE SEQUENCE phpbb_banlist_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_banlist_seq
+CREATE OR REPLACE TRIGGER t_phpbb_banlist
 BEFORE INSERT ON phpbb_banlist
 FOR EACH ROW WHEN (
 	new.ban_id IS NULL OR new.ban_id = 0
@@ -223,26 +237,30 @@ END;
 /
 
 
-/* Table: 'phpbb_bbcodes' */
+/*
+	Table: 'phpbb_bbcodes'
+*/
 CREATE TABLE phpbb_bbcodes (
 	bbcode_id number(3) DEFAULT '0' NOT NULL,
-	bbcode_tag varchar2(16) DEFAULT '' NOT NULL,
-	bbcode_helpline varchar2(255) DEFAULT '' NOT NULL,
+	bbcode_tag varchar2(16) DEFAULT '' ,
+	bbcode_helpline varchar2(255) DEFAULT '' ,
 	display_on_posting number(1) DEFAULT '0' NOT NULL,
-	bbcode_match varchar2(255) DEFAULT '' NOT NULL,
-	bbcode_tpl clob DEFAULT '' NOT NULL,
-	first_pass_match varchar2(255) DEFAULT '' NOT NULL,
-	first_pass_replace varchar2(255) DEFAULT '' NOT NULL,
-	second_pass_match varchar2(255) DEFAULT '' NOT NULL,
-	second_pass_replace clob DEFAULT '' NOT NULL,
+	bbcode_match varchar2(255) DEFAULT '' ,
+	bbcode_tpl clob DEFAULT '' ,
+	first_pass_match varchar2(255) DEFAULT '' ,
+	first_pass_replace varchar2(255) DEFAULT '' ,
+	second_pass_match varchar2(255) DEFAULT '' ,
+	second_pass_replace clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_bbcodes PRIMARY KEY (bbcode_id)
 )
 /
 
-CREATE INDEX phpbb_bbcodes_display_in_posting ON phpbb_bbcodes (display_on_posting)
+CREATE INDEX phpbb_bbcodes_display_on_post ON phpbb_bbcodes (display_on_posting)
 /
 
-/* Table: 'phpbb_bookmarks' */
+/*
+	Table: 'phpbb_bookmarks'
+*/
 CREATE TABLE phpbb_bookmarks (
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
@@ -255,14 +273,16 @@ CREATE INDEX phpbb_bookmarks_order_id ON phpbb_bookmarks (order_id)
 CREATE INDEX phpbb_bookmarks_topic_user_id ON phpbb_bookmarks (topic_id, user_id)
 /
 
-/* Table: 'phpbb_bots' */
+/*
+	Table: 'phpbb_bots'
+*/
 CREATE TABLE phpbb_bots (
 	bot_id number(8) NOT NULL,
 	bot_active number(1) DEFAULT '1' NOT NULL,
-	bot_name varchar2(3000) DEFAULT '' NOT NULL,
+	bot_name varchar2(3000) DEFAULT '' ,
 	user_id number(8) DEFAULT '0' NOT NULL,
-	bot_agent varchar2(255) DEFAULT '' NOT NULL,
-	bot_ip varchar2(255) DEFAULT '' NOT NULL,
+	bot_agent varchar2(255) DEFAULT '' ,
+	bot_ip varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_bots PRIMARY KEY (bot_id)
 )
 /
@@ -273,7 +293,7 @@ CREATE INDEX phpbb_bots_bot_active ON phpbb_bots (bot_active)
 CREATE SEQUENCE phpbb_bots_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_bots_seq
+CREATE OR REPLACE TRIGGER t_phpbb_bots
 BEFORE INSERT ON phpbb_bots
 FOR EACH ROW WHEN (
 	new.bot_id IS NULL OR new.bot_id = 0
@@ -286,10 +306,12 @@ END;
 /
 
 
-/* Table: 'phpbb_config' */
+/*
+	Table: 'phpbb_config'
+*/
 CREATE TABLE phpbb_config (
-	config_name varchar2(255) DEFAULT '' NOT NULL,
-	config_value varchar2(255) DEFAULT '' NOT NULL,
+	config_name varchar2(252) DEFAULT '' ,
+	config_value varchar2(255) DEFAULT '' ,
 	is_dynamic number(1) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_config PRIMARY KEY (config_name)
 )
@@ -298,21 +320,25 @@ CREATE TABLE phpbb_config (
 CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic)
 /
 
-/* Table: 'phpbb_confirm' */
+/*
+	Table: 'phpbb_confirm'
+*/
 CREATE TABLE phpbb_confirm (
-	confirm_id char(32) DEFAULT '' NOT NULL,
-	session_id char(32) DEFAULT '' NOT NULL,
+	confirm_id char(32) DEFAULT '' ,
+	session_id char(32) DEFAULT '' ,
 	confirm_type number(3) DEFAULT '0' NOT NULL,
-	code varchar2(8) DEFAULT '' NOT NULL,
+	code varchar2(8) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_confirm PRIMARY KEY (session_id, confirm_id)
 )
 /
 
 
-/* Table: 'phpbb_disallow' */
+/*
+	Table: 'phpbb_disallow'
+*/
 CREATE TABLE phpbb_disallow (
 	disallow_id number(8) NOT NULL,
-	disallow_username varchar2(255) DEFAULT '' NOT NULL,
+	disallow_username varchar2(252) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_disallow PRIMARY KEY (disallow_id)
 )
 /
@@ -321,7 +347,7 @@ CREATE TABLE phpbb_disallow (
 CREATE SEQUENCE phpbb_disallow_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_disallow_seq
+CREATE OR REPLACE TRIGGER t_phpbb_disallow
 BEFORE INSERT ON phpbb_disallow
 FOR EACH ROW WHEN (
 	new.disallow_id IS NULL OR new.disallow_id = 0
@@ -334,15 +360,17 @@ END;
 /
 
 
-/* Table: 'phpbb_drafts' */
+/*
+	Table: 'phpbb_drafts'
+*/
 CREATE TABLE phpbb_drafts (
 	draft_id number(8) NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	forum_id number(8) DEFAULT '0' NOT NULL,
 	save_time number(11) DEFAULT '0' NOT NULL,
-	draft_subject varchar2(1000) DEFAULT '' NOT NULL,
-	draft_message clob DEFAULT '' NOT NULL,
+	draft_subject varchar2(1000) DEFAULT '' ,
+	draft_message clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_drafts PRIMARY KEY (draft_id)
 )
 /
@@ -353,7 +381,7 @@ CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts (save_time)
 CREATE SEQUENCE phpbb_drafts_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_drafts_seq
+CREATE OR REPLACE TRIGGER t_phpbb_drafts
 BEFORE INSERT ON phpbb_drafts
 FOR EACH ROW WHEN (
 	new.draft_id IS NULL OR new.draft_id = 0
@@ -366,11 +394,13 @@ END;
 /
 
 
-/* Table: 'phpbb_extensions' */
+/*
+	Table: 'phpbb_extensions'
+*/
 CREATE TABLE phpbb_extensions (
 	extension_id number(8) NOT NULL,
 	group_id number(8) DEFAULT '0' NOT NULL,
-	extension varchar2(100) DEFAULT '' NOT NULL,
+	extension varchar2(100) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_extensions PRIMARY KEY (extension_id)
 )
 /
@@ -379,7 +409,7 @@ CREATE TABLE phpbb_extensions (
 CREATE SEQUENCE phpbb_extensions_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_extensions_seq
+CREATE OR REPLACE TRIGGER t_phpbb_extensions
 BEFORE INSERT ON phpbb_extensions
 FOR EACH ROW WHEN (
 	new.extension_id IS NULL OR new.extension_id = 0
@@ -392,16 +422,18 @@ END;
 /
 
 
-/* Table: 'phpbb_extension_groups' */
+/*
+	Table: 'phpbb_extension_groups'
+*/
 CREATE TABLE phpbb_extension_groups (
 	group_id number(8) NOT NULL,
-	group_name varchar2(255) DEFAULT '' NOT NULL,
+	group_name varchar2(255) DEFAULT '' ,
 	cat_id number(2) DEFAULT '0' NOT NULL,
 	allow_group number(1) DEFAULT '0' NOT NULL,
 	download_mode number(1) DEFAULT '1' NOT NULL,
-	upload_icon varchar2(255) DEFAULT '' NOT NULL,
+	upload_icon varchar2(255) DEFAULT '' ,
 	max_filesize number(20) DEFAULT '0' NOT NULL,
-	allowed_forums clob DEFAULT '' NOT NULL,
+	allowed_forums clob DEFAULT '' ,
 	allow_in_pm number(1) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_extension_groups PRIMARY KEY (group_id)
 )
@@ -411,7 +443,7 @@ CREATE TABLE phpbb_extension_groups (
 CREATE SEQUENCE phpbb_extension_groups_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_extension_groups_seq
+CREATE OR REPLACE TRIGGER t_phpbb_extension_groups
 BEFORE INSERT ON phpbb_extension_groups
 FOR EACH ROW WHEN (
 	new.group_id IS NULL OR new.group_id = 0
@@ -424,27 +456,29 @@ END;
 /
 
 
-/* Table: 'phpbb_forums' */
+/*
+	Table: 'phpbb_forums'
+*/
 CREATE TABLE phpbb_forums (
 	forum_id number(8) NOT NULL,
 	parent_id number(8) DEFAULT '0' NOT NULL,
 	left_id number(8) DEFAULT '0' NOT NULL,
 	right_id number(8) DEFAULT '0' NOT NULL,
-	forum_parents clob DEFAULT '' NOT NULL,
-	forum_name varchar2(3000) DEFAULT '' NOT NULL,
-	forum_desc clob DEFAULT '' NOT NULL,
-	forum_desc_bitfield raw(255) DEFAULT '' NOT NULL,
-	forum_desc_options number(1) DEFAULT '0' NOT NULL,
-	forum_desc_uid varchar2(5) DEFAULT '' NOT NULL,
-	forum_link varchar2(255) DEFAULT '' NOT NULL,
-	forum_password varchar2(40) DEFAULT '' NOT NULL,
+	forum_parents clob DEFAULT '' ,
+	forum_name varchar2(3000) DEFAULT '' ,
+	forum_desc clob DEFAULT '' ,
+	forum_desc_bitfield raw(255) DEFAULT '' ,
+	forum_desc_options number(11) DEFAULT '0' NOT NULL,
+	forum_desc_uid varchar2(5) DEFAULT '' ,
+	forum_link varchar2(255) DEFAULT '' ,
+	forum_password varchar2(40) DEFAULT '' ,
 	forum_style number(4) DEFAULT '0' NOT NULL,
-	forum_image varchar2(255) DEFAULT '' NOT NULL,
-	forum_rules clob DEFAULT '' NOT NULL,
-	forum_rules_link varchar2(255) DEFAULT '' NOT NULL,
-	forum_rules_bitfield raw(255) DEFAULT '' NOT NULL,
-	forum_rules_options number(1) DEFAULT '0' NOT NULL,
-	forum_rules_uid varchar2(5) DEFAULT '' NOT NULL,
+	forum_image varchar2(255) DEFAULT '' ,
+	forum_rules clob DEFAULT '' ,
+	forum_rules_link varchar2(255) DEFAULT '' ,
+	forum_rules_bitfield raw(255) DEFAULT '' ,
+	forum_rules_options number(11) DEFAULT '0' NOT NULL,
+	forum_rules_uid varchar2(5) DEFAULT '' ,
 	forum_topics_per_page number(4) DEFAULT '0' NOT NULL,
 	forum_type number(4) DEFAULT '0' NOT NULL,
 	forum_status number(4) DEFAULT '0' NOT NULL,
@@ -454,7 +488,7 @@ CREATE TABLE phpbb_forums (
 	forum_last_post_id number(8) DEFAULT '0' NOT NULL,
 	forum_last_poster_id number(8) DEFAULT '0' NOT NULL,
 	forum_last_post_time number(11) DEFAULT '0' NOT NULL,
-	forum_last_poster_name varchar2(255) DEFAULT '' NOT NULL,
+	forum_last_poster_name varchar2(255) DEFAULT '' ,
 	forum_flags number(4) DEFAULT '32' NOT NULL,
 	display_on_index number(1) DEFAULT '1' NOT NULL,
 	enable_indexing number(1) DEFAULT '1' NOT NULL,
@@ -470,13 +504,13 @@ CREATE TABLE phpbb_forums (
 
 CREATE INDEX phpbb_forums_left_right_id ON phpbb_forums (left_id, right_id)
 /
-CREATE INDEX phpbb_forums_forum_last_post_id ON phpbb_forums (forum_last_post_id)
+CREATE INDEX phpbb_forums_forum_lastpost_id ON phpbb_forums (forum_last_post_id)
 /
 
 CREATE SEQUENCE phpbb_forums_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_forums_seq
+CREATE OR REPLACE TRIGGER t_phpbb_forums
 BEFORE INSERT ON phpbb_forums
 FOR EACH ROW WHEN (
 	new.forum_id IS NULL OR new.forum_id = 0
@@ -489,17 +523,21 @@ END;
 /
 
 
-/* Table: 'phpbb_forums_access' */
+/*
+	Table: 'phpbb_forums_access'
+*/
 CREATE TABLE phpbb_forums_access (
 	forum_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
-	session_id char(32) DEFAULT '' NOT NULL,
+	session_id char(32) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_forums_access PRIMARY KEY (forum_id, user_id, session_id)
 )
 /
 
 
-/* Table: 'phpbb_forums_track' */
+/*
+	Table: 'phpbb_forums_track'
+*/
 CREATE TABLE phpbb_forums_track (
 	user_id number(8) DEFAULT '0' NOT NULL,
 	forum_id number(8) DEFAULT '0' NOT NULL,
@@ -509,7 +547,9 @@ CREATE TABLE phpbb_forums_track (
 /
 
 
-/* Table: 'phpbb_forums_watch' */
+/*
+	Table: 'phpbb_forums_watch'
+*/
 CREATE TABLE phpbb_forums_watch (
 	forum_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
@@ -521,25 +561,27 @@ CREATE INDEX phpbb_forums_watch_forum_id ON phpbb_forums_watch (forum_id)
 /
 CREATE INDEX phpbb_forums_watch_user_id ON phpbb_forums_watch (user_id)
 /
-CREATE INDEX phpbb_forums_watch_notify_status ON phpbb_forums_watch (notify_status)
+CREATE INDEX phpbb_forums_watch_notify_stat ON phpbb_forums_watch (notify_status)
 /
 
-/* Table: 'phpbb_groups' */
+/*
+	Table: 'phpbb_groups'
+*/
 CREATE TABLE phpbb_groups (
 	group_id number(8) NOT NULL,
 	group_type number(4) DEFAULT '1' NOT NULL,
-	group_name varchar2(255) DEFAULT '' NOT NULL,
-	group_desc clob DEFAULT '' NOT NULL,
-	group_desc_bitfield raw(255) DEFAULT '' NOT NULL,
-	group_desc_options number(1) DEFAULT '0' NOT NULL,
-	group_desc_uid varchar2(5) DEFAULT '' NOT NULL,
+	group_name varchar2(252) DEFAULT '' ,
+	group_desc clob DEFAULT '' ,
+	group_desc_bitfield raw(255) DEFAULT '' ,
+	group_desc_options number(11) DEFAULT '0' NOT NULL,
+	group_desc_uid varchar2(5) DEFAULT '' ,
 	group_display number(1) DEFAULT '0' NOT NULL,
-	group_avatar varchar2(255) DEFAULT '' NOT NULL,
+	group_avatar varchar2(255) DEFAULT '' ,
 	group_avatar_type number(4) DEFAULT '0' NOT NULL,
 	group_avatar_width number(4) DEFAULT '0' NOT NULL,
 	group_avatar_height number(4) DEFAULT '0' NOT NULL,
 	group_rank number(8) DEFAULT '0' NOT NULL,
-	group_colour varchar2(6) DEFAULT '' NOT NULL,
+	group_colour varchar2(6) DEFAULT '' ,
 	group_sig_chars number(8) DEFAULT '0' NOT NULL,
 	group_receive_pm number(1) DEFAULT '0' NOT NULL,
 	group_message_limit number(8) DEFAULT '0' NOT NULL,
@@ -554,7 +596,7 @@ CREATE INDEX phpbb_groups_group_legend ON phpbb_groups (group_legend)
 CREATE SEQUENCE phpbb_groups_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_groups_seq
+CREATE OR REPLACE TRIGGER t_phpbb_groups
 BEFORE INSERT ON phpbb_groups
 FOR EACH ROW WHEN (
 	new.group_id IS NULL OR new.group_id = 0
@@ -567,10 +609,12 @@ END;
 /
 
 
-/* Table: 'phpbb_icons' */
+/*
+	Table: 'phpbb_icons'
+*/
 CREATE TABLE phpbb_icons (
 	icons_id number(8) NOT NULL,
-	icons_url varchar2(255) DEFAULT '' NOT NULL,
+	icons_url varchar2(255) DEFAULT '' ,
 	icons_width number(4) DEFAULT '0' NOT NULL,
 	icons_height number(4) DEFAULT '0' NOT NULL,
 	icons_order number(8) DEFAULT '0' NOT NULL,
@@ -579,11 +623,13 @@ CREATE TABLE phpbb_icons (
 )
 /
 
+CREATE INDEX phpbb_icons_display_on_posting ON phpbb_icons (display_on_posting)
+/
 
 CREATE SEQUENCE phpbb_icons_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_icons_seq
+CREATE OR REPLACE TRIGGER t_phpbb_icons
 BEFORE INSERT ON phpbb_icons
 FOR EACH ROW WHEN (
 	new.icons_id IS NULL OR new.icons_id = 0
@@ -596,14 +642,16 @@ END;
 /
 
 
-/* Table: 'phpbb_lang' */
+/*
+	Table: 'phpbb_lang'
+*/
 CREATE TABLE phpbb_lang (
 	lang_id number(4) NOT NULL,
-	lang_iso varchar2(30) DEFAULT '' NOT NULL,
-	lang_dir varchar2(30) DEFAULT '' NOT NULL,
-	lang_english_name varchar2(100) DEFAULT '' NOT NULL,
-	lang_local_name varchar2(255) DEFAULT '' NOT NULL,
-	lang_author varchar2(255) DEFAULT '' NOT NULL,
+	lang_iso varchar2(30) DEFAULT '' ,
+	lang_dir varchar2(30) DEFAULT '' ,
+	lang_english_name varchar2(100) DEFAULT '' ,
+	lang_local_name varchar2(255) DEFAULT '' ,
+	lang_author varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_lang PRIMARY KEY (lang_id)
 )
 /
@@ -614,7 +662,7 @@ CREATE INDEX phpbb_lang_lang_iso ON phpbb_lang (lang_iso)
 CREATE SEQUENCE phpbb_lang_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_lang_seq
+CREATE OR REPLACE TRIGGER t_phpbb_lang
 BEFORE INSERT ON phpbb_lang
 FOR EACH ROW WHEN (
 	new.lang_id IS NULL OR new.lang_id = 0
@@ -627,7 +675,9 @@ END;
 /
 
 
-/* Table: 'phpbb_log' */
+/*
+	Table: 'phpbb_log'
+*/
 CREATE TABLE phpbb_log (
 	log_id number(8) NOT NULL,
 	log_type number(4) DEFAULT '0' NOT NULL,
@@ -635,10 +685,10 @@ CREATE TABLE phpbb_log (
 	forum_id number(8) DEFAULT '0' NOT NULL,
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	reportee_id number(8) DEFAULT '0' NOT NULL,
-	log_ip varchar2(40) DEFAULT '' NOT NULL,
+	log_ip varchar2(40) DEFAULT '' ,
 	log_time number(11) DEFAULT '0' NOT NULL,
-	log_operation clob DEFAULT '' NOT NULL,
-	log_data clob DEFAULT '' NOT NULL,
+	log_operation clob DEFAULT '' ,
+	log_data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_log PRIMARY KEY (log_id)
 )
 /
@@ -657,7 +707,7 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id)
 CREATE SEQUENCE phpbb_log_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_log_seq
+CREATE OR REPLACE TRIGGER t_phpbb_log
 BEFORE INSERT ON phpbb_log
 FOR EACH ROW WHEN (
 	new.log_id IS NULL OR new.log_id = 0
@@ -670,35 +720,39 @@ END;
 /
 
 
-/* Table: 'phpbb_moderator_cache' */
+/*
+	Table: 'phpbb_moderator_cache'
+*/
 CREATE TABLE phpbb_moderator_cache (
 	forum_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
-	username varchar2(255) DEFAULT '' NOT NULL,
+	username varchar2(252) DEFAULT '' ,
 	group_id number(8) DEFAULT '0' NOT NULL,
-	group_name varchar2(255) DEFAULT '' NOT NULL,
+	group_name varchar2(255) DEFAULT '' ,
 	display_on_index number(1) DEFAULT '1' NOT NULL
 )
 /
 
-CREATE INDEX phpbb_moderator_cache_display_on_index ON phpbb_moderator_cache (display_on_index)
+CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on_index)
 /
 CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id)
 /
 
-/* Table: 'phpbb_modules' */
+/*
+	Table: 'phpbb_modules'
+*/
 CREATE TABLE phpbb_modules (
 	module_id number(8) NOT NULL,
 	module_enabled number(1) DEFAULT '1' NOT NULL,
 	module_display number(1) DEFAULT '1' NOT NULL,
-	module_basename varchar2(255) DEFAULT '' NOT NULL,
-	module_class varchar2(10) DEFAULT '' NOT NULL,
+	module_basename varchar2(255) DEFAULT '' ,
+	module_class varchar2(10) DEFAULT '' ,
 	parent_id number(8) DEFAULT '0' NOT NULL,
 	left_id number(8) DEFAULT '0' NOT NULL,
 	right_id number(8) DEFAULT '0' NOT NULL,
-	module_langname varchar2(255) DEFAULT '' NOT NULL,
-	module_mode varchar2(255) DEFAULT '' NOT NULL,
-	module_auth varchar2(255) DEFAULT '' NOT NULL,
+	module_langname varchar2(255) DEFAULT '' ,
+	module_mode varchar2(255) DEFAULT '' ,
+	module_auth varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_modules PRIMARY KEY (module_id)
 )
 /
@@ -713,7 +767,7 @@ CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id
 CREATE SEQUENCE phpbb_modules_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_modules_seq
+CREATE OR REPLACE TRIGGER t_phpbb_modules
 BEFORE INSERT ON phpbb_modules
 FOR EACH ROW WHEN (
 	new.module_id IS NULL OR new.module_id = 0
@@ -726,26 +780,30 @@ END;
 /
 
 
-/* Table: 'phpbb_poll_options' */
+/*
+	Table: 'phpbb_poll_options'
+*/
 CREATE TABLE phpbb_poll_options (
 	poll_option_id number(4) DEFAULT '0' NOT NULL,
 	topic_id number(8) DEFAULT '0' NOT NULL,
-	poll_option_text clob DEFAULT '' NOT NULL,
+	poll_option_text clob DEFAULT '' ,
 	poll_option_total number(8) DEFAULT '0' NOT NULL
 )
 /
 
-CREATE INDEX phpbb_poll_options_poll_option_id ON phpbb_poll_options (poll_option_id)
+CREATE INDEX phpbb_poll_options_poll_opt_id ON phpbb_poll_options (poll_option_id)
 /
 CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options (topic_id)
 /
 
-/* Table: 'phpbb_poll_votes' */
+/*
+	Table: 'phpbb_poll_votes'
+*/
 CREATE TABLE phpbb_poll_votes (
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	poll_option_id number(4) DEFAULT '0' NOT NULL,
 	vote_user_id number(8) DEFAULT '0' NOT NULL,
-	vote_user_ip varchar2(40) DEFAULT '' NOT NULL
+	vote_user_ip varchar2(40) DEFAULT '' 
 )
 /
 
@@ -756,14 +814,16 @@ CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id)
 CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip)
 /
 
-/* Table: 'phpbb_posts' */
+/*
+	Table: 'phpbb_posts'
+*/
 CREATE TABLE phpbb_posts (
 	post_id number(8) NOT NULL,
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	forum_id number(8) DEFAULT '0' NOT NULL,
 	poster_id number(8) DEFAULT '0' NOT NULL,
 	icon_id number(8) DEFAULT '0' NOT NULL,
-	poster_ip varchar2(40) DEFAULT '' NOT NULL,
+	poster_ip varchar2(40) DEFAULT '' ,
 	post_time number(11) DEFAULT '0' NOT NULL,
 	post_approved number(1) DEFAULT '1' NOT NULL,
 	post_reported number(1) DEFAULT '0' NOT NULL,
@@ -771,17 +831,17 @@ CREATE TABLE phpbb_posts (
 	enable_smilies number(1) DEFAULT '1' NOT NULL,
 	enable_magic_url number(1) DEFAULT '1' NOT NULL,
 	enable_sig number(1) DEFAULT '1' NOT NULL,
-	post_username varchar2(255) DEFAULT '' NOT NULL,
-	post_subject varchar2(1000) DEFAULT '' NOT NULL,
-	post_text clob DEFAULT '' NOT NULL,
-	post_checksum varchar2(32) DEFAULT '' NOT NULL,
+	post_username varchar2(252) DEFAULT '' ,
+	post_subject varchar2(1000) DEFAULT '' ,
+	post_text clob DEFAULT '' ,
+	post_checksum varchar2(32) DEFAULT '' ,
 	post_encoding varchar2(20) DEFAULT 'iso-8859-1' NOT NULL,
 	post_attachment number(1) DEFAULT '0' NOT NULL,
-	bbcode_bitfield raw(255) DEFAULT '' NOT NULL,
-	bbcode_uid varchar2(5) DEFAULT '' NOT NULL,
+	bbcode_bitfield raw(255) DEFAULT '' ,
+	bbcode_uid varchar2(5) DEFAULT '' ,
 	post_postcount number(1) DEFAULT '1' NOT NULL,
 	post_edit_time number(11) DEFAULT '0' NOT NULL,
-	post_edit_reason varchar2(3000) DEFAULT '' NOT NULL,
+	post_edit_reason varchar2(3000) DEFAULT '' ,
 	post_edit_user number(8) DEFAULT '0' NOT NULL,
 	post_edit_count number(4) DEFAULT '0' NOT NULL,
 	post_edit_locked number(1) DEFAULT '0' NOT NULL,
@@ -807,7 +867,7 @@ CREATE INDEX phpbb_posts_post_time ON phpbb_posts (post_time)
 CREATE SEQUENCE phpbb_posts_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_posts_seq
+CREATE OR REPLACE TRIGGER t_phpbb_posts
 BEFORE INSERT ON phpbb_posts
 FOR EACH ROW WHEN (
 	new.post_id IS NULL OR new.post_id = 0
@@ -820,30 +880,32 @@ END;
 /
 
 
-/* Table: 'phpbb_privmsgs' */
+/*
+	Table: 'phpbb_privmsgs'
+*/
 CREATE TABLE phpbb_privmsgs (
 	msg_id number(8) NOT NULL,
 	root_level number(8) DEFAULT '0' NOT NULL,
 	author_id number(8) DEFAULT '0' NOT NULL,
 	icon_id number(8) DEFAULT '0' NOT NULL,
-	author_ip varchar2(40) DEFAULT '' NOT NULL,
+	author_ip varchar2(40) DEFAULT '' ,
 	message_time number(11) DEFAULT '0' NOT NULL,
 	enable_bbcode number(1) DEFAULT '1' NOT NULL,
 	enable_smilies number(1) DEFAULT '1' NOT NULL,
 	enable_magic_url number(1) DEFAULT '1' NOT NULL,
 	enable_sig number(1) DEFAULT '1' NOT NULL,
-	message_subject varchar2(1000) DEFAULT '' NOT NULL,
-	message_text clob DEFAULT '' NOT NULL,
-	message_edit_reason varchar2(3000) DEFAULT '' NOT NULL,
+	message_subject varchar2(1000) DEFAULT '' ,
+	message_text clob DEFAULT '' ,
+	message_edit_reason varchar2(3000) DEFAULT '' ,
 	message_edit_user number(8) DEFAULT '0' NOT NULL,
 	message_encoding varchar2(20) DEFAULT 'iso-8859-1' NOT NULL,
 	message_attachment number(1) DEFAULT '0' NOT NULL,
-	bbcode_bitfield raw(255) DEFAULT '' NOT NULL,
-	bbcode_uid varchar2(5) DEFAULT '' NOT NULL,
+	bbcode_bitfield raw(255) DEFAULT '' ,
+	bbcode_uid varchar2(5) DEFAULT '' ,
 	message_edit_time number(11) DEFAULT '0' NOT NULL,
 	message_edit_count number(4) DEFAULT '0' NOT NULL,
-	to_address clob DEFAULT '' NOT NULL,
-	bcc_address clob DEFAULT '' NOT NULL,
+	to_address clob DEFAULT '' ,
+	bcc_address clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_privmsgs PRIMARY KEY (msg_id)
 )
 /
@@ -860,7 +922,7 @@ CREATE INDEX phpbb_privmsgs_root_level ON phpbb_privmsgs (root_level)
 CREATE SEQUENCE phpbb_privmsgs_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_privmsgs_seq
+CREATE OR REPLACE TRIGGER t_phpbb_privmsgs
 BEFORE INSERT ON phpbb_privmsgs
 FOR EACH ROW WHEN (
 	new.msg_id IS NULL OR new.msg_id = 0
@@ -873,11 +935,13 @@ END;
 /
 
 
-/* Table: 'phpbb_privmsgs_folder' */
+/*
+	Table: 'phpbb_privmsgs_folder'
+*/
 CREATE TABLE phpbb_privmsgs_folder (
 	folder_id number(8) NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
-	folder_name varchar2(255) DEFAULT '' NOT NULL,
+	folder_name varchar2(255) DEFAULT '' ,
 	pm_count number(8) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_privmsgs_folder PRIMARY KEY (folder_id)
 )
@@ -889,7 +953,7 @@ CREATE INDEX phpbb_privmsgs_folder_user_id ON phpbb_privmsgs_folder (user_id)
 CREATE SEQUENCE phpbb_privmsgs_folder_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_privmsgs_folder_seq
+CREATE OR REPLACE TRIGGER t_phpbb_privmsgs_folder
 BEFORE INSERT ON phpbb_privmsgs_folder
 FOR EACH ROW WHEN (
 	new.folder_id IS NULL OR new.folder_id = 0
@@ -902,17 +966,19 @@ END;
 /
 
 
-/* Table: 'phpbb_privmsgs_rules' */
+/*
+	Table: 'phpbb_privmsgs_rules'
+*/
 CREATE TABLE phpbb_privmsgs_rules (
 	rule_id number(8) NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	rule_check number(8) DEFAULT '0' NOT NULL,
 	rule_connection number(8) DEFAULT '0' NOT NULL,
-	rule_string varchar2(255) DEFAULT '' NOT NULL,
+	rule_string varchar2(255) DEFAULT '' ,
 	rule_user_id number(8) DEFAULT '0' NOT NULL,
 	rule_group_id number(8) DEFAULT '0' NOT NULL,
 	rule_action number(8) DEFAULT '0' NOT NULL,
-	rule_folder_id number(8) DEFAULT '0' NOT NULL,
+	rule_folder_id number(4) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_privmsgs_rules PRIMARY KEY (rule_id)
 )
 /
@@ -921,7 +987,7 @@ CREATE TABLE phpbb_privmsgs_rules (
 CREATE SEQUENCE phpbb_privmsgs_rules_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_privmsgs_rules_seq
+CREATE OR REPLACE TRIGGER t_phpbb_privmsgs_rules
 BEFORE INSERT ON phpbb_privmsgs_rules
 FOR EACH ROW WHEN (
 	new.rule_id IS NULL OR new.rule_id = 0
@@ -934,7 +1000,9 @@ END;
 /
 
 
-/* Table: 'phpbb_privmsgs_to' */
+/*
+	Table: 'phpbb_privmsgs_to'
+*/
 CREATE TABLE phpbb_privmsgs_to (
 	msg_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
@@ -945,27 +1013,29 @@ CREATE TABLE phpbb_privmsgs_to (
 	pm_replied number(1) DEFAULT '0' NOT NULL,
 	pm_marked number(1) DEFAULT '0' NOT NULL,
 	pm_forwarded number(1) DEFAULT '0' NOT NULL,
-	folder_id number(8) DEFAULT '0' NOT NULL
+	folder_id number(4) DEFAULT '0' NOT NULL
 )
 /
 
 CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id)
 /
-CREATE INDEX phpbb_privmsgs_to_user_folder_id ON phpbb_privmsgs_to (user_id, folder_id)
+CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to (user_id, folder_id)
 /
 
-/* Table: 'phpbb_profile_fields' */
+/*
+	Table: 'phpbb_profile_fields'
+*/
 CREATE TABLE phpbb_profile_fields (
 	field_id number(8) NOT NULL,
-	field_name varchar2(255) DEFAULT '' NOT NULL,
+	field_name varchar2(255) DEFAULT '' ,
 	field_type number(4) DEFAULT '0' NOT NULL,
-	field_ident varchar2(20) DEFAULT '' NOT NULL,
-	field_length varchar2(20) DEFAULT '' NOT NULL,
-	field_minlen varchar2(255) DEFAULT '' NOT NULL,
-	field_maxlen varchar2(255) DEFAULT '' NOT NULL,
-	field_novalue varchar2(255) DEFAULT '' NOT NULL,
-	field_default_value varchar2(255) DEFAULT '' NOT NULL,
-	field_validation varchar2(20) DEFAULT '' NOT NULL,
+	field_ident varchar2(20) DEFAULT '' ,
+	field_length varchar2(20) DEFAULT '' ,
+	field_minlen varchar2(255) DEFAULT '' ,
+	field_maxlen varchar2(255) DEFAULT '' ,
+	field_novalue varchar2(255) DEFAULT '' ,
+	field_default_value varchar2(255) DEFAULT '' ,
+	field_validation varchar2(20) DEFAULT '' ,
 	field_required number(1) DEFAULT '0' NOT NULL,
 	field_show_on_reg number(1) DEFAULT '0' NOT NULL,
 	field_hide number(1) DEFAULT '0' NOT NULL,
@@ -976,15 +1046,15 @@ CREATE TABLE phpbb_profile_fields (
 )
 /
 
-CREATE INDEX phpbb_profile_fields_field_type ON phpbb_profile_fields (field_type)
+CREATE INDEX phpbb_profile_fields_fld_type ON phpbb_profile_fields (field_type)
 /
-CREATE INDEX phpbb_profile_fields_field_order ON phpbb_profile_fields (field_order)
+CREATE INDEX phpbb_profile_fields_fld_ordr ON phpbb_profile_fields (field_order)
 /
 
 CREATE SEQUENCE phpbb_profile_fields_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_profile_fields_seq
+CREATE OR REPLACE TRIGGER t_phpbb_profile_fields
 BEFORE INSERT ON phpbb_profile_fields
 FOR EACH ROW WHEN (
 	new.field_id IS NULL OR new.field_id = 0
@@ -997,7 +1067,9 @@ END;
 /
 
 
-/* Table: 'phpbb_profile_fields_data' */
+/*
+	Table: 'phpbb_profile_fields_data'
+*/
 CREATE TABLE phpbb_profile_fields_data (
 	user_id number(8) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_profile_fields_data PRIMARY KEY (user_id)
@@ -1005,37 +1077,43 @@ CREATE TABLE phpbb_profile_fields_data (
 /
 
 
-/* Table: 'phpbb_profile_fields_lang' */
+/*
+	Table: 'phpbb_profile_fields_lang'
+*/
 CREATE TABLE phpbb_profile_fields_lang (
 	field_id number(8) DEFAULT '0' NOT NULL,
 	lang_id number(8) DEFAULT '0' NOT NULL,
 	option_id number(8) DEFAULT '0' NOT NULL,
 	field_type number(4) DEFAULT '0' NOT NULL,
-	lang_value varchar2(255) DEFAULT '' NOT NULL,
+	lang_value varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_profile_fields_lang PRIMARY KEY (field_id, lang_id, option_id)
 )
 /
 
 
-/* Table: 'phpbb_profile_lang' */
+/*
+	Table: 'phpbb_profile_lang'
+*/
 CREATE TABLE phpbb_profile_lang (
 	field_id number(8) DEFAULT '0' NOT NULL,
 	lang_id number(8) DEFAULT '0' NOT NULL,
-	lang_name varchar2(255) DEFAULT '' NOT NULL,
-	lang_explain clob DEFAULT '' NOT NULL,
-	lang_default_value varchar2(255) DEFAULT '' NOT NULL,
+	lang_name varchar2(255) DEFAULT '' ,
+	lang_explain clob DEFAULT '' ,
+	lang_default_value varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_profile_lang PRIMARY KEY (field_id, lang_id)
 )
 /
 
 
-/* Table: 'phpbb_ranks' */
+/*
+	Table: 'phpbb_ranks'
+*/
 CREATE TABLE phpbb_ranks (
 	rank_id number(8) NOT NULL,
-	rank_title varchar2(255) DEFAULT '' NOT NULL,
+	rank_title varchar2(255) DEFAULT '' ,
 	rank_min number(8) DEFAULT '0' NOT NULL,
 	rank_special number(1) DEFAULT '0' NOT NULL,
-	rank_image varchar2(255) DEFAULT '' NOT NULL,
+	rank_image varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_ranks PRIMARY KEY (rank_id)
 )
 /
@@ -1044,7 +1122,7 @@ CREATE TABLE phpbb_ranks (
 CREATE SEQUENCE phpbb_ranks_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_ranks_seq
+CREATE OR REPLACE TRIGGER t_phpbb_ranks
 BEFORE INSERT ON phpbb_ranks
 FOR EACH ROW WHEN (
 	new.rank_id IS NULL OR new.rank_id = 0
@@ -1057,7 +1135,9 @@ END;
 /
 
 
-/* Table: 'phpbb_reports' */
+/*
+	Table: 'phpbb_reports'
+*/
 CREATE TABLE phpbb_reports (
 	report_id number(8) NOT NULL,
 	reason_id number(4) DEFAULT '0' NOT NULL,
@@ -1066,7 +1146,7 @@ CREATE TABLE phpbb_reports (
 	user_notify number(1) DEFAULT '0' NOT NULL,
 	report_closed number(1) DEFAULT '0' NOT NULL,
 	report_time number(11) DEFAULT '0' NOT NULL,
-	report_text clob DEFAULT '' NOT NULL,
+	report_text clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
 )
 /
@@ -1075,7 +1155,7 @@ CREATE TABLE phpbb_reports (
 CREATE SEQUENCE phpbb_reports_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_reports_seq
+CREATE OR REPLACE TRIGGER t_phpbb_reports
 BEFORE INSERT ON phpbb_reports
 FOR EACH ROW WHEN (
 	new.report_id IS NULL OR new.report_id = 0
@@ -1088,11 +1168,13 @@ END;
 /
 
 
-/* Table: 'phpbb_reports_reasons' */
+/*
+	Table: 'phpbb_reports_reasons'
+*/
 CREATE TABLE phpbb_reports_reasons (
 	reason_id number(4) NOT NULL,
-	reason_title varchar2(255) DEFAULT '' NOT NULL,
-	reason_description clob DEFAULT '' NOT NULL,
+	reason_title varchar2(255) DEFAULT '' ,
+	reason_description clob DEFAULT '' ,
 	reason_order number(4) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_reports_reasons PRIMARY KEY (reason_id)
 )
@@ -1102,7 +1184,7 @@ CREATE TABLE phpbb_reports_reasons (
 CREATE SEQUENCE phpbb_reports_reasons_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_reports_reasons_seq
+CREATE OR REPLACE TRIGGER t_phpbb_reports_reasons
 BEFORE INSERT ON phpbb_reports_reasons
 FOR EACH ROW WHEN (
 	new.reason_id IS NULL OR new.reason_id = 0
@@ -1115,33 +1197,36 @@ END;
 /
 
 
-/* Table: 'phpbb_search_results' */
+/*
+	Table: 'phpbb_search_results'
+*/
 CREATE TABLE phpbb_search_results (
-	search_key varchar2(32) DEFAULT '' NOT NULL,
+	search_key varchar2(32) DEFAULT '' ,
 	search_time number(11) DEFAULT '0' NOT NULL,
-	search_keywords clob DEFAULT '' NOT NULL,
-	search_authors clob DEFAULT '' NOT NULL,
+	search_keywords clob DEFAULT '' ,
+	search_authors clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_search_results PRIMARY KEY (search_key)
 )
 /
 
 
-/* Table: 'phpbb_search_wordlist' */
+/*
+	Table: 'phpbb_search_wordlist'
+*/
 CREATE TABLE phpbb_search_wordlist (
-	word_text varchar2(252) DEFAULT '' NOT NULL,
 	word_id number(8) NOT NULL,
+	word_text varchar2(252) DEFAULT '' ,
 	word_common number(1) DEFAULT '0' NOT NULL,
-	CONSTRAINT pk_phpbb_search_wordlist PRIMARY KEY (word_text)
+	CONSTRAINT pk_phpbb_search_wordlist PRIMARY KEY (word_id),
+	CONSTRAINT u_phpbb_wrd_txt UNIQUE (word_text)
 )
 /
 
-CREATE INDEX phpbb_search_wordlist_word_id ON phpbb_search_wordlist (word_id)
-/
 
 CREATE SEQUENCE phpbb_search_wordlist_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_search_wordlist_seq
+CREATE OR REPLACE TRIGGER t_phpbb_search_wordlist
 BEFORE INSERT ON phpbb_search_wordlist
 FOR EACH ROW WHEN (
 	new.word_id IS NULL OR new.word_id = 0
@@ -1154,7 +1239,9 @@ END;
 /
 
 
-/* Table: 'phpbb_search_wordmatch' */
+/*
+	Table: 'phpbb_search_wordmatch'
+*/
 CREATE TABLE phpbb_search_wordmatch (
 	post_id number(8) DEFAULT '0' NOT NULL,
 	word_id number(8) DEFAULT '0' NOT NULL,
@@ -1165,16 +1252,18 @@ CREATE TABLE phpbb_search_wordmatch (
 CREATE INDEX phpbb_search_wordmatch_word_id ON phpbb_search_wordmatch (word_id)
 /
 
-/* Table: 'phpbb_sessions' */
+/*
+	Table: 'phpbb_sessions'
+*/
 CREATE TABLE phpbb_sessions (
-	session_id char(32) DEFAULT '' NOT NULL,
+	session_id char(32) DEFAULT '' ,
 	session_user_id number(8) DEFAULT '0' NOT NULL,
 	session_last_visit number(11) DEFAULT '0' NOT NULL,
 	session_start number(11) DEFAULT '0' NOT NULL,
 	session_time number(11) DEFAULT '0' NOT NULL,
-	session_ip varchar2(40) DEFAULT '' NOT NULL,
-	session_browser varchar2(150) DEFAULT '' NOT NULL,
-	session_page varchar2(255) DEFAULT '' NOT NULL,
+	session_ip varchar2(40) DEFAULT '' ,
+	session_browser varchar2(150) DEFAULT '' ,
+	session_page varchar2(255) DEFAULT '' ,
 	session_viewonline number(1) DEFAULT '1' NOT NULL,
 	session_autologin number(1) DEFAULT '0' NOT NULL,
 	session_admin number(1) DEFAULT '0' NOT NULL,
@@ -1187,11 +1276,13 @@ CREATE INDEX phpbb_sessions_session_time ON phpbb_sessions (session_time)
 CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions (session_user_id)
 /
 
-/* Table: 'phpbb_sessions_keys' */
+/*
+	Table: 'phpbb_sessions_keys'
+*/
 CREATE TABLE phpbb_sessions_keys (
-	key_id char(32) DEFAULT '' NOT NULL,
+	key_id char(32) DEFAULT '' ,
 	user_id number(8) DEFAULT '0' NOT NULL,
-	last_ip varchar2(40) DEFAULT '' NOT NULL,
+	last_ip varchar2(40) DEFAULT '' ,
 	last_login number(11) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_sessions_keys PRIMARY KEY (key_id, user_id)
 )
@@ -1200,11 +1291,13 @@ CREATE TABLE phpbb_sessions_keys (
 CREATE INDEX phpbb_sessions_keys_last_login ON phpbb_sessions_keys (last_login)
 /
 
-/* Table: 'phpbb_sitelist' */
+/*
+	Table: 'phpbb_sitelist'
+*/
 CREATE TABLE phpbb_sitelist (
 	site_id number(8) NOT NULL,
-	site_ip varchar2(40) DEFAULT '' NOT NULL,
-	site_hostname varchar2(255) DEFAULT '' NOT NULL,
+	site_ip varchar2(40) DEFAULT '' ,
+	site_hostname varchar2(255) DEFAULT '' ,
 	ip_exclude number(1) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_sitelist PRIMARY KEY (site_id)
 )
@@ -1214,7 +1307,7 @@ CREATE TABLE phpbb_sitelist (
 CREATE SEQUENCE phpbb_sitelist_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_sitelist_seq
+CREATE OR REPLACE TRIGGER t_phpbb_sitelist
 BEFORE INSERT ON phpbb_sitelist
 FOR EACH ROW WHEN (
 	new.site_id IS NULL OR new.site_id = 0
@@ -1227,12 +1320,14 @@ END;
 /
 
 
-/* Table: 'phpbb_smilies' */
+/*
+	Table: 'phpbb_smilies'
+*/
 CREATE TABLE phpbb_smilies (
 	smiley_id number(8) NOT NULL,
-	code varchar2(50) DEFAULT '' NOT NULL,
-	emotion varchar2(50) DEFAULT '' NOT NULL,
-	smiley_url varchar2(50) DEFAULT '' NOT NULL,
+	code varchar2(50) DEFAULT '' ,
+	emotion varchar2(50) DEFAULT '' ,
+	smiley_url varchar2(50) DEFAULT '' ,
 	smiley_width number(4) DEFAULT '0' NOT NULL,
 	smiley_height number(4) DEFAULT '0' NOT NULL,
 	smiley_order number(8) DEFAULT '0' NOT NULL,
@@ -1241,13 +1336,13 @@ CREATE TABLE phpbb_smilies (
 )
 /
 
-CREATE INDEX phpbb_smilies_display_on_posting ON phpbb_smilies (display_on_posting)
+CREATE INDEX phpbb_smilies_display_on_post ON phpbb_smilies (display_on_posting)
 /
 
 CREATE SEQUENCE phpbb_smilies_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_smilies_seq
+CREATE OR REPLACE TRIGGER t_phpbb_smilies
 BEFORE INSERT ON phpbb_smilies
 FOR EACH ROW WHEN (
 	new.smiley_id IS NULL OR new.smiley_id = 0
@@ -1260,11 +1355,13 @@ END;
 /
 
 
-/* Table: 'phpbb_styles' */
+/*
+	Table: 'phpbb_styles'
+*/
 CREATE TABLE phpbb_styles (
 	style_id number(4) NOT NULL,
-	style_name varchar2(255) DEFAULT '' NOT NULL,
-	style_copyright varchar2(255) DEFAULT '' NOT NULL,
+	style_name varchar2(252) DEFAULT '' ,
+	style_copyright varchar2(255) DEFAULT '' ,
 	style_active number(1) DEFAULT '1' NOT NULL,
 	template_id number(4) DEFAULT '0' NOT NULL,
 	theme_id number(4) DEFAULT '0' NOT NULL,
@@ -1284,7 +1381,7 @@ CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles (imageset_id)
 CREATE SEQUENCE phpbb_styles_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_styles_seq
+CREATE OR REPLACE TRIGGER t_phpbb_styles
 BEFORE INSERT ON phpbb_styles
 FOR EACH ROW WHEN (
 	new.style_id IS NULL OR new.style_id = 0
@@ -1297,16 +1394,18 @@ END;
 /
 
 
-/* Table: 'phpbb_styles_template' */
+/*
+	Table: 'phpbb_styles_template'
+*/
 CREATE TABLE phpbb_styles_template (
 	template_id number(4) NOT NULL,
-	template_name varchar2(255) DEFAULT '' NOT NULL,
-	template_copyright varchar2(255) DEFAULT '' NOT NULL,
-	template_path varchar2(100) DEFAULT '' NOT NULL,
+	template_name varchar2(252) DEFAULT '' ,
+	template_copyright varchar2(255) DEFAULT '' ,
+	template_path varchar2(100) DEFAULT '' ,
 	bbcode_bitfield raw(255) DEFAULT '90D8' NOT NULL,
 	template_storedb number(1) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_styles_template PRIMARY KEY (template_id),
-	CONSTRAINT u_phpbb_template_name UNIQUE (template_name)
+	CONSTRAINT u_phpbb_tmplte_nm UNIQUE (template_name)
 )
 /
 
@@ -1314,7 +1413,7 @@ CREATE TABLE phpbb_styles_template (
 CREATE SEQUENCE phpbb_styles_template_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_styles_template_seq
+CREATE OR REPLACE TRIGGER t_phpbb_styles_template
 BEFORE INSERT ON phpbb_styles_template
 FOR EACH ROW WHEN (
 	new.template_id IS NULL OR new.template_id = 0
@@ -1327,25 +1426,27 @@ END;
 /
 
 
-/* Table: 'phpbb_styles_template_data' */
+/*
+	Table: 'phpbb_styles_template_data'
+*/
 CREATE TABLE phpbb_styles_template_data (
 	template_id number(4) NOT NULL,
-	template_filename varchar2(100) DEFAULT '' NOT NULL,
-	template_included clob DEFAULT '' NOT NULL,
+	template_filename varchar2(100) DEFAULT '' ,
+	template_included clob DEFAULT '' ,
 	template_mtime number(11) DEFAULT '0' NOT NULL,
-	template_data clob DEFAULT '' NOT NULL
+	template_data clob DEFAULT '' 
 )
 /
 
-CREATE INDEX phpbb_styles_template_data_template_id ON phpbb_styles_template_data (template_id)
+CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data (template_id)
 /
-CREATE INDEX phpbb_styles_template_data_template_filename ON phpbb_styles_template_data (template_filename)
+CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data (template_filename)
 /
 
 CREATE SEQUENCE phpbb_styles_template_data_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_styles_template_data_seq
+CREATE OR REPLACE TRIGGER t_phpbb_styles_template_data
 BEFORE INSERT ON phpbb_styles_template_data
 FOR EACH ROW WHEN (
 	new.template_id IS NULL OR new.template_id = 0
@@ -1358,15 +1459,17 @@ END;
 /
 
 
-/* Table: 'phpbb_styles_theme' */
+/*
+	Table: 'phpbb_styles_theme'
+*/
 CREATE TABLE phpbb_styles_theme (
 	theme_id number(4) NOT NULL,
-	theme_name varchar2(255) DEFAULT '' NOT NULL,
-	theme_copyright varchar2(255) DEFAULT '' NOT NULL,
-	theme_path varchar2(100) DEFAULT '' NOT NULL,
+	theme_name varchar2(252) DEFAULT '' ,
+	theme_copyright varchar2(255) DEFAULT '' ,
+	theme_path varchar2(100) DEFAULT '' ,
 	theme_storedb number(1) DEFAULT '0' NOT NULL,
 	theme_mtime number(11) DEFAULT '0' NOT NULL,
-	theme_data clob DEFAULT '' NOT NULL,
+	theme_data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_styles_theme PRIMARY KEY (theme_id),
 	CONSTRAINT u_phpbb_theme_name UNIQUE (theme_name)
 )
@@ -1376,7 +1479,7 @@ CREATE TABLE phpbb_styles_theme (
 CREATE SEQUENCE phpbb_styles_theme_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_styles_theme_seq
+CREATE OR REPLACE TRIGGER t_phpbb_styles_theme
 BEFORE INSERT ON phpbb_styles_theme
 FOR EACH ROW WHEN (
 	new.theme_id IS NULL OR new.theme_id = 0
@@ -1389,104 +1492,110 @@ END;
 /
 
 
-/* Table: 'phpbb_styles_imageset' */
+/*
+	Table: 'phpbb_styles_imageset'
+*/
 CREATE TABLE phpbb_styles_imageset (
 	imageset_id number(4) NOT NULL,
-	imageset_name varchar2(255) DEFAULT '' NOT NULL,
-	imageset_copyright varchar2(255) DEFAULT '' NOT NULL,
-	imageset_path varchar2(100) DEFAULT '' NOT NULL,
-	site_logo varchar2(200) DEFAULT '' NOT NULL,
-	btn_post varchar2(200) DEFAULT '' NOT NULL,
-	btn_post_pm varchar2(200) DEFAULT '' NOT NULL,
-	btn_reply varchar2(200) DEFAULT '' NOT NULL,
-	btn_reply_pm varchar2(200) DEFAULT '' NOT NULL,
-	btn_locked varchar2(200) DEFAULT '' NOT NULL,
-	btn_profile varchar2(200) DEFAULT '' NOT NULL,
-	btn_pm varchar2(200) DEFAULT '' NOT NULL,
-	btn_delete varchar2(200) DEFAULT '' NOT NULL,
-	btn_info varchar2(200) DEFAULT '' NOT NULL,
-	btn_quote varchar2(200) DEFAULT '' NOT NULL,
-	btn_search varchar2(200) DEFAULT '' NOT NULL,
-	btn_edit varchar2(200) DEFAULT '' NOT NULL,
-	btn_report varchar2(200) DEFAULT '' NOT NULL,
-	btn_warn varchar2(200) DEFAULT '' NOT NULL,
-	btn_email varchar2(200) DEFAULT '' NOT NULL,
-	btn_www varchar2(200) DEFAULT '' NOT NULL,
-	btn_icq varchar2(200) DEFAULT '' NOT NULL,
-	btn_aim varchar2(200) DEFAULT '' NOT NULL,
-	btn_yim varchar2(200) DEFAULT '' NOT NULL,
-	btn_msnm varchar2(200) DEFAULT '' NOT NULL,
-	btn_jabber varchar2(200) DEFAULT '' NOT NULL,
-	btn_online varchar2(200) DEFAULT '' NOT NULL,
-	btn_offline varchar2(200) DEFAULT '' NOT NULL,
-	btn_friend varchar2(200) DEFAULT '' NOT NULL,
-	btn_foe varchar2(200) DEFAULT '' NOT NULL,
-	icon_unapproved varchar2(200) DEFAULT '' NOT NULL,
-	icon_reported varchar2(200) DEFAULT '' NOT NULL,
-	icon_attach varchar2(200) DEFAULT '' NOT NULL,
-	icon_post varchar2(200) DEFAULT '' NOT NULL,
-	icon_post_new varchar2(200) DEFAULT '' NOT NULL,
-	icon_post_latest varchar2(200) DEFAULT '' NOT NULL,
-	icon_post_newest varchar2(200) DEFAULT '' NOT NULL,
-	forum varchar2(200) DEFAULT '' NOT NULL,
-	forum_new varchar2(200) DEFAULT '' NOT NULL,
-	forum_locked varchar2(200) DEFAULT '' NOT NULL,
-	forum_link varchar2(200) DEFAULT '' NOT NULL,
-	sub_forum varchar2(200) DEFAULT '' NOT NULL,
-	sub_forum_new varchar2(200) DEFAULT '' NOT NULL,
-	folder varchar2(200) DEFAULT '' NOT NULL,
-	folder_moved varchar2(200) DEFAULT '' NOT NULL,
-	folder_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_new_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_hot varchar2(200) DEFAULT '' NOT NULL,
-	folder_hot_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_hot_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_hot_new_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_new_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_announce varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_new_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_global varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_global_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_global_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_global_new_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_new_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_sticky varchar2(200) DEFAULT '' NOT NULL,
-	folder_sticky_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_sticky_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_sticky_new_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_announce varchar2(200) DEFAULT '' NOT NULL,
-	folder_announce_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_announce_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_announce_new_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_global varchar2(200) DEFAULT '' NOT NULL,
-	folder_global_post varchar2(200) DEFAULT '' NOT NULL,
-	folder_global_new varchar2(200) DEFAULT '' NOT NULL,
-	folder_global_new_post varchar2(200) DEFAULT '' NOT NULL,
-	poll_left varchar2(200) DEFAULT '' NOT NULL,
-	poll_center varchar2(200) DEFAULT '' NOT NULL,
-	poll_right varchar2(200) DEFAULT '' NOT NULL,
-	attach_progress_bar varchar2(200) DEFAULT '' NOT NULL,
-	user_icon1 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon2 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon3 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon4 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon5 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon6 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon7 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon8 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon9 varchar2(200) DEFAULT '' NOT NULL,
-	user_icon10 varchar2(200) DEFAULT '' NOT NULL,
+	imageset_name varchar2(252) DEFAULT '' ,
+	imageset_copyright varchar2(255) DEFAULT '' ,
+	imageset_path varchar2(100) DEFAULT '' ,
+	site_logo varchar2(200) DEFAULT '' ,
+	upload_bar varchar2(200) DEFAULT '' ,
+	poll_left varchar2(200) DEFAULT '' ,
+	poll_center varchar2(200) DEFAULT '' ,
+	poll_right varchar2(200) DEFAULT '' ,
+	icon_friend varchar2(200) DEFAULT '' ,
+	icon_foe varchar2(200) DEFAULT '' ,
+	forum_link varchar2(200) DEFAULT '' ,
+	forum_read varchar2(200) DEFAULT '' ,
+	forum_read_locked varchar2(200) DEFAULT '' ,
+	forum_read_subforum varchar2(200) DEFAULT '' ,
+	forum_unread varchar2(200) DEFAULT '' ,
+	forum_unread_locked varchar2(200) DEFAULT '' ,
+	forum_unread_subforum varchar2(200) DEFAULT '' ,
+	topic_moved varchar2(200) DEFAULT '' ,
+	topic_read varchar2(200) DEFAULT '' ,
+	topic_read_mine varchar2(200) DEFAULT '' ,
+	topic_read_hot varchar2(200) DEFAULT '' ,
+	topic_read_hot_mine varchar2(200) DEFAULT '' ,
+	topic_read_locked varchar2(200) DEFAULT '' ,
+	topic_read_locked_mine varchar2(200) DEFAULT '' ,
+	topic_unread varchar2(200) DEFAULT '' ,
+	topic_unread_mine varchar2(200) DEFAULT '' ,
+	topic_unread_hot varchar2(200) DEFAULT '' ,
+	topic_unread_hot_mine varchar2(200) DEFAULT '' ,
+	topic_unread_locked varchar2(200) DEFAULT '' ,
+	topic_unread_locked_mine varchar2(200) DEFAULT '' ,
+	sticky_read varchar2(200) DEFAULT '' ,
+	sticky_read_mine varchar2(200) DEFAULT '' ,
+	sticky_read_locked varchar2(200) DEFAULT '' ,
+	sticky_read_locked_mine varchar2(200) DEFAULT '' ,
+	sticky_unread varchar2(200) DEFAULT '' ,
+	sticky_unread_mine varchar2(200) DEFAULT '' ,
+	sticky_unread_locked varchar2(200) DEFAULT '' ,
+	sticky_unread_locked_mine varchar2(200) DEFAULT '' ,
+	announce_read varchar2(200) DEFAULT '' ,
+	announce_read_mine varchar2(200) DEFAULT '' ,
+	announce_read_locked varchar2(200) DEFAULT '' ,
+	announce_read_locked_mine varchar2(200) DEFAULT '' ,
+	announce_unread varchar2(200) DEFAULT '' ,
+	announce_unread_mine varchar2(200) DEFAULT '' ,
+	announce_unread_locked varchar2(200) DEFAULT '' ,
+	announce_unread_locked_mine varchar2(200) DEFAULT '' ,
+	global_read varchar2(200) DEFAULT '' ,
+	global_read_mine varchar2(200) DEFAULT '' ,
+	global_read_locked varchar2(200) DEFAULT '' ,
+	global_read_locked_mine varchar2(200) DEFAULT '' ,
+	global_unread varchar2(200) DEFAULT '' ,
+	global_unread_mine varchar2(200) DEFAULT '' ,
+	global_unread_locked varchar2(200) DEFAULT '' ,
+	global_unread_locked_mine varchar2(200) DEFAULT '' ,
+	pm_read varchar2(200) DEFAULT '' ,
+	pm_unread varchar2(200) DEFAULT '' ,
+	icon_contact_aim varchar2(200) DEFAULT '' ,
+	icon_contact_email varchar2(200) DEFAULT '' ,
+	icon_contact_icq varchar2(200) DEFAULT '' ,
+	icon_contact_jabber varchar2(200) DEFAULT '' ,
+	icon_contact_msnm varchar2(200) DEFAULT '' ,
+	icon_contact_pm varchar2(200) DEFAULT '' ,
+	icon_contact_yahoo varchar2(200) DEFAULT '' ,
+	icon_contact_www varchar2(200) DEFAULT '' ,
+	icon_post_delete varchar2(200) DEFAULT '' ,
+	icon_post_edit varchar2(200) DEFAULT '' ,
+	icon_post_info varchar2(200) DEFAULT '' ,
+	icon_post_quote varchar2(200) DEFAULT '' ,
+	icon_post_report varchar2(200) DEFAULT '' ,
+	icon_post_target varchar2(200) DEFAULT '' ,
+	icon_post_target_unread varchar2(200) DEFAULT '' ,
+	icon_topic_attach varchar2(200) DEFAULT '' ,
+	icon_topic_latest varchar2(200) DEFAULT '' ,
+	icon_topic_newest varchar2(200) DEFAULT '' ,
+	icon_topic_reported varchar2(200) DEFAULT '' ,
+	icon_topic_unapproved varchar2(200) DEFAULT '' ,
+	icon_user_online varchar2(200) DEFAULT '' ,
+	icon_user_offline varchar2(200) DEFAULT '' ,
+	icon_user_profile varchar2(200) DEFAULT '' ,
+	icon_user_search varchar2(200) DEFAULT '' ,
+	icon_user_warn varchar2(200) DEFAULT '' ,
+	button_pm_forward varchar2(200) DEFAULT '' ,
+	button_pm_new varchar2(200) DEFAULT '' ,
+	button_pm_reply varchar2(200) DEFAULT '' ,
+	button_topic_locked varchar2(200) DEFAULT '' ,
+	button_topic_new varchar2(200) DEFAULT '' ,
+	button_topic_reply varchar2(200) DEFAULT '' ,
+	user_icon1 varchar2(200) DEFAULT '' ,
+	user_icon2 varchar2(200) DEFAULT '' ,
+	user_icon3 varchar2(200) DEFAULT '' ,
+	user_icon4 varchar2(200) DEFAULT '' ,
+	user_icon5 varchar2(200) DEFAULT '' ,
+	user_icon6 varchar2(200) DEFAULT '' ,
+	user_icon7 varchar2(200) DEFAULT '' ,
+	user_icon8 varchar2(200) DEFAULT '' ,
+	user_icon9 varchar2(200) DEFAULT '' ,
+	user_icon10 varchar2(200) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_styles_imageset PRIMARY KEY (imageset_id),
-	CONSTRAINT u_phpbb_imageset_name UNIQUE (imageset_name)
+	CONSTRAINT u_phpbb_imgset_nm UNIQUE (imageset_name)
 )
 /
 
@@ -1494,7 +1603,7 @@ CREATE TABLE phpbb_styles_imageset (
 CREATE SEQUENCE phpbb_styles_imageset_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_styles_imageset_seq
+CREATE OR REPLACE TRIGGER t_phpbb_styles_imageset
 BEFORE INSERT ON phpbb_styles_imageset
 FOR EACH ROW WHEN (
 	new.imageset_id IS NULL OR new.imageset_id = 0
@@ -1507,7 +1616,9 @@ END;
 /
 
 
-/* Table: 'phpbb_topics' */
+/*
+	Table: 'phpbb_topics'
+*/
 CREATE TABLE phpbb_topics (
 	topic_id number(8) NOT NULL,
 	forum_id number(8) DEFAULT '0' NOT NULL,
@@ -1515,7 +1626,7 @@ CREATE TABLE phpbb_topics (
 	topic_attachment number(1) DEFAULT '0' NOT NULL,
 	topic_approved number(1) DEFAULT '1' NOT NULL,
 	topic_reported number(1) DEFAULT '0' NOT NULL,
-	topic_title varchar2(1000) DEFAULT '' NOT NULL,
+	topic_title varchar2(1000) DEFAULT '' ,
 	topic_poster number(8) DEFAULT '0' NOT NULL,
 	topic_time number(11) DEFAULT '0' NOT NULL,
 	topic_time_limit number(11) DEFAULT '0' NOT NULL,
@@ -1525,16 +1636,16 @@ CREATE TABLE phpbb_topics (
 	topic_status number(3) DEFAULT '0' NOT NULL,
 	topic_type number(3) DEFAULT '0' NOT NULL,
 	topic_first_post_id number(8) DEFAULT '0' NOT NULL,
-	topic_first_poster_name varchar2(255) DEFAULT '' NOT NULL,
+	topic_first_poster_name varchar2(255) DEFAULT '' ,
 	topic_last_post_id number(8) DEFAULT '0' NOT NULL,
 	topic_last_poster_id number(8) DEFAULT '0' NOT NULL,
-	topic_last_poster_name varchar2(255) DEFAULT '' NOT NULL,
+	topic_last_poster_name varchar2(255) DEFAULT '' ,
 	topic_last_post_time number(11) DEFAULT '0' NOT NULL,
 	topic_last_view_time number(11) DEFAULT '0' NOT NULL,
 	topic_moved_id number(8) DEFAULT '0' NOT NULL,
 	topic_bumped number(1) DEFAULT '0' NOT NULL,
 	topic_bumper number(8) DEFAULT '0' NOT NULL,
-	poll_title varchar2(1000) DEFAULT '' NOT NULL,
+	poll_title varchar2(1000) DEFAULT '' ,
 	poll_start number(11) DEFAULT '0' NOT NULL,
 	poll_length number(11) DEFAULT '0' NOT NULL,
 	poll_max_options number(4) DEFAULT '1' NOT NULL,
@@ -1548,13 +1659,13 @@ CREATE INDEX phpbb_topics_forum_id ON phpbb_topics (forum_id)
 /
 CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics (forum_id, topic_type)
 /
-CREATE INDEX phpbb_topics_topic_last_post_time ON phpbb_topics (topic_last_post_time)
+CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics (topic_last_post_time)
 /
 
 CREATE SEQUENCE phpbb_topics_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_topics_seq
+CREATE OR REPLACE TRIGGER t_phpbb_topics
 BEFORE INSERT ON phpbb_topics
 FOR EACH ROW WHEN (
 	new.topic_id IS NULL OR new.topic_id = 0
@@ -1567,7 +1678,9 @@ END;
 /
 
 
-/* Table: 'phpbb_topics_track' */
+/*
+	Table: 'phpbb_topics_track'
+*/
 CREATE TABLE phpbb_topics_track (
 	user_id number(8) DEFAULT '0' NOT NULL,
 	topic_id number(8) DEFAULT '0' NOT NULL,
@@ -1580,7 +1693,9 @@ CREATE TABLE phpbb_topics_track (
 CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id)
 /
 
-/* Table: 'phpbb_topics_posted' */
+/*
+	Table: 'phpbb_topics_posted'
+*/
 CREATE TABLE phpbb_topics_posted (
 	user_id number(8) DEFAULT '0' NOT NULL,
 	topic_id number(8) DEFAULT '0' NOT NULL,
@@ -1590,7 +1705,9 @@ CREATE TABLE phpbb_topics_posted (
 /
 
 
-/* Table: 'phpbb_topics_watch' */
+/*
+	Table: 'phpbb_topics_watch'
+*/
 CREATE TABLE phpbb_topics_watch (
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
@@ -1602,10 +1719,12 @@ CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch (topic_id)
 /
 CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch (user_id)
 /
-CREATE INDEX phpbb_topics_watch_notify_status ON phpbb_topics_watch (notify_status)
+CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status)
 /
 
-/* Table: 'phpbb_user_group' */
+/*
+	Table: 'phpbb_user_group'
+*/
 CREATE TABLE phpbb_user_group (
 	group_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
@@ -1621,38 +1740,40 @@ CREATE INDEX phpbb_user_group_user_id ON phpbb_user_group (user_id)
 CREATE INDEX phpbb_user_group_group_leader ON phpbb_user_group (group_leader)
 /
 
-/* Table: 'phpbb_users' */
+/*
+	Table: 'phpbb_users'
+*/
 CREATE TABLE phpbb_users (
 	user_id number(8) NOT NULL,
 	user_type number(2) DEFAULT '0' NOT NULL,
 	group_id number(8) DEFAULT '3' NOT NULL,
-	user_permissions clob DEFAULT '' NOT NULL,
+	user_permissions clob DEFAULT '' ,
 	user_perm_from number(8) DEFAULT '0' NOT NULL,
-	user_ip varchar2(40) DEFAULT '' NOT NULL,
+	user_ip varchar2(40) DEFAULT '' ,
 	user_regdate number(11) DEFAULT '0' NOT NULL,
-	username varchar2(255) DEFAULT '' NOT NULL,
-	user_password varchar2(40) DEFAULT '' NOT NULL,
+	username varchar2(252) DEFAULT '' ,
+	user_password varchar2(40) DEFAULT '' ,
 	user_passchg number(11) DEFAULT '0' NOT NULL,
-	user_email varchar2(100) DEFAULT '' NOT NULL,
+	user_email varchar2(100) DEFAULT '' ,
 	user_email_hash number(20) DEFAULT '0' NOT NULL,
-	user_birthday varchar2(10) DEFAULT '' NOT NULL,
+	user_birthday varchar2(10) DEFAULT '' ,
 	user_lastvisit number(11) DEFAULT '0' NOT NULL,
 	user_lastmark number(11) DEFAULT '0' NOT NULL,
 	user_lastpost_time number(11) DEFAULT '0' NOT NULL,
-	user_lastpage varchar2(200) DEFAULT '' NOT NULL,
-	user_last_confirm_key varchar2(10) DEFAULT '' NOT NULL,
+	user_lastpage varchar2(200) DEFAULT '' ,
+	user_last_confirm_key varchar2(10) DEFAULT '' ,
 	user_last_search number(11) DEFAULT '0' NOT NULL,
 	user_warnings number(4) DEFAULT '0' NOT NULL,
 	user_last_warning number(11) DEFAULT '0' NOT NULL,
 	user_login_attempts number(4) DEFAULT '0' NOT NULL,
 	user_posts number(8) DEFAULT '0' NOT NULL,
-	user_lang varchar2(30) DEFAULT '' NOT NULL,
+	user_lang varchar2(30) DEFAULT '' ,
 	user_timezone number(5, 2) DEFAULT '0' NOT NULL,
 	user_dst number(1) DEFAULT '0' NOT NULL,
 	user_dateformat varchar2(30) DEFAULT 'd M Y H:i' NOT NULL,
 	user_style number(4) DEFAULT '0' NOT NULL,
 	user_rank number(8) DEFAULT '0' NOT NULL,
-	user_colour varchar2(6) DEFAULT '' NOT NULL,
+	user_colour varchar2(6) DEFAULT '' ,
 	user_new_privmsg number(4) DEFAULT '0' NOT NULL,
 	user_unread_privmsg number(4) DEFAULT '0' NOT NULL,
 	user_last_privmsg number(11) DEFAULT '0' NOT NULL,
@@ -1674,24 +1795,24 @@ CREATE TABLE phpbb_users (
 	user_allow_viewemail number(1) DEFAULT '1' NOT NULL,
 	user_allow_massemail number(1) DEFAULT '1' NOT NULL,
 	user_options number(11) DEFAULT '893' NOT NULL,
-	user_avatar varchar2(255) DEFAULT '' NOT NULL,
+	user_avatar varchar2(255) DEFAULT '' ,
 	user_avatar_type number(2) DEFAULT '0' NOT NULL,
 	user_avatar_width number(4) DEFAULT '0' NOT NULL,
 	user_avatar_height number(4) DEFAULT '0' NOT NULL,
-	user_sig clob DEFAULT '' NOT NULL,
-	user_sig_bbcode_uid varchar2(5) DEFAULT '' NOT NULL,
-	user_sig_bbcode_bitfield raw(255) DEFAULT '' NOT NULL,
-	user_from varchar2(100) DEFAULT '' NOT NULL,
-	user_icq varchar2(15) DEFAULT '' NOT NULL,
-	user_aim varchar2(255) DEFAULT '' NOT NULL,
-	user_yim varchar2(255) DEFAULT '' NOT NULL,
-	user_msnm varchar2(255) DEFAULT '' NOT NULL,
-	user_jabber varchar2(255) DEFAULT '' NOT NULL,
-	user_website varchar2(200) DEFAULT '' NOT NULL,
-	user_occ varchar2(255) DEFAULT '' NOT NULL,
-	user_interests clob DEFAULT '' NOT NULL,
-	user_actkey varchar2(32) DEFAULT '' NOT NULL,
-	user_newpasswd varchar2(32) DEFAULT '' NOT NULL,
+	user_sig clob DEFAULT '' ,
+	user_sig_bbcode_uid varchar2(5) DEFAULT '' ,
+	user_sig_bbcode_bitfield raw(255) DEFAULT '' ,
+	user_from varchar2(100) DEFAULT '' ,
+	user_icq varchar2(15) DEFAULT '' ,
+	user_aim varchar2(255) DEFAULT '' ,
+	user_yim varchar2(255) DEFAULT '' ,
+	user_msnm varchar2(255) DEFAULT '' ,
+	user_jabber varchar2(255) DEFAULT '' ,
+	user_website varchar2(200) DEFAULT '' ,
+	user_occ varchar2(255) DEFAULT '' ,
+	user_interests clob DEFAULT '' ,
+	user_actkey varchar2(32) DEFAULT '' ,
+	user_newpasswd varchar2(32) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id)
 )
 /
@@ -1708,7 +1829,7 @@ CREATE INDEX phpbb_users_username ON phpbb_users (username)
 CREATE SEQUENCE phpbb_users_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_users_seq
+CREATE OR REPLACE TRIGGER t_phpbb_users
 BEFORE INSERT ON phpbb_users
 FOR EACH ROW WHEN (
 	new.user_id IS NULL OR new.user_id = 0
@@ -1721,7 +1842,9 @@ END;
 /
 
 
-/* Table: 'phpbb_warnings' */
+/*
+	Table: 'phpbb_warnings'
+*/
 CREATE TABLE phpbb_warnings (
 	warning_id number(8) NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
@@ -1736,7 +1859,7 @@ CREATE TABLE phpbb_warnings (
 CREATE SEQUENCE phpbb_warnings_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_warnings_seq
+CREATE OR REPLACE TRIGGER t_phpbb_warnings
 BEFORE INSERT ON phpbb_warnings
 FOR EACH ROW WHEN (
 	new.warning_id IS NULL OR new.warning_id = 0
@@ -1749,11 +1872,13 @@ END;
 /
 
 
-/* Table: 'phpbb_words' */
+/*
+	Table: 'phpbb_words'
+*/
 CREATE TABLE phpbb_words (
 	word_id number(8) NOT NULL,
-	word varchar2(255) DEFAULT '' NOT NULL,
-	replacement varchar2(255) DEFAULT '' NOT NULL,
+	word varchar2(255) DEFAULT '' ,
+	replacement varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_words PRIMARY KEY (word_id)
 )
 /
@@ -1762,7 +1887,7 @@ CREATE TABLE phpbb_words (
 CREATE SEQUENCE phpbb_words_seq
 /
 
-CREATE OR REPLACE TRIGGER ai_phpbb_words_seq
+CREATE OR REPLACE TRIGGER t_phpbb_words
 BEFORE INSERT ON phpbb_words
 FOR EACH ROW WHEN (
 	new.word_id IS NULL OR new.word_id = 0
@@ -1775,7 +1900,9 @@ END;
 /
 
 
-/* Table: 'phpbb_zebra' */
+/*
+	Table: 'phpbb_zebra'
+*/
 CREATE TABLE phpbb_zebra (
 	user_id number(8) DEFAULT '0' NOT NULL,
 	zebra_id number(8) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 7feffaacc6..7c4ce958c5 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -7,10 +7,14 @@
 
 BEGIN;
 
-/* Domain definition */
-CREATE DOMAIN varchar_ci AS varchar(255) NOT NULL DEFAULT ''::character varying;
+/*
+	Domain definition
+*/
+CREATE DOMAIN varchar_ci AS varchar(252) NOT NULL DEFAULT ''::character varying;
 
-/* Operation Functions */
+/*
+	Operation Functions
+*/
 CREATE FUNCTION _varchar_ci_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) = LOWER($2)' LANGUAGE SQL STRICT;
 CREATE FUNCTION _varchar_ci_not_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) != LOWER($2)' LANGUAGE SQL STRICT;
 CREATE FUNCTION _varchar_ci_less_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) < LOWER($2)' LANGUAGE SQL STRICT;
@@ -18,7 +22,9 @@ CREATE FUNCTION _varchar_ci_less_equal(varchar_ci, varchar_ci) RETURNS boolean A
 CREATE FUNCTION _varchar_ci_greater_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) > LOWER($2)' LANGUAGE SQL STRICT;
 CREATE FUNCTION _varchar_ci_greater_equals(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) >= LOWER($2)' LANGUAGE SQL STRICT;
 
-/* Operators */
+/*
+	Operators
+*/
 CREATE OPERATOR <(
   PROCEDURE = _varchar_ci_less_than,
   LEFTARG = varchar_ci,
@@ -76,7 +82,9 @@ CREATE OPERATOR =(
   MERGES,
   SORT1= <);
 
-/* Table: 'phpbb_attachments' */
+/*
+	Table: 'phpbb_attachments'
+*/
 CREATE SEQUENCE phpbb_attachments_seq;
 
 CREATE TABLE phpbb_attachments (
@@ -103,7 +111,9 @@ CREATE INDEX phpbb_attachments_topic_id ON phpbb_attachments (topic_id);
 CREATE INDEX phpbb_attachments_poster_id ON phpbb_attachments (poster_id);
 CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize);
 
-/* Table: 'phpbb_acl_groups' */
+/*
+	Table: 'phpbb_acl_groups'
+*/
 CREATE TABLE phpbb_acl_groups (
 	group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0),
 	forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0),
@@ -113,9 +123,11 @@ CREATE TABLE phpbb_acl_groups (
 );
 
 CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups (group_id);
-CREATE INDEX phpbb_acl_groups_auth_option_id ON phpbb_acl_groups (auth_option_id);
+CREATE INDEX phpbb_acl_groups_auth_opt_id ON phpbb_acl_groups (auth_option_id);
 
-/* Table: 'phpbb_acl_options' */
+/*
+	Table: 'phpbb_acl_options'
+*/
 CREATE SEQUENCE phpbb_acl_options_seq;
 
 CREATE TABLE phpbb_acl_options (
@@ -129,7 +141,9 @@ CREATE TABLE phpbb_acl_options (
 
 CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option);
 
-/* Table: 'phpbb_acl_roles' */
+/*
+	Table: 'phpbb_acl_roles'
+*/
 CREATE SEQUENCE phpbb_acl_roles_seq;
 
 CREATE TABLE phpbb_acl_roles (
@@ -144,7 +158,9 @@ CREATE TABLE phpbb_acl_roles (
 CREATE INDEX phpbb_acl_roles_role_type ON phpbb_acl_roles (role_type);
 CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles (role_order);
 
-/* Table: 'phpbb_acl_roles_data' */
+/*
+	Table: 'phpbb_acl_roles_data'
+*/
 CREATE TABLE phpbb_acl_roles_data (
 	role_id INT4 DEFAULT '0' NOT NULL CHECK (role_id >= 0),
 	auth_option_id INT4 DEFAULT '0' NOT NULL CHECK (auth_option_id >= 0),
@@ -153,7 +169,9 @@ CREATE TABLE phpbb_acl_roles_data (
 );
 
 
-/* Table: 'phpbb_acl_users' */
+/*
+	Table: 'phpbb_acl_users'
+*/
 CREATE TABLE phpbb_acl_users (
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0),
@@ -165,7 +183,9 @@ CREATE TABLE phpbb_acl_users (
 CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users (user_id);
 CREATE INDEX phpbb_acl_users_auth_option_id ON phpbb_acl_users (auth_option_id);
 
-/* Table: 'phpbb_banlist' */
+/*
+	Table: 'phpbb_banlist'
+*/
 CREATE SEQUENCE phpbb_banlist_seq;
 
 CREATE TABLE phpbb_banlist (
@@ -182,7 +202,9 @@ CREATE TABLE phpbb_banlist (
 );
 
 
-/* Table: 'phpbb_bbcodes' */
+/*
+	Table: 'phpbb_bbcodes'
+*/
 CREATE TABLE phpbb_bbcodes (
 	bbcode_id INT2 DEFAULT '0' NOT NULL,
 	bbcode_tag varchar(16) DEFAULT '' NOT NULL,
@@ -197,9 +219,11 @@ CREATE TABLE phpbb_bbcodes (
 	PRIMARY KEY (bbcode_id)
 );
 
-CREATE INDEX phpbb_bbcodes_display_in_posting ON phpbb_bbcodes (display_on_posting);
+CREATE INDEX phpbb_bbcodes_display_on_post ON phpbb_bbcodes (display_on_posting);
 
-/* Table: 'phpbb_bookmarks' */
+/*
+	Table: 'phpbb_bookmarks'
+*/
 CREATE TABLE phpbb_bookmarks (
 	topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
@@ -209,7 +233,9 @@ CREATE TABLE phpbb_bookmarks (
 CREATE INDEX phpbb_bookmarks_order_id ON phpbb_bookmarks (order_id);
 CREATE INDEX phpbb_bookmarks_topic_user_id ON phpbb_bookmarks (topic_id, user_id);
 
-/* Table: 'phpbb_bots' */
+/*
+	Table: 'phpbb_bots'
+*/
 CREATE SEQUENCE phpbb_bots_seq;
 
 CREATE TABLE phpbb_bots (
@@ -224,9 +250,11 @@ CREATE TABLE phpbb_bots (
 
 CREATE INDEX phpbb_bots_bot_active ON phpbb_bots (bot_active);
 
-/* Table: 'phpbb_config' */
+/*
+	Table: 'phpbb_config'
+*/
 CREATE TABLE phpbb_config (
-	config_name varchar(255) DEFAULT '' NOT NULL,
+	config_name varchar(252) DEFAULT '' NOT NULL,
 	config_value varchar(255) DEFAULT '' NOT NULL,
 	is_dynamic INT2 DEFAULT '0' NOT NULL CHECK (is_dynamic >= 0),
 	PRIMARY KEY (config_name)
@@ -234,7 +262,9 @@ CREATE TABLE phpbb_config (
 
 CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic);
 
-/* Table: 'phpbb_confirm' */
+/*
+	Table: 'phpbb_confirm'
+*/
 CREATE TABLE phpbb_confirm (
 	confirm_id char(32) DEFAULT '' NOT NULL,
 	session_id char(32) DEFAULT '' NOT NULL,
@@ -244,17 +274,21 @@ CREATE TABLE phpbb_confirm (
 );
 
 
-/* Table: 'phpbb_disallow' */
+/*
+	Table: 'phpbb_disallow'
+*/
 CREATE SEQUENCE phpbb_disallow_seq;
 
 CREATE TABLE phpbb_disallow (
 	disallow_id INT4 DEFAULT nextval('phpbb_disallow_seq'),
-	disallow_username varchar(255) DEFAULT '' NOT NULL,
+	disallow_username varchar(252) DEFAULT '' NOT NULL,
 	PRIMARY KEY (disallow_id)
 );
 
 
-/* Table: 'phpbb_drafts' */
+/*
+	Table: 'phpbb_drafts'
+*/
 CREATE SEQUENCE phpbb_drafts_seq;
 
 CREATE TABLE phpbb_drafts (
@@ -270,7 +304,9 @@ CREATE TABLE phpbb_drafts (
 
 CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts (save_time);
 
-/* Table: 'phpbb_extensions' */
+/*
+	Table: 'phpbb_extensions'
+*/
 CREATE SEQUENCE phpbb_extensions_seq;
 
 CREATE TABLE phpbb_extensions (
@@ -281,7 +317,9 @@ CREATE TABLE phpbb_extensions (
 );
 
 
-/* Table: 'phpbb_extension_groups' */
+/*
+	Table: 'phpbb_extension_groups'
+*/
 CREATE SEQUENCE phpbb_extension_groups_seq;
 
 CREATE TABLE phpbb_extension_groups (
@@ -298,7 +336,9 @@ CREATE TABLE phpbb_extension_groups (
 );
 
 
-/* Table: 'phpbb_forums' */
+/*
+	Table: 'phpbb_forums'
+*/
 CREATE SEQUENCE phpbb_forums_seq;
 
 CREATE TABLE phpbb_forums (
@@ -310,7 +350,7 @@ CREATE TABLE phpbb_forums (
 	forum_name varchar(3000) DEFAULT '' NOT NULL,
 	forum_desc varchar(8000) DEFAULT '' NOT NULL,
 	forum_desc_bitfield bytea DEFAULT '\000' NOT NULL,
-	forum_desc_options INT4 DEFAULT 0 NOT NULL,
+	forum_desc_options INT4 DEFAULT '0' NOT NULL CHECK (forum_desc_options >= 0),
 	forum_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_link varchar(255) DEFAULT '' NOT NULL,
 	forum_password varchar(40) DEFAULT '' NOT NULL,
@@ -319,7 +359,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules varchar(8000) DEFAULT '' NOT NULL,
 	forum_rules_link varchar(255) DEFAULT '' NOT NULL,
 	forum_rules_bitfield bytea DEFAULT '\000' NOT NULL,
-	forum_rules_options INT4 DEFAULT 0 NOT NULL,
+	forum_rules_options INT4 DEFAULT '0' NOT NULL CHECK (forum_rules_options >= 0),
 	forum_rules_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_topics_per_page INT2 DEFAULT '0' NOT NULL,
 	forum_type INT2 DEFAULT '0' NOT NULL,
@@ -344,9 +384,11 @@ CREATE TABLE phpbb_forums (
 );
 
 CREATE INDEX phpbb_forums_left_right_id ON phpbb_forums (left_id, right_id);
-CREATE INDEX phpbb_forums_forum_last_post_id ON phpbb_forums (forum_last_post_id);
+CREATE INDEX phpbb_forums_forum_lastpost_id ON phpbb_forums (forum_last_post_id);
 
-/* Table: 'phpbb_forums_access' */
+/*
+	Table: 'phpbb_forums_access'
+*/
 CREATE TABLE phpbb_forums_access (
 	forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
@@ -355,7 +397,9 @@ CREATE TABLE phpbb_forums_access (
 );
 
 
-/* Table: 'phpbb_forums_track' */
+/*
+	Table: 'phpbb_forums_track'
+*/
 CREATE TABLE phpbb_forums_track (
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0),
@@ -364,7 +408,9 @@ CREATE TABLE phpbb_forums_track (
 );
 
 
-/* Table: 'phpbb_forums_watch' */
+/*
+	Table: 'phpbb_forums_watch'
+*/
 CREATE TABLE phpbb_forums_watch (
 	forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
@@ -373,9 +419,11 @@ CREATE TABLE phpbb_forums_watch (
 
 CREATE INDEX phpbb_forums_watch_forum_id ON phpbb_forums_watch (forum_id);
 CREATE INDEX phpbb_forums_watch_user_id ON phpbb_forums_watch (user_id);
-CREATE INDEX phpbb_forums_watch_notify_status ON phpbb_forums_watch (notify_status);
+CREATE INDEX phpbb_forums_watch_notify_stat ON phpbb_forums_watch (notify_status);
 
-/* Table: 'phpbb_groups' */
+/*
+	Table: 'phpbb_groups'
+*/
 CREATE SEQUENCE phpbb_groups_seq;
 
 CREATE TABLE phpbb_groups (
@@ -384,7 +432,7 @@ CREATE TABLE phpbb_groups (
 	group_name varchar_ci DEFAULT '' NOT NULL,
 	group_desc varchar(8000) DEFAULT '' NOT NULL,
 	group_desc_bitfield bytea DEFAULT '\000' NOT NULL,
-	group_desc_options INT4 DEFAULT 0 NOT NULL,
+	group_desc_options INT4 DEFAULT '0' NOT NULL CHECK (group_desc_options >= 0),
 	group_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0),
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
@@ -402,7 +450,9 @@ CREATE TABLE phpbb_groups (
 
 CREATE INDEX phpbb_groups_group_legend ON phpbb_groups (group_legend);
 
-/* Table: 'phpbb_icons' */
+/*
+	Table: 'phpbb_icons'
+*/
 CREATE SEQUENCE phpbb_icons_seq;
 
 CREATE TABLE phpbb_icons (
@@ -415,8 +465,11 @@ CREATE TABLE phpbb_icons (
 	PRIMARY KEY (icons_id)
 );
 
+CREATE INDEX phpbb_icons_display_on_posting ON phpbb_icons (display_on_posting);
 
-/* Table: 'phpbb_lang' */
+/*
+	Table: 'phpbb_lang'
+*/
 CREATE SEQUENCE phpbb_lang_seq;
 
 CREATE TABLE phpbb_lang (
@@ -431,7 +484,9 @@ CREATE TABLE phpbb_lang (
 
 CREATE INDEX phpbb_lang_lang_iso ON phpbb_lang (lang_iso);
 
-/* Table: 'phpbb_log' */
+/*
+	Table: 'phpbb_log'
+*/
 CREATE SEQUENCE phpbb_log_seq;
 
 CREATE TABLE phpbb_log (
@@ -454,20 +509,24 @@ CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);
 CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);
 CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 
-/* Table: 'phpbb_moderator_cache' */
+/*
+	Table: 'phpbb_moderator_cache'
+*/
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
-	username varchar(255) DEFAULT '' NOT NULL,
+	username varchar(252) DEFAULT '' NOT NULL,
 	group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0),
 	group_name varchar(255) DEFAULT '' NOT NULL,
 	display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0)
 );
 
-CREATE INDEX phpbb_moderator_cache_display_on_index ON phpbb_moderator_cache (display_on_index);
+CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on_index);
 CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id);
 
-/* Table: 'phpbb_modules' */
+/*
+	Table: 'phpbb_modules'
+*/
 CREATE SEQUENCE phpbb_modules_seq;
 
 CREATE TABLE phpbb_modules (
@@ -489,7 +548,9 @@ CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);
 CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled);
 CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id);
 
-/* Table: 'phpbb_poll_options' */
+/*
+	Table: 'phpbb_poll_options'
+*/
 CREATE TABLE phpbb_poll_options (
 	poll_option_id INT2 DEFAULT '0' NOT NULL,
 	topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0),
@@ -497,10 +558,12 @@ CREATE TABLE phpbb_poll_options (
 	poll_option_total INT4 DEFAULT '0' NOT NULL CHECK (poll_option_total >= 0)
 );
 
-CREATE INDEX phpbb_poll_options_poll_option_id ON phpbb_poll_options (poll_option_id);
+CREATE INDEX phpbb_poll_options_poll_opt_id ON phpbb_poll_options (poll_option_id);
 CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options (topic_id);
 
-/* Table: 'phpbb_poll_votes' */
+/*
+	Table: 'phpbb_poll_votes'
+*/
 CREATE TABLE phpbb_poll_votes (
 	topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0),
 	poll_option_id INT2 DEFAULT '0' NOT NULL,
@@ -512,7 +575,9 @@ CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes (topic_id);
 CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id);
 CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip);
 
-/* Table: 'phpbb_posts' */
+/*
+	Table: 'phpbb_posts'
+*/
 CREATE SEQUENCE phpbb_posts_seq;
 
 CREATE TABLE phpbb_posts (
@@ -529,7 +594,7 @@ CREATE TABLE phpbb_posts (
 	enable_smilies INT2 DEFAULT '1' NOT NULL CHECK (enable_smilies >= 0),
 	enable_magic_url INT2 DEFAULT '1' NOT NULL CHECK (enable_magic_url >= 0),
 	enable_sig INT2 DEFAULT '1' NOT NULL CHECK (enable_sig >= 0),
-	post_username varchar(255) DEFAULT '' NOT NULL,
+	post_username varchar(252) DEFAULT '' NOT NULL,
 	post_subject varchar(1000) DEFAULT '' NOT NULL,
 	post_text TEXT DEFAULT '' NOT NULL,
 	post_checksum varchar(32) DEFAULT '' NOT NULL,
@@ -554,7 +619,9 @@ CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved);
 CREATE INDEX phpbb_posts_post_postcount ON phpbb_posts (post_postcount);
 CREATE INDEX phpbb_posts_post_time ON phpbb_posts (post_time);
 
-/* Table: 'phpbb_privmsgs' */
+/*
+	Table: 'phpbb_privmsgs'
+*/
 CREATE SEQUENCE phpbb_privmsgs_seq;
 
 CREATE TABLE phpbb_privmsgs (
@@ -588,7 +655,9 @@ CREATE INDEX phpbb_privmsgs_message_time ON phpbb_privmsgs (message_time);
 CREATE INDEX phpbb_privmsgs_author_id ON phpbb_privmsgs (author_id);
 CREATE INDEX phpbb_privmsgs_root_level ON phpbb_privmsgs (root_level);
 
-/* Table: 'phpbb_privmsgs_folder' */
+/*
+	Table: 'phpbb_privmsgs_folder'
+*/
 CREATE SEQUENCE phpbb_privmsgs_folder_seq;
 
 CREATE TABLE phpbb_privmsgs_folder (
@@ -601,7 +670,9 @@ CREATE TABLE phpbb_privmsgs_folder (
 
 CREATE INDEX phpbb_privmsgs_folder_user_id ON phpbb_privmsgs_folder (user_id);
 
-/* Table: 'phpbb_privmsgs_rules' */
+/*
+	Table: 'phpbb_privmsgs_rules'
+*/
 CREATE SEQUENCE phpbb_privmsgs_rules_seq;
 
 CREATE TABLE phpbb_privmsgs_rules (
@@ -618,7 +689,9 @@ CREATE TABLE phpbb_privmsgs_rules (
 );
 
 
-/* Table: 'phpbb_privmsgs_to' */
+/*
+	Table: 'phpbb_privmsgs_to'
+*/
 CREATE TABLE phpbb_privmsgs_to (
 	msg_id INT4 DEFAULT '0' NOT NULL CHECK (msg_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
@@ -633,9 +706,11 @@ CREATE TABLE phpbb_privmsgs_to (
 );
 
 CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);
-CREATE INDEX phpbb_privmsgs_to_user_folder_id ON phpbb_privmsgs_to (user_id, folder_id);
+CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to (user_id, folder_id);
 
-/* Table: 'phpbb_profile_fields' */
+/*
+	Table: 'phpbb_profile_fields'
+*/
 CREATE SEQUENCE phpbb_profile_fields_seq;
 
 CREATE TABLE phpbb_profile_fields (
@@ -658,17 +733,21 @@ CREATE TABLE phpbb_profile_fields (
 	PRIMARY KEY (field_id)
 );
 
-CREATE INDEX phpbb_profile_fields_field_type ON phpbb_profile_fields (field_type);
-CREATE INDEX phpbb_profile_fields_field_order ON phpbb_profile_fields (field_order);
+CREATE INDEX phpbb_profile_fields_fld_type ON phpbb_profile_fields (field_type);
+CREATE INDEX phpbb_profile_fields_fld_ordr ON phpbb_profile_fields (field_order);
 
-/* Table: 'phpbb_profile_fields_data' */
+/*
+	Table: 'phpbb_profile_fields_data'
+*/
 CREATE TABLE phpbb_profile_fields_data (
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	PRIMARY KEY (user_id)
 );
 
 
-/* Table: 'phpbb_profile_fields_lang' */
+/*
+	Table: 'phpbb_profile_fields_lang'
+*/
 CREATE TABLE phpbb_profile_fields_lang (
 	field_id INT4 DEFAULT '0' NOT NULL CHECK (field_id >= 0),
 	lang_id INT4 DEFAULT '0' NOT NULL CHECK (lang_id >= 0),
@@ -679,7 +758,9 @@ CREATE TABLE phpbb_profile_fields_lang (
 );
 
 
-/* Table: 'phpbb_profile_lang' */
+/*
+	Table: 'phpbb_profile_lang'
+*/
 CREATE TABLE phpbb_profile_lang (
 	field_id INT4 DEFAULT '0' NOT NULL CHECK (field_id >= 0),
 	lang_id INT4 DEFAULT '0' NOT NULL CHECK (lang_id >= 0),
@@ -690,7 +771,9 @@ CREATE TABLE phpbb_profile_lang (
 );
 
 
-/* Table: 'phpbb_ranks' */
+/*
+	Table: 'phpbb_ranks'
+*/
 CREATE SEQUENCE phpbb_ranks_seq;
 
 CREATE TABLE phpbb_ranks (
@@ -703,7 +786,9 @@ CREATE TABLE phpbb_ranks (
 );
 
 
-/* Table: 'phpbb_reports' */
+/*
+	Table: 'phpbb_reports'
+*/
 CREATE SEQUENCE phpbb_reports_seq;
 
 CREATE TABLE phpbb_reports (
@@ -719,7 +804,9 @@ CREATE TABLE phpbb_reports (
 );
 
 
-/* Table: 'phpbb_reports_reasons' */
+/*
+	Table: 'phpbb_reports_reasons'
+*/
 CREATE SEQUENCE phpbb_reports_reasons_seq;
 
 CREATE TABLE phpbb_reports_reasons (
@@ -731,7 +818,9 @@ CREATE TABLE phpbb_reports_reasons (
 );
 
 
-/* Table: 'phpbb_search_results' */
+/*
+	Table: 'phpbb_search_results'
+*/
 CREATE TABLE phpbb_search_results (
 	search_key varchar(32) DEFAULT '' NOT NULL,
 	search_time INT4 DEFAULT '0' NOT NULL CHECK (search_time >= 0),
@@ -741,19 +830,23 @@ CREATE TABLE phpbb_search_results (
 );
 
 
-/* Table: 'phpbb_search_wordlist' */
+/*
+	Table: 'phpbb_search_wordlist'
+*/
 CREATE SEQUENCE phpbb_search_wordlist_seq;
 
 CREATE TABLE phpbb_search_wordlist (
-	word_text varchar(252) DEFAULT '' NOT NULL,
 	word_id INT4 DEFAULT nextval('phpbb_search_wordlist_seq'),
+	word_text varchar(252) DEFAULT '' NOT NULL,
 	word_common INT2 DEFAULT '0' NOT NULL CHECK (word_common >= 0),
-	PRIMARY KEY (word_text)
+	PRIMARY KEY (word_id)
 );
 
-CREATE INDEX phpbb_search_wordlist_word_id ON phpbb_search_wordlist (word_id);
+CREATE UNIQUE INDEX phpbb_search_wordlist_wrd_txt ON phpbb_search_wordlist (word_text);
 
-/* Table: 'phpbb_search_wordmatch' */
+/*
+	Table: 'phpbb_search_wordmatch'
+*/
 CREATE TABLE phpbb_search_wordmatch (
 	post_id INT4 DEFAULT '0' NOT NULL CHECK (post_id >= 0),
 	word_id INT4 DEFAULT '0' NOT NULL CHECK (word_id >= 0),
@@ -762,7 +855,9 @@ CREATE TABLE phpbb_search_wordmatch (
 
 CREATE INDEX phpbb_search_wordmatch_word_id ON phpbb_search_wordmatch (word_id);
 
-/* Table: 'phpbb_sessions' */
+/*
+	Table: 'phpbb_sessions'
+*/
 CREATE TABLE phpbb_sessions (
 	session_id char(32) DEFAULT '' NOT NULL,
 	session_user_id INT4 DEFAULT '0' NOT NULL CHECK (session_user_id >= 0),
@@ -781,7 +876,9 @@ CREATE TABLE phpbb_sessions (
 CREATE INDEX phpbb_sessions_session_time ON phpbb_sessions (session_time);
 CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions (session_user_id);
 
-/* Table: 'phpbb_sessions_keys' */
+/*
+	Table: 'phpbb_sessions_keys'
+*/
 CREATE TABLE phpbb_sessions_keys (
 	key_id char(32) DEFAULT '' NOT NULL,
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
@@ -792,7 +889,9 @@ CREATE TABLE phpbb_sessions_keys (
 
 CREATE INDEX phpbb_sessions_keys_last_login ON phpbb_sessions_keys (last_login);
 
-/* Table: 'phpbb_sitelist' */
+/*
+	Table: 'phpbb_sitelist'
+*/
 CREATE SEQUENCE phpbb_sitelist_seq;
 
 CREATE TABLE phpbb_sitelist (
@@ -804,7 +903,9 @@ CREATE TABLE phpbb_sitelist (
 );
 
 
-/* Table: 'phpbb_smilies' */
+/*
+	Table: 'phpbb_smilies'
+*/
 CREATE SEQUENCE phpbb_smilies_seq;
 
 CREATE TABLE phpbb_smilies (
@@ -819,14 +920,16 @@ CREATE TABLE phpbb_smilies (
 	PRIMARY KEY (smiley_id)
 );
 
-CREATE INDEX phpbb_smilies_display_on_posting ON phpbb_smilies (display_on_posting);
+CREATE INDEX phpbb_smilies_display_on_post ON phpbb_smilies (display_on_posting);
 
-/* Table: 'phpbb_styles' */
+/*
+	Table: 'phpbb_styles'
+*/
 CREATE SEQUENCE phpbb_styles_seq;
 
 CREATE TABLE phpbb_styles (
 	style_id INT2 DEFAULT nextval('phpbb_styles_seq'),
-	style_name varchar(255) DEFAULT '' NOT NULL,
+	style_name varchar(252) DEFAULT '' NOT NULL,
 	style_copyright varchar(255) DEFAULT '' NOT NULL,
 	style_active INT2 DEFAULT '1' NOT NULL CHECK (style_active >= 0),
 	template_id INT2 DEFAULT '0' NOT NULL,
@@ -840,12 +943,14 @@ CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id);
 CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id);
 CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles (imageset_id);
 
-/* Table: 'phpbb_styles_template' */
+/*
+	Table: 'phpbb_styles_template'
+*/
 CREATE SEQUENCE phpbb_styles_template_seq;
 
 CREATE TABLE phpbb_styles_template (
 	template_id INT2 DEFAULT nextval('phpbb_styles_template_seq'),
-	template_name varchar(255) DEFAULT '' NOT NULL,
+	template_name varchar(252) DEFAULT '' NOT NULL,
 	template_copyright varchar(255) DEFAULT '' NOT NULL,
 	template_path varchar(100) DEFAULT '' NOT NULL,
 	bbcode_bitfield bytea DEFAULT '\220\330' NOT NULL,
@@ -853,9 +958,11 @@ CREATE TABLE phpbb_styles_template (
 	PRIMARY KEY (template_id)
 );
 
-CREATE UNIQUE INDEX phpbb_styles_template_template_name ON phpbb_styles_template (template_name);
+CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name);
 
-/* Table: 'phpbb_styles_template_data' */
+/*
+	Table: 'phpbb_styles_template_data'
+*/
 CREATE SEQUENCE phpbb_styles_template_data_seq;
 
 CREATE TABLE phpbb_styles_template_data (
@@ -866,15 +973,17 @@ CREATE TABLE phpbb_styles_template_data (
 	template_data TEXT DEFAULT '' NOT NULL
 );
 
-CREATE INDEX phpbb_styles_template_data_template_id ON phpbb_styles_template_data (template_id);
-CREATE INDEX phpbb_styles_template_data_template_filename ON phpbb_styles_template_data (template_filename);
+CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data (template_id);
+CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data (template_filename);
 
-/* Table: 'phpbb_styles_theme' */
+/*
+	Table: 'phpbb_styles_theme'
+*/
 CREATE SEQUENCE phpbb_styles_theme_seq;
 
 CREATE TABLE phpbb_styles_theme (
 	theme_id INT2 DEFAULT nextval('phpbb_styles_theme_seq'),
-	theme_name varchar(255) DEFAULT '' NOT NULL,
+	theme_name varchar(252) DEFAULT '' NOT NULL,
 	theme_copyright varchar(255) DEFAULT '' NOT NULL,
 	theme_path varchar(100) DEFAULT '' NOT NULL,
 	theme_storedb INT2 DEFAULT '0' NOT NULL CHECK (theme_storedb >= 0),
@@ -885,94 +994,100 @@ CREATE TABLE phpbb_styles_theme (
 
 CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name);
 
-/* Table: 'phpbb_styles_imageset' */
+/*
+	Table: 'phpbb_styles_imageset'
+*/
 CREATE SEQUENCE phpbb_styles_imageset_seq;
 
 CREATE TABLE phpbb_styles_imageset (
 	imageset_id INT2 DEFAULT nextval('phpbb_styles_imageset_seq'),
-	imageset_name varchar(255) DEFAULT '' NOT NULL,
+	imageset_name varchar(252) DEFAULT '' NOT NULL,
 	imageset_copyright varchar(255) DEFAULT '' NOT NULL,
 	imageset_path varchar(100) DEFAULT '' NOT NULL,
 	site_logo varchar(200) DEFAULT '' NOT NULL,
-	btn_post varchar(200) DEFAULT '' NOT NULL,
-	btn_post_pm varchar(200) DEFAULT '' NOT NULL,
-	btn_reply varchar(200) DEFAULT '' NOT NULL,
-	btn_reply_pm varchar(200) DEFAULT '' NOT NULL,
-	btn_locked varchar(200) DEFAULT '' NOT NULL,
-	btn_profile varchar(200) DEFAULT '' NOT NULL,
-	btn_pm varchar(200) DEFAULT '' NOT NULL,
-	btn_delete varchar(200) DEFAULT '' NOT NULL,
-	btn_info varchar(200) DEFAULT '' NOT NULL,
-	btn_quote varchar(200) DEFAULT '' NOT NULL,
-	btn_search varchar(200) DEFAULT '' NOT NULL,
-	btn_edit varchar(200) DEFAULT '' NOT NULL,
-	btn_report varchar(200) DEFAULT '' NOT NULL,
-	btn_warn varchar(200) DEFAULT '' NOT NULL,
-	btn_email varchar(200) DEFAULT '' NOT NULL,
-	btn_www varchar(200) DEFAULT '' NOT NULL,
-	btn_icq varchar(200) DEFAULT '' NOT NULL,
-	btn_aim varchar(200) DEFAULT '' NOT NULL,
-	btn_yim varchar(200) DEFAULT '' NOT NULL,
-	btn_msnm varchar(200) DEFAULT '' NOT NULL,
-	btn_jabber varchar(200) DEFAULT '' NOT NULL,
-	btn_online varchar(200) DEFAULT '' NOT NULL,
-	btn_offline varchar(200) DEFAULT '' NOT NULL,
-	btn_friend varchar(200) DEFAULT '' NOT NULL,
-	btn_foe varchar(200) DEFAULT '' NOT NULL,
-	icon_unapproved varchar(200) DEFAULT '' NOT NULL,
-	icon_reported varchar(200) DEFAULT '' NOT NULL,
-	icon_attach varchar(200) DEFAULT '' NOT NULL,
-	icon_post varchar(200) DEFAULT '' NOT NULL,
-	icon_post_new varchar(200) DEFAULT '' NOT NULL,
-	icon_post_latest varchar(200) DEFAULT '' NOT NULL,
-	icon_post_newest varchar(200) DEFAULT '' NOT NULL,
-	forum varchar(200) DEFAULT '' NOT NULL,
-	forum_new varchar(200) DEFAULT '' NOT NULL,
-	forum_locked varchar(200) DEFAULT '' NOT NULL,
-	forum_link varchar(200) DEFAULT '' NOT NULL,
-	sub_forum varchar(200) DEFAULT '' NOT NULL,
-	sub_forum_new varchar(200) DEFAULT '' NOT NULL,
-	folder varchar(200) DEFAULT '' NOT NULL,
-	folder_moved varchar(200) DEFAULT '' NOT NULL,
-	folder_post varchar(200) DEFAULT '' NOT NULL,
-	folder_new varchar(200) DEFAULT '' NOT NULL,
-	folder_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_hot varchar(200) DEFAULT '' NOT NULL,
-	folder_hot_post varchar(200) DEFAULT '' NOT NULL,
-	folder_hot_new varchar(200) DEFAULT '' NOT NULL,
-	folder_hot_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_new varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_announce varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_new varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_announce_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_global varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_global_new varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_global_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_global_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_new varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_post varchar(200) DEFAULT '' NOT NULL,
-	folder_lock_sticky_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_sticky varchar(200) DEFAULT '' NOT NULL,
-	folder_sticky_post varchar(200) DEFAULT '' NOT NULL,
-	folder_sticky_new varchar(200) DEFAULT '' NOT NULL,
-	folder_sticky_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_announce varchar(200) DEFAULT '' NOT NULL,
-	folder_announce_post varchar(200) DEFAULT '' NOT NULL,
-	folder_announce_new varchar(200) DEFAULT '' NOT NULL,
-	folder_announce_new_post varchar(200) DEFAULT '' NOT NULL,
-	folder_global varchar(200) DEFAULT '' NOT NULL,
-	folder_global_post varchar(200) DEFAULT '' NOT NULL,
-	folder_global_new varchar(200) DEFAULT '' NOT NULL,
-	folder_global_new_post varchar(200) DEFAULT '' NOT NULL,
+	upload_bar varchar(200) DEFAULT '' NOT NULL,
 	poll_left varchar(200) DEFAULT '' NOT NULL,
 	poll_center varchar(200) DEFAULT '' NOT NULL,
 	poll_right varchar(200) DEFAULT '' NOT NULL,
-	attach_progress_bar varchar(200) DEFAULT '' NOT NULL,
+	icon_friend varchar(200) DEFAULT '' NOT NULL,
+	icon_foe varchar(200) DEFAULT '' NOT NULL,
+	forum_link varchar(200) DEFAULT '' NOT NULL,
+	forum_read varchar(200) DEFAULT '' NOT NULL,
+	forum_read_locked varchar(200) DEFAULT '' NOT NULL,
+	forum_read_subforum varchar(200) DEFAULT '' NOT NULL,
+	forum_unread varchar(200) DEFAULT '' NOT NULL,
+	forum_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	forum_unread_subforum varchar(200) DEFAULT '' NOT NULL,
+	topic_moved varchar(200) DEFAULT '' NOT NULL,
+	topic_read varchar(200) DEFAULT '' NOT NULL,
+	topic_read_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_read_hot varchar(200) DEFAULT '' NOT NULL,
+	topic_read_hot_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_read_locked varchar(200) DEFAULT '' NOT NULL,
+	topic_read_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_unread varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_hot varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_hot_mine varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	topic_unread_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	sticky_read varchar(200) DEFAULT '' NOT NULL,
+	sticky_read_mine varchar(200) DEFAULT '' NOT NULL,
+	sticky_read_locked varchar(200) DEFAULT '' NOT NULL,
+	sticky_read_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	sticky_unread varchar(200) DEFAULT '' NOT NULL,
+	sticky_unread_mine varchar(200) DEFAULT '' NOT NULL,
+	sticky_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	sticky_unread_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	announce_read varchar(200) DEFAULT '' NOT NULL,
+	announce_read_mine varchar(200) DEFAULT '' NOT NULL,
+	announce_read_locked varchar(200) DEFAULT '' NOT NULL,
+	announce_read_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	announce_unread varchar(200) DEFAULT '' NOT NULL,
+	announce_unread_mine varchar(200) DEFAULT '' NOT NULL,
+	announce_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	announce_unread_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	global_read varchar(200) DEFAULT '' NOT NULL,
+	global_read_mine varchar(200) DEFAULT '' NOT NULL,
+	global_read_locked varchar(200) DEFAULT '' NOT NULL,
+	global_read_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	global_unread varchar(200) DEFAULT '' NOT NULL,
+	global_unread_mine varchar(200) DEFAULT '' NOT NULL,
+	global_unread_locked varchar(200) DEFAULT '' NOT NULL,
+	global_unread_locked_mine varchar(200) DEFAULT '' NOT NULL,
+	pm_read varchar(200) DEFAULT '' NOT NULL,
+	pm_unread varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_aim varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_email varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_icq varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_jabber varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_msnm varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_pm varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_yahoo varchar(200) DEFAULT '' NOT NULL,
+	icon_contact_www varchar(200) DEFAULT '' NOT NULL,
+	icon_post_delete varchar(200) DEFAULT '' NOT NULL,
+	icon_post_edit varchar(200) DEFAULT '' NOT NULL,
+	icon_post_info varchar(200) DEFAULT '' NOT NULL,
+	icon_post_quote varchar(200) DEFAULT '' NOT NULL,
+	icon_post_report varchar(200) DEFAULT '' NOT NULL,
+	icon_post_target varchar(200) DEFAULT '' NOT NULL,
+	icon_post_target_unread varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_attach varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_latest varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_newest varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_reported varchar(200) DEFAULT '' NOT NULL,
+	icon_topic_unapproved varchar(200) DEFAULT '' NOT NULL,
+	icon_user_online varchar(200) DEFAULT '' NOT NULL,
+	icon_user_offline varchar(200) DEFAULT '' NOT NULL,
+	icon_user_profile varchar(200) DEFAULT '' NOT NULL,
+	icon_user_search varchar(200) DEFAULT '' NOT NULL,
+	icon_user_warn varchar(200) DEFAULT '' NOT NULL,
+	button_pm_forward varchar(200) DEFAULT '' NOT NULL,
+	button_pm_new varchar(200) DEFAULT '' NOT NULL,
+	button_pm_reply varchar(200) DEFAULT '' NOT NULL,
+	button_topic_locked varchar(200) DEFAULT '' NOT NULL,
+	button_topic_new varchar(200) DEFAULT '' NOT NULL,
+	button_topic_reply varchar(200) DEFAULT '' NOT NULL,
 	user_icon1 varchar(200) DEFAULT '' NOT NULL,
 	user_icon2 varchar(200) DEFAULT '' NOT NULL,
 	user_icon3 varchar(200) DEFAULT '' NOT NULL,
@@ -986,9 +1101,11 @@ CREATE TABLE phpbb_styles_imageset (
 	PRIMARY KEY (imageset_id)
 );
 
-CREATE UNIQUE INDEX phpbb_styles_imageset_imageset_name ON phpbb_styles_imageset (imageset_name);
+CREATE UNIQUE INDEX phpbb_styles_imageset_imgset_nm ON phpbb_styles_imageset (imageset_name);
 
-/* Table: 'phpbb_topics' */
+/*
+	Table: 'phpbb_topics'
+*/
 CREATE SEQUENCE phpbb_topics_seq;
 
 CREATE TABLE phpbb_topics (
@@ -1028,9 +1145,11 @@ CREATE TABLE phpbb_topics (
 
 CREATE INDEX phpbb_topics_forum_id ON phpbb_topics (forum_id);
 CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics (forum_id, topic_type);
-CREATE INDEX phpbb_topics_topic_last_post_time ON phpbb_topics (topic_last_post_time);
+CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics (topic_last_post_time);
 
-/* Table: 'phpbb_topics_track' */
+/*
+	Table: 'phpbb_topics_track'
+*/
 CREATE TABLE phpbb_topics_track (
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0),
@@ -1041,7 +1160,9 @@ CREATE TABLE phpbb_topics_track (
 
 CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id);
 
-/* Table: 'phpbb_topics_posted' */
+/*
+	Table: 'phpbb_topics_posted'
+*/
 CREATE TABLE phpbb_topics_posted (
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0),
@@ -1050,7 +1171,9 @@ CREATE TABLE phpbb_topics_posted (
 );
 
 
-/* Table: 'phpbb_topics_watch' */
+/*
+	Table: 'phpbb_topics_watch'
+*/
 CREATE TABLE phpbb_topics_watch (
 	topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
@@ -1059,9 +1182,11 @@ CREATE TABLE phpbb_topics_watch (
 
 CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch (topic_id);
 CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch (user_id);
-CREATE INDEX phpbb_topics_watch_notify_status ON phpbb_topics_watch (notify_status);
+CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status);
 
-/* Table: 'phpbb_user_group' */
+/*
+	Table: 'phpbb_user_group'
+*/
 CREATE TABLE phpbb_user_group (
 	group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
@@ -1073,7 +1198,9 @@ CREATE INDEX phpbb_user_group_group_id ON phpbb_user_group (group_id);
 CREATE INDEX phpbb_user_group_user_id ON phpbb_user_group (user_id);
 CREATE INDEX phpbb_user_group_group_leader ON phpbb_user_group (group_leader);
 
-/* Table: 'phpbb_users' */
+/*
+	Table: 'phpbb_users'
+*/
 CREATE SEQUENCE phpbb_users_seq;
 
 CREATE TABLE phpbb_users (
@@ -1154,7 +1281,9 @@ CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash);
 CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type);
 CREATE INDEX phpbb_users_username ON phpbb_users (username);
 
-/* Table: 'phpbb_warnings' */
+/*
+	Table: 'phpbb_warnings'
+*/
 CREATE SEQUENCE phpbb_warnings_seq;
 
 CREATE TABLE phpbb_warnings (
@@ -1167,7 +1296,9 @@ CREATE TABLE phpbb_warnings (
 );
 
 
-/* Table: 'phpbb_words' */
+/*
+	Table: 'phpbb_words'
+*/
 CREATE SEQUENCE phpbb_words_seq;
 
 CREATE TABLE phpbb_words (
@@ -1178,7 +1309,9 @@ CREATE TABLE phpbb_words (
 );
 
 
-/* Table: 'phpbb_zebra' */
+/*
+	Table: 'phpbb_zebra'
+*/
 CREATE TABLE phpbb_zebra (
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	zebra_id INT4 DEFAULT '0' NOT NULL CHECK (zebra_id >= 0),
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index cd0c9349c9..256b317efd 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -381,7 +381,7 @@ INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order)
 INSERT INTO phpbb_styles (style_name, style_copyright, template_id, theme_id, imageset_id) VALUES ('subSilver', '&copy; phpBB Group', 1, 1, 1);
 
 # -- phpbb_styles_imageset
-INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_warn, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_post, folder_new, folder_new_post, folder_hot, folder_hot_post, folder_hot_new, folder_hot_new_post, folder_lock, folder_lock_post, folder_lock_new, folder_lock_new_post, folder_lock_announce, folder_lock_announce_new, folder_lock_announce_post, folder_lock_announce_new_post, folder_lock_global, folder_lock_global_new, folder_lock_global_post, folder_lock_global_new_post, folder_lock_sticky, folder_lock_sticky_new, folder_lock_sticky_post, folder_lock_sticky_new_post, folder_sticky, folder_sticky_post, folder_sticky_new, folder_sticky_new_post, folder_announce, folder_announce_post, folder_announce_new, folder_announce_new_post, folder_global, folder_global_post, folder_global_new, folder_global_new_post, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES ('subSilver', '&copy; phpBB Group', 'subSilver', 'sitelogo.gif*94*170', '{LANG}/btn_post.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/btn_reply_pm.gif*20*90', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_info.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_warn.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_moved.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_lock_announce.gif*18*19', 'folder_lock_announce_new.gif*18*19', 'folder_lock_announce_posted.gif*18*19', 'folder_lock_announce_new_posted.gif*18*19', 'folder_lock_announce.gif*18*19', 'folder_lock_announce_new.gif*18*19', 'folder_lock_announce_posted.gif*18*19', 'folder_lock_announce_new_posted.gif*18*19', 'folder_lock_sticky.gif*18*19', 'folder_lock_sticky_new.gif*18*19', 'folder_lock_sticky_posted.gif*18*19', 'folder_lock_sticky_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', 'progress_bar.gif*16*280', '', '', '', '', '', '', '', '', '', '');
+INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path, site_logo, upload_bar, poll_left, poll_center, poll_right, icon_friend, icon_foe, forum_link, forum_read, forum_read_locked, forum_read_subforum, forum_unread, forum_unread_locked, forum_unread_subforum, topic_moved, topic_read, topic_read_mine, topic_read_hot, topic_read_hot_mine, topic_read_locked, topic_read_locked_mine, topic_unread, topic_unread_mine, topic_unread_hot, topic_unread_hot_mine, topic_unread_locked, topic_unread_locked_mine, sticky_read, sticky_read_mine, sticky_read_locked, sticky_read_locked_mine, sticky_unread, sticky_unread_mine, sticky_unread_locked, sticky_unread_locked_mine, announce_read, announce_read_mine, announce_read_locked, announce_read_locked_mine, announce_unread, announce_unread_mine, announce_unread_locked, announce_unread_locked_mine, global_read, global_read_mine, global_read_locked, global_read_locked_mine, global_unread, global_unread_mine, global_unread_locked, global_unread_locked_mine, pm_read, pm_unread, icon_contact_aim, icon_contact_email, icon_contact_icq, icon_contact_jabber, icon_contact_msnm, icon_contact_pm, icon_contact_yahoo, icon_contact_www, icon_post_delete, icon_post_edit, icon_post_info, icon_post_quote, icon_post_report, icon_post_target, icon_post_target_unread, icon_topic_attach, icon_topic_latest, icon_topic_newest, icon_topic_reported, icon_topic_unapproved, icon_user_online, icon_user_offline, icon_user_profile, icon_user_search, icon_user_warn, button_pm_forward, button_pm_new, button_pm_reply, button_topic_locked, button_topic_new, button_topic_reply, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES ('subSilver', '&copy; phpBB Group, 2003', 'subSilver', 'site_logo.gif*94*170', 'upload_bar.gif*16*280', 'poll_left.gif*12*4', 'poll_center.gif*12*', 'poll_right.gif*12*4', '', '', 'forum_link.gif*25*46', 'forum_read.gif*25*46', 'forum_read_locked.gif*25*46', 'forum_read_subforum.gif*25*46', 'forum_unread.gif*25*46', 'forum_unread_locked.gif*25*46', 'forum_unread_subforum.gif*25*46', 'topic_moved.gif*18*19', 'topic_read.gif*18*19', 'topic_read_mine.gif*18*19', 'topic_read_hot.gif*18*19', 'topic_read_hot_mine.gif*18*19', 'topic_read_locked.gif*18*19', 'topic_read_locked_mine.gif*18*19', 'topic_unread.gif*18*19', 'topic_unread_mine.gif*18*19', 'topic_unread_hot.gif*18*19', 'topic_unread_hot_mine.gif*18*19', 'topic_unread_locked.gif*18*19', 'topic_unread_locked_mine.gif*18*19', 'sticky_read.gif*18*19', 'sticky_read_mine.gif*18*19', 'sticky_read_locked.gif*18*19', 'sticky_read_locked_mine.gif*18*19', 'sticky_unread.gif*18*19', 'sticky_unread_mine.gif*18*19', 'sticky_unread_locked.gif*18*19', 'sticky_unread_locked_mine.gif*18*19', 'announce_read.gif*18*19', 'announce_read_mine.gif*18*19', 'announce_read_locked.gif*18*19', 'announce_read_locked_mine.gif*18*19', 'announce_unread.gif*18*19', 'announce_unread_mine.gif*18*19', 'announce_unread_locked.gif*18*19', 'announce_unread_locked_mine.gif*18*19', 'announce_read.gif*18*19', 'announce_read_mine.gif*18*19', 'announce_read_locked.gif*18*19', 'announce_read_locked_mine.gif*18*19', 'announce_unread.gif*18*19', 'announce_unread_mine.gif*18*19', 'announce_unread_locked.gif*18*19', 'announce_unread_locked_mine.gif*18*19', 'topic_read.gif*18*19', 'topic_unread.gif*18*19', '{LANG}/icon_contact_aim.gif*20*72', '{LANG}/icon_contact_email.gif*20*72', '{LANG}/icon_contact_icq.gif*20*72', '{LANG}/icon_contact_jabber.gif*20*72', '{LANG}/icon_contact_msnm.gif*20*72', '{LANG}/icon_contact_pm.gif*20*72', '{LANG}/icon_contanct_yahoo.gif*20*72', '{LANG}/icon_contact_www.gif*20*72', '{LANG}/icon_post_delete.gif*20*20', '{LANG}/icon_post_edit.gif*20*90', '{LANG}/icon_post_info.gif*20*20', '{LANG}/icon_post_quote.gif*20*90', '{LANG}/icon_post_report.gif*20*20', 'icon_post_target.gif*9*12', 'icon_post_target_unread.gif*9*12', 'icon_topic_attach.gif*18*14', 'icon_topic_latest.gif*9*18', 'icon_topic_newest.gif*9*18', 'icon_topic_reported.gif*18*19', 'icon_topic_unapproved.gif*18*19', '{LANG}/icon_user_online.gif*20*72', '{LANG}/icon_user_offline.gif*20*72', '{LANG}/icon_user_profile.gif*20*72', '{LANG}/icon_user_search.gif*20*72', '{LANG}/icon_user_warn.gif*20*20', '', '{LANG}/button_pm_new.gif*27*97', '{LANG}/button_pm_reply.gif*20*90', '{LANG}/button_topic_locked.gif*27*97', '{LANG}/button_topic_new.gif*27*97', '{LANG}/button_topic_reply.gif*27*97', '', '', '', '', '', '', '', '', '', '');
 
 # -- phpbb_styles_template
 INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path) VALUES ('subSilver', '&copy; phpBB Group', 'subSilver');
@@ -395,7 +395,7 @@ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id,
 INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed) VALUES ('Test Forum 1', 'This is just a test forum.', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 972086460, '', '', '', '', '', '', '', 0, 0);
 
 # -- Users / Anonymous user
-INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_colour, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (2, 1, 'Anonymous', 0, '', '', 'en', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
+INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (2, 1, 'Anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
 
 # -- username: Admin    password: admin (change this or remove it once everything is working!)
 INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 7, 'Admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 9e109815d1..0964c01f11 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -4,112 +4,108 @@
 # $Id$
 #
 
-BEGIN TRANSACTION;;
+BEGIN TRANSACTION;
 
 # Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
-	attach_id INTEGER NOT NULL ,
-	post_msg_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
-	in_message tinyint(1) NOT NULL DEFAULT '0',
-	poster_id mediumint(8) NOT NULL DEFAULT '0',
+	attach_id INTEGER PRIMARY KEY NOT NULL ,
+	post_msg_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	in_message INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	poster_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	physical_filename varchar(255) NOT NULL DEFAULT '',
 	real_filename varchar(255) NOT NULL DEFAULT '',
-	download_count mediumint(8) NOT NULL DEFAULT '0',
+	download_count INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	attach_comment text(65535) NOT NULL DEFAULT '',
 	extension varchar(100) NOT NULL DEFAULT '',
 	mimetype varchar(100) NOT NULL DEFAULT '',
-	filesize int(20) NOT NULL DEFAULT '0',
-	filetime int(11) NOT NULL DEFAULT '0',
-	thumbnail tinyint(1) NOT NULL DEFAULT '0',
-	PRIMARY KEY (attach_id)
-);;
-
-CREATE INDEX phpbb_attachments_filetime ON phpbb_attachments (filetime);;
-CREATE INDEX phpbb_attachments_post_msg_id ON phpbb_attachments (post_msg_id);;
-CREATE INDEX phpbb_attachments_topic_id ON phpbb_attachments (topic_id);;
-CREATE INDEX phpbb_attachments_poster_id ON phpbb_attachments (poster_id);;
-CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize);;
+	filesize INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	filetime INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	thumbnail INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
+
+CREATE INDEX phpbb_attachments_filetime ON phpbb_attachments (filetime);
+CREATE INDEX phpbb_attachments_post_msg_id ON phpbb_attachments (post_msg_id);
+CREATE INDEX phpbb_attachments_topic_id ON phpbb_attachments (topic_id);
+CREATE INDEX phpbb_attachments_poster_id ON phpbb_attachments (poster_id);
+CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize);
 
 # Table: 'phpbb_acl_groups'
 CREATE TABLE phpbb_acl_groups (
-	group_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	auth_option_id mediumint(8) NOT NULL DEFAULT '0',
-	auth_role_id mediumint(8) NOT NULL DEFAULT '0',
+	group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	auth_option_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	auth_role_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	auth_setting tinyint(2) NOT NULL DEFAULT '0'
-);;
+);
 
-CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups (group_id);;
-CREATE INDEX phpbb_acl_groups_auth_option_id ON phpbb_acl_groups (auth_option_id);;
+CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups (group_id);
+CREATE INDEX phpbb_acl_groups_auth_opt_id ON phpbb_acl_groups (auth_option_id);
 
 # Table: 'phpbb_acl_options'
 CREATE TABLE phpbb_acl_options (
-	auth_option_id INTEGER NOT NULL ,
+	auth_option_id INTEGER PRIMARY KEY NOT NULL ,
 	auth_option varchar(50) NOT NULL DEFAULT '',
-	is_global tinyint(1) NOT NULL DEFAULT '0',
-	is_local tinyint(1) NOT NULL DEFAULT '0',
-	founder_only tinyint(1) NOT NULL DEFAULT '0',
-	PRIMARY KEY (auth_option_id)
-);;
+	is_global INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	is_local INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	founder_only INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option);;
+CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option);
 
 # Table: 'phpbb_acl_roles'
 CREATE TABLE phpbb_acl_roles (
-	role_id INTEGER NOT NULL ,
+	role_id INTEGER PRIMARY KEY NOT NULL ,
 	role_name varchar(255) NOT NULL DEFAULT '',
 	role_description text(65535) NOT NULL DEFAULT '',
 	role_type varchar(10) NOT NULL DEFAULT '',
-	role_order mediumint(4) NOT NULL DEFAULT '0',
-	PRIMARY KEY (role_id)
-);;
+	role_order INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_acl_roles_role_type ON phpbb_acl_roles (role_type);;
-CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles (role_order);;
+CREATE INDEX phpbb_acl_roles_role_type ON phpbb_acl_roles (role_type);
+CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles (role_order);
 
 # Table: 'phpbb_acl_roles_data'
 CREATE TABLE phpbb_acl_roles_data (
-	role_id mediumint(8) NOT NULL DEFAULT '0',
-	auth_option_id mediumint(8) NOT NULL DEFAULT '0',
+	role_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	auth_option_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	auth_setting tinyint(2) NOT NULL DEFAULT '0',
 	PRIMARY KEY (role_id, auth_option_id)
-);;
+);
 
 
 # Table: 'phpbb_acl_users'
 CREATE TABLE phpbb_acl_users (
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	auth_option_id mediumint(8) NOT NULL DEFAULT '0',
-	auth_role_id mediumint(8) NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	auth_option_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	auth_role_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	auth_setting tinyint(2) NOT NULL DEFAULT '0'
-);;
+);
 
-CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users (user_id);;
-CREATE INDEX phpbb_acl_users_auth_option_id ON phpbb_acl_users (auth_option_id);;
+CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users (user_id);
+CREATE INDEX phpbb_acl_users_auth_option_id ON phpbb_acl_users (auth_option_id);
 
 # Table: 'phpbb_banlist'
 CREATE TABLE phpbb_banlist (
-	ban_id INTEGER NOT NULL ,
-	ban_userid mediumint(8) NOT NULL DEFAULT '0',
+	ban_id INTEGER PRIMARY KEY NOT NULL ,
+	ban_userid INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	ban_ip varchar(40) NOT NULL DEFAULT '',
 	ban_email varchar(100) NOT NULL DEFAULT '',
-	ban_start int(11) NOT NULL DEFAULT '0',
-	ban_end int(11) NOT NULL DEFAULT '0',
-	ban_exclude tinyint(1) NOT NULL DEFAULT '0',
+	ban_start INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	ban_end INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	ban_exclude INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	ban_reason text(65535) NOT NULL DEFAULT '',
-	ban_give_reason text(65535) NOT NULL DEFAULT '',
-	PRIMARY KEY (ban_id)
-);;
+	ban_give_reason text(65535) NOT NULL DEFAULT ''
+);
 
 
 # Table: 'phpbb_bbcodes'
 CREATE TABLE phpbb_bbcodes (
 	bbcode_id tinyint(3) NOT NULL DEFAULT '0',
 	bbcode_tag varchar(16) NOT NULL DEFAULT '',
-	bbcode_helpline varchar(255) DEFAULT '' NOT NULL,
-	display_on_posting tinyint(1) NOT NULL DEFAULT '0',
+	bbcode_helpline varchar(255) NOT NULL DEFAULT '',
+	display_on_posting INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	bbcode_match varchar(255) NOT NULL DEFAULT '',
 	bbcode_tpl mediumtext(16777215) NOT NULL DEFAULT '',
 	first_pass_match varchar(255) NOT NULL DEFAULT '',
@@ -117,42 +113,41 @@ CREATE TABLE phpbb_bbcodes (
 	second_pass_match varchar(255) NOT NULL DEFAULT '',
 	second_pass_replace mediumtext(16777215) NOT NULL DEFAULT '',
 	PRIMARY KEY (bbcode_id)
-);;
+);
 
-CREATE INDEX phpbb_bbcodes_display_in_posting ON phpbb_bbcodes (display_on_posting);;
+CREATE INDEX phpbb_bbcodes_display_on_post ON phpbb_bbcodes (display_on_posting);
 
 # Table: 'phpbb_bookmarks'
 CREATE TABLE phpbb_bookmarks (
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	order_id mediumint(8) NOT NULL DEFAULT '0'
-);;
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	order_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_bookmarks_order_id ON phpbb_bookmarks (order_id);;
-CREATE INDEX phpbb_bookmarks_topic_user_id ON phpbb_bookmarks (topic_id, user_id);;
+CREATE INDEX phpbb_bookmarks_order_id ON phpbb_bookmarks (order_id);
+CREATE INDEX phpbb_bookmarks_topic_user_id ON phpbb_bookmarks (topic_id, user_id);
 
 # Table: 'phpbb_bots'
 CREATE TABLE phpbb_bots (
-	bot_id INTEGER NOT NULL ,
-	bot_active tinyint(1) NOT NULL DEFAULT '1',
+	bot_id INTEGER PRIMARY KEY NOT NULL ,
+	bot_active INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	bot_name text(65535) NOT NULL DEFAULT '',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	bot_agent varchar(255) NOT NULL DEFAULT '',
-	bot_ip varchar(255) NOT NULL DEFAULT '',
-	PRIMARY KEY (bot_id)
-);;
+	bot_ip varchar(255) NOT NULL DEFAULT ''
+);
 
-CREATE INDEX phpbb_bots_bot_active ON phpbb_bots (bot_active);;
+CREATE INDEX phpbb_bots_bot_active ON phpbb_bots (bot_active);
 
 # Table: 'phpbb_config'
 CREATE TABLE phpbb_config (
-	config_name varchar(255) NOT NULL DEFAULT '',
+	config_name varchar(252) NOT NULL DEFAULT '',
 	config_value varchar(255) NOT NULL DEFAULT '',
-	is_dynamic tinyint(1) NOT NULL DEFAULT '0',
+	is_dynamic INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	PRIMARY KEY (config_name)
-);;
+);
 
-CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic);;
+CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic);
 
 # Table: 'phpbb_confirm'
 CREATE TABLE phpbb_confirm (
@@ -161,66 +156,62 @@ CREATE TABLE phpbb_confirm (
 	confirm_type tinyint(3) NOT NULL DEFAULT '0',
 	code varchar(8) NOT NULL DEFAULT '',
 	PRIMARY KEY (session_id, confirm_id)
-);;
+);
 
 
 # Table: 'phpbb_disallow'
 CREATE TABLE phpbb_disallow (
-	disallow_id INTEGER NOT NULL ,
-	disallow_username varchar(255) NOT NULL DEFAULT '',
-	PRIMARY KEY (disallow_id)
-);;
+	disallow_id INTEGER PRIMARY KEY NOT NULL ,
+	disallow_username varchar(252) NOT NULL DEFAULT ''
+);
 
 
 # Table: 'phpbb_drafts'
 CREATE TABLE phpbb_drafts (
-	draft_id INTEGER NOT NULL ,
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	save_time int(11) NOT NULL DEFAULT '0',
+	draft_id INTEGER PRIMARY KEY NOT NULL ,
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	save_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	draft_subject text(65535) NOT NULL DEFAULT '',
-	draft_message mediumtext(16777215) NOT NULL DEFAULT '',
-	PRIMARY KEY (draft_id)
-);;
+	draft_message mediumtext(16777215) NOT NULL DEFAULT ''
+);
 
-CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts (save_time);;
+CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts (save_time);
 
 # Table: 'phpbb_extensions'
 CREATE TABLE phpbb_extensions (
-	extension_id INTEGER NOT NULL ,
-	group_id mediumint(8) NOT NULL DEFAULT '0',
-	extension varchar(100) NOT NULL DEFAULT '',
-	PRIMARY KEY (extension_id)
-);;
+	extension_id INTEGER PRIMARY KEY NOT NULL ,
+	group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	extension varchar(100) NOT NULL DEFAULT ''
+);
 
 
 # Table: 'phpbb_extension_groups'
 CREATE TABLE phpbb_extension_groups (
-	group_id INTEGER NOT NULL ,
+	group_id INTEGER PRIMARY KEY NOT NULL ,
 	group_name varchar(255) NOT NULL DEFAULT '',
 	cat_id tinyint(2) NOT NULL DEFAULT '0',
-	allow_group tinyint(1) NOT NULL DEFAULT '0',
-	download_mode tinyint(1) NOT NULL DEFAULT '1',
+	allow_group INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	download_mode INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	upload_icon varchar(255) NOT NULL DEFAULT '',
-	max_filesize int(20) NOT NULL DEFAULT '0',
+	max_filesize INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	allowed_forums text(65535) NOT NULL DEFAULT '',
-	allow_in_pm tinyint(1) NOT NULL DEFAULT '0',
-	PRIMARY KEY (group_id)
-);;
+	allow_in_pm INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
 
 # Table: 'phpbb_forums'
 CREATE TABLE phpbb_forums (
-	forum_id INTEGER NOT NULL ,
-	parent_id mediumint(8) NOT NULL DEFAULT '0',
-	left_id mediumint(8) NOT NULL DEFAULT '0',
-	right_id mediumint(8) NOT NULL DEFAULT '0',
+	forum_id INTEGER PRIMARY KEY NOT NULL ,
+	parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	left_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	right_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	forum_parents mediumtext(16777215) NOT NULL DEFAULT '',
 	forum_name text(65535) NOT NULL DEFAULT '',
 	forum_desc text(65535) NOT NULL DEFAULT '',
 	forum_desc_bitfield blob NOT NULL DEFAULT '',
-	forum_desc_options int(11) NOT NULL DEFAULT '0',
+	forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	forum_desc_uid varchar(5) NOT NULL DEFAULT '',
 	forum_link varchar(255) NOT NULL DEFAULT '',
 	forum_password varchar(40) NOT NULL DEFAULT '',
@@ -229,307 +220,298 @@ CREATE TABLE phpbb_forums (
 	forum_rules text(65535) NOT NULL DEFAULT '',
 	forum_rules_link varchar(255) NOT NULL DEFAULT '',
 	forum_rules_bitfield blob NOT NULL DEFAULT '',
-	forum_rules_options int(11) NOT NULL DEFAULT '0',
+	forum_rules_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	forum_rules_uid varchar(5) NOT NULL DEFAULT '',
 	forum_topics_per_page tinyint(4) NOT NULL DEFAULT '0',
 	forum_type tinyint(4) NOT NULL DEFAULT '0',
 	forum_status tinyint(4) NOT NULL DEFAULT '0',
-	forum_posts mediumint(8) NOT NULL DEFAULT '0',
-	forum_topics mediumint(8) NOT NULL DEFAULT '0',
-	forum_topics_real mediumint(8) NOT NULL DEFAULT '0',
-	forum_last_post_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_last_poster_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_last_post_time int(11) NOT NULL DEFAULT '0',
+	forum_posts INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_topics INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_topics_real INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_last_post_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_last_poster_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_last_post_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	forum_last_poster_name varchar(255) NOT NULL DEFAULT '',
 	forum_flags tinyint(4) NOT NULL DEFAULT '32',
-	display_on_index tinyint(1) NOT NULL DEFAULT '1',
-	enable_indexing tinyint(1) NOT NULL DEFAULT '1',
-	enable_icons tinyint(1) NOT NULL DEFAULT '1',
-	enable_prune tinyint(1) NOT NULL DEFAULT '0',
-	prune_next int(11) NOT NULL DEFAULT '0',
+	display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_indexing INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_icons INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_prune INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	prune_next INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	prune_days tinyint(4) NOT NULL DEFAULT '0',
 	prune_viewed tinyint(4) NOT NULL DEFAULT '0',
-	prune_freq tinyint(4) NOT NULL DEFAULT '0',
-	PRIMARY KEY (forum_id)
-);;
+	prune_freq tinyint(4) NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_forums_left_right_id ON phpbb_forums (left_id, right_id);;
-CREATE INDEX phpbb_forums_forum_last_post_id ON phpbb_forums (forum_last_post_id);;
+CREATE INDEX phpbb_forums_left_right_id ON phpbb_forums (left_id, right_id);
+CREATE INDEX phpbb_forums_forum_lastpost_id ON phpbb_forums (forum_last_post_id);
 
 # Table: 'phpbb_forums_access'
 CREATE TABLE phpbb_forums_access (
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	session_id char(32) NOT NULL DEFAULT '',
 	PRIMARY KEY (forum_id, user_id, session_id)
-);;
+);
 
 
 # Table: 'phpbb_forums_track'
 CREATE TABLE phpbb_forums_track (
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	mark_time int(11) NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	mark_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	PRIMARY KEY (user_id, forum_id)
-);;
+);
 
 
 # Table: 'phpbb_forums_watch'
 CREATE TABLE phpbb_forums_watch (
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	notify_status tinyint(1) NOT NULL DEFAULT '0'
-);;
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	notify_status INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_forums_watch_forum_id ON phpbb_forums_watch (forum_id);;
-CREATE INDEX phpbb_forums_watch_user_id ON phpbb_forums_watch (user_id);;
-CREATE INDEX phpbb_forums_watch_notify_status ON phpbb_forums_watch (notify_status);;
+CREATE INDEX phpbb_forums_watch_forum_id ON phpbb_forums_watch (forum_id);
+CREATE INDEX phpbb_forums_watch_user_id ON phpbb_forums_watch (user_id);
+CREATE INDEX phpbb_forums_watch_notify_stat ON phpbb_forums_watch (notify_status);
 
 # Table: 'phpbb_groups'
 CREATE TABLE phpbb_groups (
-	group_id INTEGER NOT NULL ,
+	group_id INTEGER PRIMARY KEY NOT NULL ,
 	group_type tinyint(4) NOT NULL DEFAULT '1',
-	group_name varchar(255) NOT NULL DEFAULT '',
+	group_name varchar(252) NOT NULL DEFAULT '',
 	group_desc text(65535) NOT NULL DEFAULT '',
 	group_desc_bitfield blob NOT NULL DEFAULT '',
-	group_desc_options int(11) NOT NULL DEFAULT '0',
+	group_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_desc_uid varchar(5) NOT NULL DEFAULT '',
-	group_display tinyint(1) NOT NULL DEFAULT '0',
+	group_display INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_avatar varchar(255) NOT NULL DEFAULT '',
 	group_avatar_type tinyint(4) NOT NULL DEFAULT '0',
 	group_avatar_width tinyint(4) NOT NULL DEFAULT '0',
 	group_avatar_height tinyint(4) NOT NULL DEFAULT '0',
-	group_rank mediumint(8) NOT NULL DEFAULT '0',
+	group_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_colour varchar(6) NOT NULL DEFAULT '',
-	group_sig_chars mediumint(8) NOT NULL DEFAULT '0',
-	group_receive_pm tinyint(1) NOT NULL DEFAULT '0',
-	group_message_limit mediumint(8) NOT NULL DEFAULT '0',
-	group_legend tinyint(1) NOT NULL DEFAULT '1',
-	PRIMARY KEY (group_id)
-);;
+	group_sig_chars INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	group_receive_pm INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	group_message_limit INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	group_legend INTEGER UNSIGNED NOT NULL DEFAULT '1'
+);
 
-CREATE INDEX phpbb_groups_group_legend ON phpbb_groups (group_legend);;
+CREATE INDEX phpbb_groups_group_legend ON phpbb_groups (group_legend);
 
 # Table: 'phpbb_icons'
 CREATE TABLE phpbb_icons (
-	icons_id INTEGER NOT NULL ,
+	icons_id INTEGER PRIMARY KEY NOT NULL ,
 	icons_url varchar(255) NOT NULL DEFAULT '',
 	icons_width tinyint(4) NOT NULL DEFAULT '0',
 	icons_height tinyint(4) NOT NULL DEFAULT '0',
-	icons_order mediumint(8) NOT NULL DEFAULT '0',
-	display_on_posting tinyint(1) NOT NULL DEFAULT '1',
-	PRIMARY KEY (icons_id)
-);;
+	icons_order INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	display_on_posting INTEGER UNSIGNED NOT NULL DEFAULT '1'
+);
 
+CREATE INDEX phpbb_icons_display_on_posting ON phpbb_icons (display_on_posting);
 
 # Table: 'phpbb_lang'
 CREATE TABLE phpbb_lang (
-	lang_id INTEGER NOT NULL ,
+	lang_id INTEGER PRIMARY KEY NOT NULL ,
 	lang_iso varchar(30) NOT NULL DEFAULT '',
 	lang_dir varchar(30) NOT NULL DEFAULT '',
 	lang_english_name varchar(100) NOT NULL DEFAULT '',
 	lang_local_name varchar(255) NOT NULL DEFAULT '',
-	lang_author varchar(255) NOT NULL DEFAULT '',
-	PRIMARY KEY (lang_id)
-);;
+	lang_author varchar(255) NOT NULL DEFAULT ''
+);
 
-CREATE INDEX phpbb_lang_lang_iso ON phpbb_lang (lang_iso);;
+CREATE INDEX phpbb_lang_lang_iso ON phpbb_lang (lang_iso);
 
 # Table: 'phpbb_log'
 CREATE TABLE phpbb_log (
-	log_id INTEGER NOT NULL ,
+	log_id INTEGER PRIMARY KEY NOT NULL ,
 	log_type tinyint(4) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
-	reportee_id mediumint(8) NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	reportee_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	log_ip varchar(40) NOT NULL DEFAULT '',
-	log_time int(11) NOT NULL DEFAULT '0',
+	log_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	log_operation text(65535) NOT NULL DEFAULT '',
-	log_data mediumtext(16777215) NOT NULL DEFAULT '',
-	PRIMARY KEY (log_id)
-);;
+	log_data mediumtext(16777215) NOT NULL DEFAULT ''
+);
 
-CREATE INDEX phpbb_log_log_type ON phpbb_log (log_type);;
-CREATE INDEX phpbb_log_forum_id ON phpbb_log (forum_id);;
-CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);;
-CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);;
-CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);;
+CREATE INDEX phpbb_log_log_type ON phpbb_log (log_type);
+CREATE INDEX phpbb_log_forum_id ON phpbb_log (forum_id);
+CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);
+CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);
+CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	username varchar(255) NOT NULL DEFAULT '',
-	group_id mediumint(8) NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	username varchar(252) NOT NULL DEFAULT '',
+	group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_name varchar(255) NOT NULL DEFAULT '',
-	display_on_index tinyint(1) NOT NULL DEFAULT '1'
-);;
+	display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1'
+);
 
-CREATE INDEX phpbb_moderator_cache_display_on_index ON phpbb_moderator_cache (display_on_index);;
-CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id);;
+CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on_index);
+CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id);
 
 # Table: 'phpbb_modules'
 CREATE TABLE phpbb_modules (
-	module_id INTEGER NOT NULL ,
-	module_enabled tinyint(1) NOT NULL DEFAULT '1',
-	module_display tinyint(1) NOT NULL DEFAULT '1',
+	module_id INTEGER PRIMARY KEY NOT NULL ,
+	module_enabled INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	module_display INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	module_basename varchar(255) NOT NULL DEFAULT '',
 	module_class varchar(10) NOT NULL DEFAULT '',
-	parent_id mediumint(8) NOT NULL DEFAULT '0',
-	left_id mediumint(8) NOT NULL DEFAULT '0',
-	right_id mediumint(8) NOT NULL DEFAULT '0',
+	parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	left_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	right_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	module_langname varchar(255) NOT NULL DEFAULT '',
 	module_mode varchar(255) NOT NULL DEFAULT '',
-	module_auth varchar(255) NOT NULL DEFAULT '',
-	PRIMARY KEY (module_id)
-);;
+	module_auth varchar(255) NOT NULL DEFAULT ''
+);
 
-CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);;
-CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled);;
-CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id);;
+CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);
+CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled);
+CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id);
 
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
 	poll_option_id tinyint(4) NOT NULL DEFAULT '0',
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	poll_option_text text(65535) NOT NULL DEFAULT '',
-	poll_option_total mediumint(8) NOT NULL DEFAULT '0'
-);;
+	poll_option_total INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_poll_options_poll_option_id ON phpbb_poll_options (poll_option_id);;
-CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options (topic_id);;
+CREATE INDEX phpbb_poll_options_poll_opt_id ON phpbb_poll_options (poll_option_id);
+CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options (topic_id);
 
 # Table: 'phpbb_poll_votes'
 CREATE TABLE phpbb_poll_votes (
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	poll_option_id tinyint(4) NOT NULL DEFAULT '0',
-	vote_user_id mediumint(8) NOT NULL DEFAULT '0',
+	vote_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	vote_user_ip varchar(40) NOT NULL DEFAULT ''
-);;
+);
 
-CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes (topic_id);;
-CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id);;
-CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip);;
+CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes (topic_id);
+CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id);
+CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip);
 
 # Table: 'phpbb_posts'
 CREATE TABLE phpbb_posts (
-	post_id INTEGER NOT NULL ,
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	poster_id mediumint(8) NOT NULL DEFAULT '0',
-	icon_id mediumint(8) NOT NULL DEFAULT '0',
+	post_id INTEGER PRIMARY KEY NOT NULL ,
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	poster_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	icon_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	poster_ip varchar(40) NOT NULL DEFAULT '',
-	post_time int(11) NOT NULL DEFAULT '0',
-	post_approved tinyint(1) NOT NULL DEFAULT '1',
-	post_reported tinyint(1) NOT NULL DEFAULT '0',
-	enable_bbcode tinyint(1) NOT NULL DEFAULT '1',
-	enable_smilies tinyint(1) NOT NULL DEFAULT '1',
-	enable_magic_url tinyint(1) NOT NULL DEFAULT '1',
-	enable_sig tinyint(1) NOT NULL DEFAULT '1',
-	post_username varchar(255) NOT NULL DEFAULT '',
+	post_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	post_approved INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	post_reported INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	enable_bbcode INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_smilies INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_magic_url INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_sig INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	post_username varchar(252) NOT NULL DEFAULT '',
 	post_subject text(65535) NOT NULL DEFAULT '',
 	post_text mediumtext(16777215) NOT NULL DEFAULT '',
 	post_checksum varchar(32) NOT NULL DEFAULT '',
 	post_encoding varchar(20) NOT NULL DEFAULT 'iso-8859-1',
-	post_attachment tinyint(1) NOT NULL DEFAULT '0',
+	post_attachment INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	bbcode_bitfield blob NOT NULL DEFAULT '',
 	bbcode_uid varchar(5) NOT NULL DEFAULT '',
-	post_postcount tinyint(1) NOT NULL DEFAULT '1',
-	post_edit_time int(11) NOT NULL DEFAULT '0',
+	post_postcount INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	post_edit_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	post_edit_reason text(65535) NOT NULL DEFAULT '',
-	post_edit_user mediumint(8) NOT NULL DEFAULT '0',
-	post_edit_count mediumint(4) NOT NULL DEFAULT '0',
-	post_edit_locked tinyint(1) NOT NULL DEFAULT '0',
-	PRIMARY KEY (post_id)
-);;
-
-CREATE INDEX phpbb_posts_forum_id ON phpbb_posts (forum_id);;
-CREATE INDEX phpbb_posts_topic_id ON phpbb_posts (topic_id);;
-CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts (poster_ip);;
-CREATE INDEX phpbb_posts_poster_id ON phpbb_posts (poster_id);;
-CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved);;
-CREATE INDEX phpbb_posts_post_postcount ON phpbb_posts (post_postcount);;
-CREATE INDEX phpbb_posts_post_time ON phpbb_posts (post_time);;
+	post_edit_user INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	post_edit_count INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	post_edit_locked INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
+
+CREATE INDEX phpbb_posts_forum_id ON phpbb_posts (forum_id);
+CREATE INDEX phpbb_posts_topic_id ON phpbb_posts (topic_id);
+CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts (poster_ip);
+CREATE INDEX phpbb_posts_poster_id ON phpbb_posts (poster_id);
+CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved);
+CREATE INDEX phpbb_posts_post_postcount ON phpbb_posts (post_postcount);
+CREATE INDEX phpbb_posts_post_time ON phpbb_posts (post_time);
 
 # Table: 'phpbb_privmsgs'
 CREATE TABLE phpbb_privmsgs (
-	msg_id INTEGER NOT NULL ,
-	root_level mediumint(8) NOT NULL DEFAULT '0',
-	author_id mediumint(8) NOT NULL DEFAULT '0',
-	icon_id mediumint(8) NOT NULL DEFAULT '0',
+	msg_id INTEGER PRIMARY KEY NOT NULL ,
+	root_level INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	author_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	icon_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	author_ip varchar(40) NOT NULL DEFAULT '',
-	message_time int(11) NOT NULL DEFAULT '0',
-	enable_bbcode tinyint(1) NOT NULL DEFAULT '1',
-	enable_smilies tinyint(1) NOT NULL DEFAULT '1',
-	enable_magic_url tinyint(1) NOT NULL DEFAULT '1',
-	enable_sig tinyint(1) NOT NULL DEFAULT '1',
+	message_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	enable_bbcode INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_smilies INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_magic_url INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	enable_sig INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	message_subject text(65535) NOT NULL DEFAULT '',
 	message_text mediumtext(16777215) NOT NULL DEFAULT '',
 	message_edit_reason text(65535) NOT NULL DEFAULT '',
-	message_edit_user mediumint(8) NOT NULL DEFAULT '0',
+	message_edit_user INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	message_encoding varchar(20) NOT NULL DEFAULT 'iso-8859-1',
-	message_attachment tinyint(1) NOT NULL DEFAULT '0',
+	message_attachment INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	bbcode_bitfield blob NOT NULL DEFAULT '',
 	bbcode_uid varchar(5) NOT NULL DEFAULT '',
-	message_edit_time int(11) NOT NULL DEFAULT '0',
-	message_edit_count mediumint(4) NOT NULL DEFAULT '0',
+	message_edit_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	message_edit_count INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	to_address text(65535) NOT NULL DEFAULT '',
-	bcc_address text(65535) NOT NULL DEFAULT '',
-	PRIMARY KEY (msg_id)
-);;
+	bcc_address text(65535) NOT NULL DEFAULT ''
+);
 
-CREATE INDEX phpbb_privmsgs_author_ip ON phpbb_privmsgs (author_ip);;
-CREATE INDEX phpbb_privmsgs_message_time ON phpbb_privmsgs (message_time);;
-CREATE INDEX phpbb_privmsgs_author_id ON phpbb_privmsgs (author_id);;
-CREATE INDEX phpbb_privmsgs_root_level ON phpbb_privmsgs (root_level);;
+CREATE INDEX phpbb_privmsgs_author_ip ON phpbb_privmsgs (author_ip);
+CREATE INDEX phpbb_privmsgs_message_time ON phpbb_privmsgs (message_time);
+CREATE INDEX phpbb_privmsgs_author_id ON phpbb_privmsgs (author_id);
+CREATE INDEX phpbb_privmsgs_root_level ON phpbb_privmsgs (root_level);
 
 # Table: 'phpbb_privmsgs_folder'
 CREATE TABLE phpbb_privmsgs_folder (
-	folder_id INTEGER NOT NULL ,
-	user_id mediumint(8) NOT NULL DEFAULT '0',
+	folder_id INTEGER PRIMARY KEY NOT NULL ,
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	folder_name varchar(255) NOT NULL DEFAULT '',
-	pm_count mediumint(8) NOT NULL DEFAULT '0',
-	PRIMARY KEY (folder_id)
-);;
+	pm_count INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_privmsgs_folder_user_id ON phpbb_privmsgs_folder (user_id);;
+CREATE INDEX phpbb_privmsgs_folder_user_id ON phpbb_privmsgs_folder (user_id);
 
 # Table: 'phpbb_privmsgs_rules'
 CREATE TABLE phpbb_privmsgs_rules (
-	rule_id INTEGER NOT NULL ,
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	rule_check mediumint(8) NOT NULL DEFAULT '0',
-	rule_connection mediumint(8) NOT NULL DEFAULT '0',
+	rule_id INTEGER PRIMARY KEY NOT NULL ,
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	rule_check INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	rule_connection INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	rule_string varchar(255) NOT NULL DEFAULT '',
-	rule_user_id mediumint(8) NOT NULL DEFAULT '0',
-	rule_group_id mediumint(8) NOT NULL DEFAULT '0',
-	rule_action mediumint(8) NOT NULL DEFAULT '0',
-	rule_folder_id int(4) NOT NULL DEFAULT '0',
-	PRIMARY KEY (rule_id)
-);;
+	rule_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	rule_group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	rule_action INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	rule_folder_id int(4) NOT NULL DEFAULT '0'
+);
 
 
 # Table: 'phpbb_privmsgs_to'
 CREATE TABLE phpbb_privmsgs_to (
-	msg_id mediumint(8) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	author_id mediumint(8) NOT NULL DEFAULT '0',
-	pm_deleted tinyint(1) NOT NULL DEFAULT '0',
-	pm_new tinyint(1) NOT NULL DEFAULT '1',
-	pm_unread tinyint(1) NOT NULL DEFAULT '1',
-	pm_replied tinyint(1) NOT NULL DEFAULT '0',
-	pm_marked tinyint(1) NOT NULL DEFAULT '0',
-	pm_forwarded tinyint(1) NOT NULL DEFAULT '0',
+	msg_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	author_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	pm_deleted INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	pm_new INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	pm_unread INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	pm_replied INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	pm_marked INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	pm_forwarded INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	folder_id int(4) NOT NULL DEFAULT '0'
-);;
+);
 
-CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);;
-CREATE INDEX phpbb_privmsgs_to_user_folder_id ON phpbb_privmsgs_to (user_id, folder_id);;
+CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);
+CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to (user_id, folder_id);
 
 # Table: 'phpbb_profile_fields'
 CREATE TABLE phpbb_profile_fields (
-	field_id INTEGER NOT NULL ,
+	field_id INTEGER PRIMARY KEY NOT NULL ,
 	field_name varchar(255) NOT NULL DEFAULT '',
 	field_type tinyint(4) NOT NULL DEFAULT '0',
 	field_ident varchar(20) NOT NULL DEFAULT '',
@@ -539,315 +521,302 @@ CREATE TABLE phpbb_profile_fields (
 	field_novalue varchar(255) NOT NULL DEFAULT '',
 	field_default_value varchar(255) NOT NULL DEFAULT '',
 	field_validation varchar(20) NOT NULL DEFAULT '',
-	field_required tinyint(1) NOT NULL DEFAULT '0',
-	field_show_on_reg tinyint(1) NOT NULL DEFAULT '0',
-	field_hide tinyint(1) NOT NULL DEFAULT '0',
-	field_no_view tinyint(1) NOT NULL DEFAULT '0',
-	field_active tinyint(1) NOT NULL DEFAULT '0',
-	field_order mediumint(8) NOT NULL DEFAULT '0',
-	PRIMARY KEY (field_id)
-);;
-
-CREATE INDEX phpbb_profile_fields_field_type ON phpbb_profile_fields (field_type);;
-CREATE INDEX phpbb_profile_fields_field_order ON phpbb_profile_fields (field_order);;
+	field_required INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	field_show_on_reg INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	field_hide INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	field_no_view INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	field_active INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	field_order INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
+
+CREATE INDEX phpbb_profile_fields_fld_type ON phpbb_profile_fields (field_type);
+CREATE INDEX phpbb_profile_fields_fld_ordr ON phpbb_profile_fields (field_order);
 
 # Table: 'phpbb_profile_fields_data'
 CREATE TABLE phpbb_profile_fields_data (
-	user_id mediumint(8) NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	PRIMARY KEY (user_id)
-);;
+);
 
 
 # Table: 'phpbb_profile_fields_lang'
 CREATE TABLE phpbb_profile_fields_lang (
-	field_id mediumint(8) NOT NULL DEFAULT '0',
-	lang_id mediumint(8) NOT NULL DEFAULT '0',
-	option_id mediumint(8) NOT NULL DEFAULT '0',
+	field_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	lang_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	option_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_type tinyint(4) NOT NULL DEFAULT '0',
 	lang_value varchar(255) NOT NULL DEFAULT '',
 	PRIMARY KEY (field_id, lang_id, option_id)
-);;
+);
 
 
 # Table: 'phpbb_profile_lang'
 CREATE TABLE phpbb_profile_lang (
-	field_id mediumint(8) NOT NULL DEFAULT '0',
-	lang_id mediumint(8) NOT NULL DEFAULT '0',
+	field_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	lang_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	lang_name varchar(255) NOT NULL DEFAULT '',
 	lang_explain text(65535) NOT NULL DEFAULT '',
 	lang_default_value varchar(255) NOT NULL DEFAULT '',
 	PRIMARY KEY (field_id, lang_id)
-);;
+);
 
 
 # Table: 'phpbb_ranks'
 CREATE TABLE phpbb_ranks (
-	rank_id INTEGER NOT NULL ,
+	rank_id INTEGER PRIMARY KEY NOT NULL ,
 	rank_title varchar(255) NOT NULL DEFAULT '',
-	rank_min mediumint(8) NOT NULL DEFAULT '0',
-	rank_special tinyint(1) NOT NULL DEFAULT '0',
-	rank_image varchar(255) NOT NULL DEFAULT '',
-	PRIMARY KEY (rank_id)
-);;
+	rank_min INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	rank_special INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	rank_image varchar(255) NOT NULL DEFAULT ''
+);
 
 
 # Table: 'phpbb_reports'
 CREATE TABLE phpbb_reports (
-	report_id INTEGER NOT NULL ,
-	reason_id mediumint(4) NOT NULL DEFAULT '0',
-	post_id mediumint(8) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	user_notify tinyint(1) NOT NULL DEFAULT '0',
-	report_closed tinyint(1) NOT NULL DEFAULT '0',
-	report_time int(11) NOT NULL DEFAULT '0',
-	report_text mediumtext(16777215) NOT NULL DEFAULT '',
-	PRIMARY KEY (report_id)
-);;
+	report_id INTEGER PRIMARY KEY NOT NULL ,
+	reason_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	post_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_notify INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	report_closed INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	report_text mediumtext(16777215) NOT NULL DEFAULT ''
+);
 
 
 # Table: 'phpbb_reports_reasons'
 CREATE TABLE phpbb_reports_reasons (
-	reason_id INTEGER NOT NULL ,
+	reason_id INTEGER PRIMARY KEY NOT NULL ,
 	reason_title varchar(255) NOT NULL DEFAULT '',
 	reason_description mediumtext(16777215) NOT NULL DEFAULT '',
-	reason_order mediumint(4) NOT NULL DEFAULT '0',
-	PRIMARY KEY (reason_id)
-);;
+	reason_order INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
 
 # Table: 'phpbb_search_results'
 CREATE TABLE phpbb_search_results (
 	search_key varchar(32) NOT NULL DEFAULT '',
-	search_time int(11) NOT NULL DEFAULT '0',
+	search_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	search_keywords mediumtext(16777215) NOT NULL DEFAULT '',
 	search_authors mediumtext(16777215) NOT NULL DEFAULT '',
 	PRIMARY KEY (search_key)
-);;
+);
 
 
 # Table: 'phpbb_search_wordlist'
 CREATE TABLE phpbb_search_wordlist (
+	word_id INTEGER PRIMARY KEY NOT NULL ,
 	word_text varchar(252) NOT NULL DEFAULT '',
-	word_id INTEGER NOT NULL ,
-	word_common tinyint(1) NOT NULL DEFAULT '0',
-	PRIMARY KEY (word_id)
-);;
+	word_common INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_search_wordlist_word_text ON phpbb_search_wordlist (word_text);;
+CREATE UNIQUE INDEX phpbb_search_wordlist_wrd_txt ON phpbb_search_wordlist (word_text);
 
 # Table: 'phpbb_search_wordmatch'
 CREATE TABLE phpbb_search_wordmatch (
-	post_id mediumint(8) NOT NULL DEFAULT '0',
-	word_id mediumint(8) NOT NULL DEFAULT '0',
-	title_match tinyint(1) NOT NULL DEFAULT '0'
-);;
+	post_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	word_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	title_match INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_search_wordmatch_word_id ON phpbb_search_wordmatch (word_id);;
+CREATE INDEX phpbb_search_wordmatch_word_id ON phpbb_search_wordmatch (word_id);
 
 # Table: 'phpbb_sessions'
 CREATE TABLE phpbb_sessions (
 	session_id char(32) NOT NULL DEFAULT '',
-	session_user_id mediumint(8) NOT NULL DEFAULT '0',
-	session_last_visit int(11) NOT NULL DEFAULT '0',
-	session_start int(11) NOT NULL DEFAULT '0',
-	session_time int(11) NOT NULL DEFAULT '0',
+	session_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	session_last_visit INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	session_start INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	session_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	session_ip varchar(40) NOT NULL DEFAULT '',
 	session_browser varchar(150) NOT NULL DEFAULT '',
 	session_page varchar(255) NOT NULL DEFAULT '',
-	session_viewonline tinyint(1) NOT NULL DEFAULT '1',
-	session_autologin tinyint(1) NOT NULL DEFAULT '0',
-	session_admin tinyint(1) NOT NULL DEFAULT '0',
+	session_viewonline INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	session_autologin INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	session_admin INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	PRIMARY KEY (session_id)
-);;
+);
 
-CREATE INDEX phpbb_sessions_session_time ON phpbb_sessions (session_time);;
-CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions (session_user_id);;
+CREATE INDEX phpbb_sessions_session_time ON phpbb_sessions (session_time);
+CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions (session_user_id);
 
 # Table: 'phpbb_sessions_keys'
 CREATE TABLE phpbb_sessions_keys (
 	key_id char(32) NOT NULL DEFAULT '',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	last_ip varchar(40) NOT NULL DEFAULT '',
-	last_login int(11) NOT NULL DEFAULT '0',
+	last_login INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	PRIMARY KEY (key_id, user_id)
-);;
+);
 
-CREATE INDEX phpbb_sessions_keys_last_login ON phpbb_sessions_keys (last_login);;
+CREATE INDEX phpbb_sessions_keys_last_login ON phpbb_sessions_keys (last_login);
 
 # Table: 'phpbb_sitelist'
 CREATE TABLE phpbb_sitelist (
-	site_id INTEGER NOT NULL ,
+	site_id INTEGER PRIMARY KEY NOT NULL ,
 	site_ip varchar(40) NOT NULL DEFAULT '',
 	site_hostname varchar(255) NOT NULL DEFAULT '',
-	ip_exclude tinyint(1) NOT NULL DEFAULT '0',
-	PRIMARY KEY (site_id)
-);;
+	ip_exclude INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
 
 # Table: 'phpbb_smilies'
 CREATE TABLE phpbb_smilies (
-	smiley_id INTEGER NOT NULL ,
+	smiley_id INTEGER PRIMARY KEY NOT NULL ,
 	code varchar(50) NOT NULL DEFAULT '',
 	emotion varchar(50) NOT NULL DEFAULT '',
 	smiley_url varchar(50) NOT NULL DEFAULT '',
 	smiley_width tinyint(4) NOT NULL DEFAULT '0',
 	smiley_height tinyint(4) NOT NULL DEFAULT '0',
-	smiley_order mediumint(8) NOT NULL DEFAULT '0',
-	display_on_posting tinyint(1) NOT NULL DEFAULT '1',
-	PRIMARY KEY (smiley_id)
-);;
+	smiley_order INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	display_on_posting INTEGER UNSIGNED NOT NULL DEFAULT '1'
+);
 
-CREATE INDEX phpbb_smilies_display_on_posting ON phpbb_smilies (display_on_posting);;
+CREATE INDEX phpbb_smilies_display_on_post ON phpbb_smilies (display_on_posting);
 
 # Table: 'phpbb_styles'
 CREATE TABLE phpbb_styles (
-	style_id INTEGER NOT NULL ,
-	style_name varchar(255) NOT NULL DEFAULT '',
+	style_id INTEGER PRIMARY KEY NOT NULL ,
+	style_name varchar(252) NOT NULL DEFAULT '',
 	style_copyright varchar(255) NOT NULL DEFAULT '',
-	style_active tinyint(1) NOT NULL DEFAULT '1',
+	style_active INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	template_id tinyint(4) NOT NULL DEFAULT '0',
 	theme_id tinyint(4) NOT NULL DEFAULT '0',
-	imageset_id tinyint(4) NOT NULL DEFAULT '0',
-	PRIMARY KEY (style_id)
-);;
+	imageset_id tinyint(4) NOT NULL DEFAULT '0'
+);
 
-CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);;
-CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id);;
-CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id);;
-CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles (imageset_id);;
+CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
+CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id);
+CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id);
+CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles (imageset_id);
 
 # Table: 'phpbb_styles_template'
 CREATE TABLE phpbb_styles_template (
-	template_id INTEGER NOT NULL ,
-	template_name varchar(255) NOT NULL DEFAULT '',
+	template_id INTEGER PRIMARY KEY NOT NULL ,
+	template_name varchar(252) NOT NULL DEFAULT '',
 	template_copyright varchar(255) NOT NULL DEFAULT '',
 	template_path varchar(100) NOT NULL DEFAULT '',
 	bbcode_bitfield blob NOT NULL DEFAULT '',
-	template_storedb tinyint(1) NOT NULL DEFAULT '0',
-	PRIMARY KEY (template_id)
-);;
+	template_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE UNIQUE INDEX phpbb_styles_template_template_name ON phpbb_styles_template (template_name);;
-
-CREATE TRIGGER "t_phpbb_styles_template"
-AFTER INSERT ON "phpbb_styles_template"
-FOR EACH ROW WHEN NEW.bbcode_bitfield = ''
-BEGIN
-   UPDATE phpbb_styles_template SET bbcode_bitfield = binary_insert(1) WHERE template_id = NEW.template_id;
-END;;
+CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name);
 
 # Table: 'phpbb_styles_template_data'
 CREATE TABLE phpbb_styles_template_data (
-	template_id INTEGER NOT NULL ,
+	template_id INTEGER PRIMARY KEY NOT NULL ,
 	template_filename varchar(100) NOT NULL DEFAULT '',
 	template_included text(65535) NOT NULL DEFAULT '',
-	template_mtime int(11) NOT NULL DEFAULT '0',
+	template_mtime INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	template_data mediumtext(16777215) NOT NULL DEFAULT ''
-);;
+);
 
-CREATE INDEX phpbb_styles_template_data_template_id ON phpbb_styles_template_data (template_id);;
-CREATE INDEX phpbb_styles_template_data_template_filename ON phpbb_styles_template_data (template_filename);;
+CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data (template_id);
+CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data (template_filename);
 
 # Table: 'phpbb_styles_theme'
 CREATE TABLE phpbb_styles_theme (
-	theme_id INTEGER NOT NULL ,
-	theme_name varchar(255) NOT NULL DEFAULT '',
+	theme_id INTEGER PRIMARY KEY NOT NULL ,
+	theme_name varchar(252) NOT NULL DEFAULT '',
 	theme_copyright varchar(255) NOT NULL DEFAULT '',
 	theme_path varchar(100) NOT NULL DEFAULT '',
-	theme_storedb tinyint(1) NOT NULL DEFAULT '0',
-	theme_mtime int(11) NOT NULL DEFAULT '0',
-	theme_data mediumtext(16777215) NOT NULL DEFAULT '',
-	PRIMARY KEY (theme_id)
-);;
+	theme_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	theme_mtime INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	theme_data mediumtext(16777215) NOT NULL DEFAULT ''
+);
 
-CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name);;
+CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name);
 
 # Table: 'phpbb_styles_imageset'
 CREATE TABLE phpbb_styles_imageset (
-	imageset_id INTEGER NOT NULL ,
-	imageset_name varchar(255) NOT NULL DEFAULT '',
+	imageset_id INTEGER PRIMARY KEY NOT NULL ,
+	imageset_name varchar(252) NOT NULL DEFAULT '',
 	imageset_copyright varchar(255) NOT NULL DEFAULT '',
 	imageset_path varchar(100) NOT NULL DEFAULT '',
 	site_logo varchar(200) NOT NULL DEFAULT '',
-	btn_post varchar(200) NOT NULL DEFAULT '',
-	btn_post_pm varchar(200) NOT NULL DEFAULT '',
-	btn_reply varchar(200) NOT NULL DEFAULT '',
-	btn_reply_pm varchar(200) NOT NULL DEFAULT '',
-	btn_locked varchar(200) NOT NULL DEFAULT '',
-	btn_profile varchar(200) NOT NULL DEFAULT '',
-	btn_pm varchar(200) NOT NULL DEFAULT '',
-	btn_delete varchar(200) NOT NULL DEFAULT '',
-	btn_info varchar(200) NOT NULL DEFAULT '',
-	btn_quote varchar(200) NOT NULL DEFAULT '',
-	btn_search varchar(200) NOT NULL DEFAULT '',
-	btn_edit varchar(200) NOT NULL DEFAULT '',
-	btn_report varchar(200) NOT NULL DEFAULT '',
-	btn_warn varchar(200) NOT NULL DEFAULT '',
-	btn_email varchar(200) NOT NULL DEFAULT '',
-	btn_www varchar(200) NOT NULL DEFAULT '',
-	btn_icq varchar(200) NOT NULL DEFAULT '',
-	btn_aim varchar(200) NOT NULL DEFAULT '',
-	btn_yim varchar(200) NOT NULL DEFAULT '',
-	btn_msnm varchar(200) NOT NULL DEFAULT '',
-	btn_jabber varchar(200) NOT NULL DEFAULT '',
-	btn_online varchar(200) NOT NULL DEFAULT '',
-	btn_offline varchar(200) NOT NULL DEFAULT '',
-	btn_friend varchar(200) NOT NULL DEFAULT '',
-	btn_foe varchar(200) NOT NULL DEFAULT '',
-	icon_unapproved varchar(200) NOT NULL DEFAULT '',
-	icon_reported varchar(200) NOT NULL DEFAULT '',
-	icon_attach varchar(200) NOT NULL DEFAULT '',
-	icon_post varchar(200) NOT NULL DEFAULT '',
-	icon_post_new varchar(200) NOT NULL DEFAULT '',
-	icon_post_latest varchar(200) NOT NULL DEFAULT '',
-	icon_post_newest varchar(200) NOT NULL DEFAULT '',
-	forum varchar(200) NOT NULL DEFAULT '',
-	forum_new varchar(200) NOT NULL DEFAULT '',
-	forum_locked varchar(200) NOT NULL DEFAULT '',
-	forum_link varchar(200) NOT NULL DEFAULT '',
-	sub_forum varchar(200) NOT NULL DEFAULT '',
-	sub_forum_new varchar(200) NOT NULL DEFAULT '',
-	folder varchar(200) NOT NULL DEFAULT '',
-	folder_moved varchar(200) NOT NULL DEFAULT '',
-	folder_post varchar(200) NOT NULL DEFAULT '',
-	folder_new varchar(200) NOT NULL DEFAULT '',
-	folder_new_post varchar(200) NOT NULL DEFAULT '',
-	folder_hot varchar(200) NOT NULL DEFAULT '',
-	folder_hot_post varchar(200) NOT NULL DEFAULT '',
-	folder_hot_new varchar(200) NOT NULL DEFAULT '',
-	folder_hot_new_post varchar(200) NOT NULL DEFAULT '',
-	folder_lock varchar(200) NOT NULL DEFAULT '',
-	folder_lock_post varchar(200) NOT NULL DEFAULT '',
-	folder_lock_new varchar(200) NOT NULL DEFAULT '',
-	folder_lock_new_post varchar(200) NOT NULL DEFAULT '',
-	folder_lock_announce varchar(200) NOT NULL DEFAULT '',
-	folder_lock_announce_new varchar(200) NOT NULL DEFAULT '',
-	folder_lock_announce_post varchar(200) NOT NULL DEFAULT '',
-	folder_lock_announce_new_post varchar(200) NOT NULL DEFAULT '',
-	folder_lock_global varchar(200) NOT NULL DEFAULT '',
-	folder_lock_global_new varchar(200) NOT NULL DEFAULT '',
-	folder_lock_global_post varchar(200) NOT NULL DEFAULT '',
-	folder_lock_global_new_post varchar(200) NOT NULL DEFAULT '',
-	folder_lock_sticky varchar(200) NOT NULL DEFAULT '',
-	folder_lock_sticky_new varchar(200) NOT NULL DEFAULT '',
-	folder_lock_sticky_post varchar(200) NOT NULL DEFAULT '',
-	folder_lock_sticky_new_post varchar(200) NOT NULL DEFAULT '',
-	folder_sticky varchar(200) NOT NULL DEFAULT '',
-	folder_sticky_post varchar(200) NOT NULL DEFAULT '',
-	folder_sticky_new varchar(200) NOT NULL DEFAULT '',
-	folder_sticky_new_post varchar(200) NOT NULL DEFAULT '',
-	folder_announce varchar(200) NOT NULL DEFAULT '',
-	folder_announce_post varchar(200) NOT NULL DEFAULT '',
-	folder_announce_new varchar(200) NOT NULL DEFAULT '',
-	folder_announce_new_post varchar(200) NOT NULL DEFAULT '',
-	folder_global varchar(200) NOT NULL DEFAULT '',
-	folder_global_post varchar(200) NOT NULL DEFAULT '',
-	folder_global_new varchar(200) NOT NULL DEFAULT '',
-	folder_global_new_post varchar(200) NOT NULL DEFAULT '',
+	upload_bar varchar(200) NOT NULL DEFAULT '',
 	poll_left varchar(200) NOT NULL DEFAULT '',
 	poll_center varchar(200) NOT NULL DEFAULT '',
 	poll_right varchar(200) NOT NULL DEFAULT '',
-	attach_progress_bar varchar(200) NOT NULL DEFAULT '',
+	icon_friend varchar(200) NOT NULL DEFAULT '',
+	icon_foe varchar(200) NOT NULL DEFAULT '',
+	forum_link varchar(200) NOT NULL DEFAULT '',
+	forum_read varchar(200) NOT NULL DEFAULT '',
+	forum_read_locked varchar(200) NOT NULL DEFAULT '',
+	forum_read_subforum varchar(200) NOT NULL DEFAULT '',
+	forum_unread varchar(200) NOT NULL DEFAULT '',
+	forum_unread_locked varchar(200) NOT NULL DEFAULT '',
+	forum_unread_subforum varchar(200) NOT NULL DEFAULT '',
+	topic_moved varchar(200) NOT NULL DEFAULT '',
+	topic_read varchar(200) NOT NULL DEFAULT '',
+	topic_read_mine varchar(200) NOT NULL DEFAULT '',
+	topic_read_hot varchar(200) NOT NULL DEFAULT '',
+	topic_read_hot_mine varchar(200) NOT NULL DEFAULT '',
+	topic_read_locked varchar(200) NOT NULL DEFAULT '',
+	topic_read_locked_mine varchar(200) NOT NULL DEFAULT '',
+	topic_unread varchar(200) NOT NULL DEFAULT '',
+	topic_unread_mine varchar(200) NOT NULL DEFAULT '',
+	topic_unread_hot varchar(200) NOT NULL DEFAULT '',
+	topic_unread_hot_mine varchar(200) NOT NULL DEFAULT '',
+	topic_unread_locked varchar(200) NOT NULL DEFAULT '',
+	topic_unread_locked_mine varchar(200) NOT NULL DEFAULT '',
+	sticky_read varchar(200) NOT NULL DEFAULT '',
+	sticky_read_mine varchar(200) NOT NULL DEFAULT '',
+	sticky_read_locked varchar(200) NOT NULL DEFAULT '',
+	sticky_read_locked_mine varchar(200) NOT NULL DEFAULT '',
+	sticky_unread varchar(200) NOT NULL DEFAULT '',
+	sticky_unread_mine varchar(200) NOT NULL DEFAULT '',
+	sticky_unread_locked varchar(200) NOT NULL DEFAULT '',
+	sticky_unread_locked_mine varchar(200) NOT NULL DEFAULT '',
+	announce_read varchar(200) NOT NULL DEFAULT '',
+	announce_read_mine varchar(200) NOT NULL DEFAULT '',
+	announce_read_locked varchar(200) NOT NULL DEFAULT '',
+	announce_read_locked_mine varchar(200) NOT NULL DEFAULT '',
+	announce_unread varchar(200) NOT NULL DEFAULT '',
+	announce_unread_mine varchar(200) NOT NULL DEFAULT '',
+	announce_unread_locked varchar(200) NOT NULL DEFAULT '',
+	announce_unread_locked_mine varchar(200) NOT NULL DEFAULT '',
+	global_read varchar(200) NOT NULL DEFAULT '',
+	global_read_mine varchar(200) NOT NULL DEFAULT '',
+	global_read_locked varchar(200) NOT NULL DEFAULT '',
+	global_read_locked_mine varchar(200) NOT NULL DEFAULT '',
+	global_unread varchar(200) NOT NULL DEFAULT '',
+	global_unread_mine varchar(200) NOT NULL DEFAULT '',
+	global_unread_locked varchar(200) NOT NULL DEFAULT '',
+	global_unread_locked_mine varchar(200) NOT NULL DEFAULT '',
+	pm_read varchar(200) NOT NULL DEFAULT '',
+	pm_unread varchar(200) NOT NULL DEFAULT '',
+	icon_contact_aim varchar(200) NOT NULL DEFAULT '',
+	icon_contact_email varchar(200) NOT NULL DEFAULT '',
+	icon_contact_icq varchar(200) NOT NULL DEFAULT '',
+	icon_contact_jabber varchar(200) NOT NULL DEFAULT '',
+	icon_contact_msnm varchar(200) NOT NULL DEFAULT '',
+	icon_contact_pm varchar(200) NOT NULL DEFAULT '',
+	icon_contact_yahoo varchar(200) NOT NULL DEFAULT '',
+	icon_contact_www varchar(200) NOT NULL DEFAULT '',
+	icon_post_delete varchar(200) NOT NULL DEFAULT '',
+	icon_post_edit varchar(200) NOT NULL DEFAULT '',
+	icon_post_info varchar(200) NOT NULL DEFAULT '',
+	icon_post_quote varchar(200) NOT NULL DEFAULT '',
+	icon_post_report varchar(200) NOT NULL DEFAULT '',
+	icon_post_target varchar(200) NOT NULL DEFAULT '',
+	icon_post_target_unread varchar(200) NOT NULL DEFAULT '',
+	icon_topic_attach varchar(200) NOT NULL DEFAULT '',
+	icon_topic_latest varchar(200) NOT NULL DEFAULT '',
+	icon_topic_newest varchar(200) NOT NULL DEFAULT '',
+	icon_topic_reported varchar(200) NOT NULL DEFAULT '',
+	icon_topic_unapproved varchar(200) NOT NULL DEFAULT '',
+	icon_user_online varchar(200) NOT NULL DEFAULT '',
+	icon_user_offline varchar(200) NOT NULL DEFAULT '',
+	icon_user_profile varchar(200) NOT NULL DEFAULT '',
+	icon_user_search varchar(200) NOT NULL DEFAULT '',
+	icon_user_warn varchar(200) NOT NULL DEFAULT '',
+	button_pm_forward varchar(200) NOT NULL DEFAULT '',
+	button_pm_new varchar(200) NOT NULL DEFAULT '',
+	button_pm_reply varchar(200) NOT NULL DEFAULT '',
+	button_topic_locked varchar(200) NOT NULL DEFAULT '',
+	button_topic_new varchar(200) NOT NULL DEFAULT '',
+	button_topic_reply varchar(200) NOT NULL DEFAULT '',
 	user_icon1 varchar(200) NOT NULL DEFAULT '',
 	user_icon2 varchar(200) NOT NULL DEFAULT '',
 	user_icon3 varchar(200) NOT NULL DEFAULT '',
@@ -857,148 +826,146 @@ CREATE TABLE phpbb_styles_imageset (
 	user_icon7 varchar(200) NOT NULL DEFAULT '',
 	user_icon8 varchar(200) NOT NULL DEFAULT '',
 	user_icon9 varchar(200) NOT NULL DEFAULT '',
-	user_icon10 varchar(200) NOT NULL DEFAULT '',
-	PRIMARY KEY (imageset_id)
-);;
+	user_icon10 varchar(200) NOT NULL DEFAULT ''
+);
 
-CREATE UNIQUE INDEX phpbb_styles_imageset_imageset_name ON phpbb_styles_imageset (imageset_name);;
+CREATE UNIQUE INDEX phpbb_styles_imageset_imgset_nm ON phpbb_styles_imageset (imageset_name);
 
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
-	topic_id INTEGER NOT NULL ,
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	icon_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_attachment tinyint(1) NOT NULL DEFAULT '0',
-	topic_approved tinyint(1) NOT NULL DEFAULT '1',
-	topic_reported tinyint(1) NOT NULL DEFAULT '0',
+	topic_id INTEGER PRIMARY KEY NOT NULL ,
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	icon_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_attachment INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_approved INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	topic_reported INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	topic_title text(65535) NOT NULL DEFAULT '',
-	topic_poster mediumint(8) NOT NULL DEFAULT '0',
-	topic_time int(11) NOT NULL DEFAULT '0',
-	topic_time_limit int(11) NOT NULL DEFAULT '0',
-	topic_views mediumint(8) NOT NULL DEFAULT '0',
-	topic_replies mediumint(8) NOT NULL DEFAULT '0',
-	topic_replies_real mediumint(8) NOT NULL DEFAULT '0',
+	topic_poster INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_time_limit INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_views INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_replies INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_replies_real INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	topic_status tinyint(3) NOT NULL DEFAULT '0',
 	topic_type tinyint(3) NOT NULL DEFAULT '0',
-	topic_first_post_id mediumint(8) NOT NULL DEFAULT '0',
+	topic_first_post_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	topic_first_poster_name varchar(255) NOT NULL DEFAULT '',
-	topic_last_post_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_last_poster_id mediumint(8) NOT NULL DEFAULT '0',
+	topic_last_post_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_last_poster_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	topic_last_poster_name varchar(255) NOT NULL DEFAULT '',
-	topic_last_post_time int(11) NOT NULL DEFAULT '0',
-	topic_last_view_time int(11) NOT NULL DEFAULT '0',
-	topic_moved_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_bumped tinyint(1) NOT NULL DEFAULT '0',
-	topic_bumper mediumint(8) NOT NULL DEFAULT '0',
+	topic_last_post_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_last_view_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_moved_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_bumped INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_bumper INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	poll_title text(65535) NOT NULL DEFAULT '',
-	poll_start int(11) NOT NULL DEFAULT '0',
-	poll_length int(11) NOT NULL DEFAULT '0',
+	poll_start INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	poll_length INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	poll_max_options tinyint(4) NOT NULL DEFAULT '1',
-	poll_last_vote int(11) NOT NULL DEFAULT '0',
-	poll_vote_change tinyint(1) NOT NULL DEFAULT '0',
-	PRIMARY KEY (topic_id)
-);;
+	poll_last_vote INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	poll_vote_change INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_topics_forum_id ON phpbb_topics (forum_id);;
-CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics (forum_id, topic_type);;
-CREATE INDEX phpbb_topics_topic_last_post_time ON phpbb_topics (topic_last_post_time);;
+CREATE INDEX phpbb_topics_forum_id ON phpbb_topics (forum_id);
+CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics (forum_id, topic_type);
+CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics (topic_last_post_time);
 
 # Table: 'phpbb_topics_track'
 CREATE TABLE phpbb_topics_track (
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
-	forum_id mediumint(8) NOT NULL DEFAULT '0',
-	mark_time int(11) NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	mark_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	PRIMARY KEY (user_id, topic_id)
-);;
+);
 
-CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id);;
+CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id);
 
 # Table: 'phpbb_topics_posted'
 CREATE TABLE phpbb_topics_posted (
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
-	topic_posted tinyint(1) NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	topic_posted INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	PRIMARY KEY (user_id, topic_id)
-);;
+);
 
 
 # Table: 'phpbb_topics_watch'
 CREATE TABLE phpbb_topics_watch (
-	topic_id mediumint(8) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	notify_status tinyint(1) NOT NULL DEFAULT '0'
-);;
+	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	notify_status INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch (topic_id);;
-CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch (user_id);;
-CREATE INDEX phpbb_topics_watch_notify_status ON phpbb_topics_watch (notify_status);;
+CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch (topic_id);
+CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch (user_id);
+CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status);
 
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
-	group_id mediumint(8) NOT NULL DEFAULT '0',
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	group_leader tinyint(1) NOT NULL DEFAULT '0',
-	user_pending tinyint(1) NOT NULL DEFAULT '1'
-);;
+	group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	group_leader INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_pending INTEGER UNSIGNED NOT NULL DEFAULT '1'
+);
 
-CREATE INDEX phpbb_user_group_group_id ON phpbb_user_group (group_id);;
-CREATE INDEX phpbb_user_group_user_id ON phpbb_user_group (user_id);;
-CREATE INDEX phpbb_user_group_group_leader ON phpbb_user_group (group_leader);;
+CREATE INDEX phpbb_user_group_group_id ON phpbb_user_group (group_id);
+CREATE INDEX phpbb_user_group_user_id ON phpbb_user_group (user_id);
+CREATE INDEX phpbb_user_group_group_leader ON phpbb_user_group (group_leader);
 
 # Table: 'phpbb_users'
 CREATE TABLE phpbb_users (
-	user_id INTEGER NOT NULL ,
+	user_id INTEGER PRIMARY KEY NOT NULL ,
 	user_type tinyint(2) NOT NULL DEFAULT '0',
-	group_id mediumint(8) NOT NULL DEFAULT '3',
+	group_id INTEGER UNSIGNED NOT NULL DEFAULT '3',
 	user_permissions mediumtext(16777215) NOT NULL DEFAULT '',
-	user_perm_from mediumint(8) NOT NULL DEFAULT '0',
+	user_perm_from INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_ip varchar(40) NOT NULL DEFAULT '',
-	user_regdate int(11) NOT NULL DEFAULT '0',
-	username varchar(255) NOT NULL DEFAULT '',
+	user_regdate INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	username varchar(252) NOT NULL DEFAULT '',
 	user_password varchar(40) NOT NULL DEFAULT '',
-	user_passchg int(11) NOT NULL DEFAULT '0',
+	user_passchg INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_email varchar(100) NOT NULL DEFAULT '',
 	user_email_hash bigint(20) NOT NULL DEFAULT '0',
 	user_birthday varchar(10) NOT NULL DEFAULT '',
-	user_lastvisit int(11) NOT NULL DEFAULT '0',
-	user_lastmark int(11) NOT NULL DEFAULT '0',
-	user_lastpost_time int(11) NOT NULL DEFAULT '0',
+	user_lastvisit INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_lastmark INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_lastpost_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_lastpage varchar(200) NOT NULL DEFAULT '',
 	user_last_confirm_key varchar(10) NOT NULL DEFAULT '',
-	user_last_search int(11) NOT NULL DEFAULT '0',
+	user_last_search INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_warnings tinyint(4) NOT NULL DEFAULT '0',
-	user_last_warning int(11) NOT NULL DEFAULT '0',
+	user_last_warning INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_login_attempts tinyint(4) NOT NULL DEFAULT '0',
-	user_posts mediumint(8) NOT NULL DEFAULT '0',
+	user_posts INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_lang varchar(30) NOT NULL DEFAULT '',
 	user_timezone decimal(5,2) NOT NULL DEFAULT '0',
-	user_dst tinyint(1) NOT NULL DEFAULT '0',
+	user_dst INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_dateformat varchar(30) NOT NULL DEFAULT 'd M Y H:i',
 	user_style tinyint(4) NOT NULL DEFAULT '0',
-	user_rank mediumint(8) NOT NULL DEFAULT '0',
+	user_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_colour varchar(6) NOT NULL DEFAULT '',
 	user_new_privmsg tinyint(4) NOT NULL DEFAULT '0',
 	user_unread_privmsg tinyint(4) NOT NULL DEFAULT '0',
-	user_last_privmsg int(11) NOT NULL DEFAULT '0',
-	user_message_rules tinyint(1) NOT NULL DEFAULT '0',
+	user_last_privmsg INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_message_rules INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_full_folder int(11) NOT NULL DEFAULT '-3',
-	user_emailtime int(11) NOT NULL DEFAULT '0',
-	user_topic_show_days mediumint(4) NOT NULL DEFAULT '0',
+	user_emailtime INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_topic_show_days INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_topic_sortby_type varchar(1) NOT NULL DEFAULT 't',
 	user_topic_sortby_dir varchar(1) NOT NULL DEFAULT 'd',
-	user_post_show_days mediumint(4) NOT NULL DEFAULT '0',
+	user_post_show_days INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_post_sortby_type varchar(1) NOT NULL DEFAULT 't',
 	user_post_sortby_dir varchar(1) NOT NULL DEFAULT 'a',
-	user_notify tinyint(1) NOT NULL DEFAULT '0',
-	user_notify_pm tinyint(1) NOT NULL DEFAULT '1',
+	user_notify INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_notify_pm INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	user_notify_type tinyint(4) NOT NULL DEFAULT '0',
-	user_allow_pm tinyint(1) NOT NULL DEFAULT '1',
-	user_allow_email tinyint(1) NOT NULL DEFAULT '1',
-	user_allow_viewonline tinyint(1) NOT NULL DEFAULT '1',
-	user_allow_viewemail tinyint(1) NOT NULL DEFAULT '1',
-	user_allow_massemail tinyint(1) NOT NULL DEFAULT '1',
-	user_options int(11) NOT NULL DEFAULT '893',
+	user_allow_pm INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	user_allow_email INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	user_allow_viewonline INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	user_allow_viewemail INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	user_allow_massemail INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	user_options INTEGER UNSIGNED NOT NULL DEFAULT '893',
 	user_avatar varchar(255) NOT NULL DEFAULT '',
 	user_avatar_type tinyint(2) NOT NULL DEFAULT '0',
 	user_avatar_width tinyint(4) NOT NULL DEFAULT '0',
@@ -1016,45 +983,42 @@ CREATE TABLE phpbb_users (
 	user_occ varchar(255) NOT NULL DEFAULT '',
 	user_interests text(65535) NOT NULL DEFAULT '',
 	user_actkey varchar(32) NOT NULL DEFAULT '',
-	user_newpasswd varchar(32) NOT NULL DEFAULT '',
-	PRIMARY KEY (user_id)
-);;
+	user_newpasswd varchar(32) NOT NULL DEFAULT ''
+);
 
-CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);;
-CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash);;
-CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type);;
-CREATE INDEX phpbb_users_username ON phpbb_users (username);;
+CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
+CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash);
+CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type);
+CREATE INDEX phpbb_users_username ON phpbb_users (username);
 
 # Table: 'phpbb_warnings'
 CREATE TABLE phpbb_warnings (
-	warning_id INTEGER NOT NULL ,
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	post_id mediumint(8) NOT NULL DEFAULT '0',
-	log_id mediumint(8) NOT NULL DEFAULT '0',
-	warning_time int(11) NOT NULL DEFAULT '0',
-	PRIMARY KEY (warning_id)
-);;
+	warning_id INTEGER PRIMARY KEY NOT NULL ,
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	post_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	log_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	warning_time INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
 
 # Table: 'phpbb_words'
 CREATE TABLE phpbb_words (
-	word_id INTEGER NOT NULL ,
+	word_id INTEGER PRIMARY KEY NOT NULL ,
 	word varchar(255) NOT NULL DEFAULT '',
-	replacement varchar(255) NOT NULL DEFAULT '',
-	PRIMARY KEY (word_id)
-);;
+	replacement varchar(255) NOT NULL DEFAULT ''
+);
 
 
 # Table: 'phpbb_zebra'
 CREATE TABLE phpbb_zebra (
-	user_id mediumint(8) NOT NULL DEFAULT '0',
-	zebra_id mediumint(8) NOT NULL DEFAULT '0',
-	friend tinyint(1) NOT NULL DEFAULT '0',
-	foe tinyint(1) NOT NULL DEFAULT '0'
-);;
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	zebra_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	friend INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	foe INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
 
-CREATE INDEX phpbb_zebra_user_id ON phpbb_zebra (user_id);;
-CREATE INDEX phpbb_zebra_zebra_id ON phpbb_zebra (zebra_id);;
+CREATE INDEX phpbb_zebra_user_id ON phpbb_zebra (user_id);
+CREATE INDEX phpbb_zebra_zebra_id ON phpbb_zebra (zebra_id);
 
 
-COMMIT;;
-\ No newline at end of file
+COMMIT;
+\ No newline at end of file
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 141768c2dd..4819230026 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -136,103 +136,114 @@ $lang = array_merge($lang, array(
 	'IMAGESET_UPDATED'			=> 'Imageset updated successfully',
 	'ITALIC'					=> 'Italic',
 
-	'IMG_ATTACH_PROGRESS_BAR'	=> 'Attachment upload progress bar',
-
-	'IMG_BTN_POST'			=> 'New topic',
-	'IMG_BTN_REPLY'			=> 'Reply topic',
-	'IMG_BTN_LOCKED'		=> 'Topic locked',
-	'IMG_BTN_POST_PM'		=> 'New message',
-	'IMG_BTN_REPLY_PM'		=> 'Reply message',
-	'IMG_BTN_DELETE'		=> 'Delete post',
-	'IMG_BTN_QUOTE'			=> 'Quote post',
-	'IMG_BTN_PROFILE'		=> 'Show profile',
-	'IMG_BTN_EMAIL'			=> 'Send email',
-	'IMG_BTN_SEARCH'		=> 'Search posts',
-	'IMG_BTN_WWW'			=> 'Website',
-	'IMG_BTN_INFO'			=> 'Show post details',
-	'IMG_BTN_EDIT'			=> 'Edit post',
-	'IMG_BTN_AIM'			=> 'AIM',
-	'IMG_BTN_ICQ'			=> 'ICQ',
-	'IMG_BTN_JABBER'		=> 'Jabber',
-	'IMG_BTN_YIM'			=> 'YIM',
-	'IMG_BTN_MSNM'			=> 'MSNM',
-	'IMG_BTN_ONLINE'		=> 'User online',
-	'IMG_BTN_OFFLINE'		=> 'User offline',
-	'IMG_BTN_REPORT'		=> 'Report post',
-	'IMG_BTN_WARN'			=> 'Warn user',
-	'IMG_BTN_PM'			=> 'Send message',
-	'IMG_BTN_FRIEND'		=> 'Add as friend',
-	'IMG_BTN_FOE'			=> 'Add as foe',
-
 	'IMG_CAT_BUTTONS'		=> 'Localised buttons',
 	'IMG_CAT_CUSTOM'		=> 'Custom images',
 	'IMG_CAT_FOLDERS'		=> 'Topic icons',
 	'IMG_CAT_FORUMS'		=> 'Forum icons',
 	'IMG_CAT_ICONS'			=> 'General icons',
-	'IMG_CAT_KARMA'			=> 'Karma images',
 	'IMG_CAT_LOGOS'			=> 'Logos',
 	'IMG_CAT_POLLS'			=> 'Polling images',
 	'IMG_CAT_UI'			=> 'General user interface elements',
 	'IMG_CAT_USER'			=> 'Additional images',
 
-	'IMG_FOLDER'							=> 'Topic',
-	'IMG_FOLDER_ANNOUNCE'					=> 'Announcement',
-	'IMG_FOLDER_ANNOUNCE_NEW'				=> 'Announcement new posts',
-	'IMG_FOLDER_ANNOUNCE_POST'				=> 'Announcement posted to',
-	'IMG_FOLDER_ANNOUNCE_NEW_POST'			=> 'Announcement posted to new',
-	'IMG_FOLDER_GLOBAL'						=> 'Global',
-	'IMG_FOLDER_GLOBAL_NEW'					=> 'Global new posts',
-	'IMG_FOLDER_GLOBAL_POST'				=> 'Global posted to',
-	'IMG_FOLDER_GLOBAL_NEW_POST'			=> 'Global posted to new',
-	'IMG_FOLDER_HOT'						=> 'Topic hot',
-	'IMG_FOLDER_HOT_NEW'					=> 'Topic hot new posts',
-	'IMG_FOLDER_HOT_POST'					=> 'Topic hot posted to',
-	'IMG_FOLDER_HOT_NEW_POST'				=> 'Topic hot posted to new',
-	'IMG_FOLDER_LOCK'						=> 'Topic locked',
-	'IMG_FOLDER_LOCK_NEW'					=> 'Topic locked new',
-	'IMG_FOLDER_LOCK_POST'					=> 'Topic locked posted to',
-	'IMG_FOLDER_LOCK_NEW_POST'				=> 'Topic locked posted to new',
-	'IMG_FOLDER_LOCK_ANNOUNCE'				=> 'Announcement locked',
-	'IMG_FOLDER_LOCK_ANNOUNCE_NEW'			=> 'Announcement locked new posts',
-	'IMG_FOLDER_LOCK_ANNOUNCE_POST'			=> 'Announcement locked posted to',
-	'IMG_FOLDER_LOCK_ANNOUNCE_NEW_POST'		=> 'Announcement locked posted to new',
-	'IMG_FOLDER_LOCK_GLOBAL'				=> 'Global locked',
-	'IMG_FOLDER_LOCK_GLOBAL_NEW'			=> 'Global locked new posts',
-	'IMG_FOLDER_LOCK_GLOBAL_POST'			=> 'Global locked posted to',
-	'IMG_FOLDER_LOCK_GLOBAL_NEW_POST'		=> 'Global locked posted to new',
-	'IMG_FOLDER_LOCK_STICKY'				=> 'Sticky topic locked',
-	'IMG_FOLDER_LOCK_STICKY_POST'			=> 'Sticky topic locked posted to',
-	'IMG_FOLDER_LOCK_STICKY_NEW'			=> 'Sticky topic locked new posts',
-	'IMG_FOLDER_LOCK_STICKY_NEW_POST'		=> 'Sticky topic locked posted to new',
-	'IMG_FOLDER_MOVED'						=> 'Topic moved',
-	'IMG_FOLDER_NEW'						=> 'Topic new posts',
-	'IMG_FOLDER_NEW_POST'					=> 'Topic posted to new',
-	'IMG_FOLDER_POST'						=> 'Topic posted to',
-	'IMG_FOLDER_STICKY'						=> 'Sticky topic',
-	'IMG_FOLDER_STICKY_POST'				=> 'Sticky topic posted to',
-	'IMG_FOLDER_STICKY_NEW'					=> 'Sticky topic new posts',
-	'IMG_FOLDER_STICKY_NEW_POST'			=> 'Sticky topic posted to new',
-
-	'IMG_FORUM'				=> 'Forum',
-	'IMG_FORUM_NEW'			=> 'Forum new posts',
-	'IMG_FORUM_LOCKED'		=> 'Forum locked',
-	'IMG_FORUM_LINK'		=> 'Forum link',
-	'IMG_ICON_UNAPPROVED'	=> 'Post unapproved',
-	'IMG_ICON_REPORTED'		=> 'Post reported',
-	'IMG_ICON_ATTACH'		=> 'Attachment',
-	'IMG_ICON_POST'			=> 'Minipost',
-	'IMG_ICON_POST_NEW'		=> 'New minipost',
-	'IMG_ICON_POST_LATEST'	=> 'Last post',
-	'IMG_ICON_POST_NEWEST'	=> 'Newest post',
-	'IMG_KARMA_LEFT'		=> 'Karma left end',
-	'IMG_KARMA_CENTER'		=> 'Karma centre',
-	'IMG_KARMA_RIGHT'		=> 'Karma right end',
+	'IMG_SITE_LOGO'			=> 'Main Logo',
+	'IMG_UPLOAD_BAR'		=> 'Upload progress bar',
 	'IMG_POLL_LEFT'			=> 'Poll left end',
-	'IMG_POLL_RIGHT'		=> 'Poll right end',
 	'IMG_POLL_CENTER'		=> 'Poll centre',
-	'IMG_SITE_LOGO'			=> 'Main Logo',
-	'IMG_SUB_FORUM'			=> 'Subforum',
-	'IMG_SUB_FORUM_NEW'		=> 'Subforum new posts',
+	'IMG_POLL_RIGHT'		=> 'Poll right end',
+	'IMG_ICON_FRIEND'		=> 'Add as friend',
+	'IMG_ICON_FOE'			=> 'Add as foe',
+
+	'IMG_FORUM_LINK'			=> 'Forum link',
+	'IMG_FORUM_READ'			=> 'Forum',
+	'IMG_FORUM_READ_LOCKED'		=> 'Forum locked',
+	'IMG_FORUM_READ_SUBFORUM'	=> 'Subforum',
+	'IMG_FORUM_UNREAD'			=> 'Forum new posts',
+	'IMG_FORUM_UNREAD_LOCKED'	=> 'Forum new posts locked',
+	'IMG_FORUM_UNREAD_SUBFORUM'	=> 'Subforum new posts',
+
+	'IMG_TOPIC_MOVED'			=> 'Topic moved',
+
+	'IMG_TOPIC_READ'				=> 'Topic',
+	'IMG_TOPIC_READ_MINE'			=> 'Topic posted to',
+	'IMG_TOPIC_READ_HOT'			=> 'Topic hot',
+	'IMG_TOPIC_READ_HOT_MINE'		=> 'Topic hot posted to',
+	'IMG_TOPIC_READ_LOCKED'			=> 'Topic locked',
+	'IMG_TOPIC_READ_LOCKED_MINE'	=> 'Topic locked posted to',
+
+	'IMG_TOPIC_UNREAD'				=> 'Topic new posts',
+	'IMG_TOPIC_UNREAD_MINE'			=> 'Topic posted to new',
+	'IMG_TOPIC_UNREAD_HOT'			=> 'Topic hot new posts',
+	'IMG_TOPIC_UNREAD_HOT_MINE'		=> 'Topic hot posted to new',
+	'IMG_TOPIC_UNREAD_LOCKED'		=> 'Topic locked new',
+	'IMG_TOPIC_UNREAD_LOCKED_MINE'	=> 'Topic locked posted to new',
+
+	'IMG_STICKY_READ'				=> 'Sticky topic',
+	'IMG_STICKY_READ_MINE'			=> 'Sticky topic posted to',
+	'IMG_STICKY_READ_LOCKED'		=> 'Sticky topic locked',
+	'IMG_STICKY_READ_LOCKED_MINE'	=> 'Sticky topic locked posted to',
+	'IMG_STICKY_UNREAD'				=> 'Sticky topic new posts',
+	'IMG_STICKY_UNREAD_MINE'		=> 'Sticky topic posted to new',
+	'IMG_STICKY_UNREAD_LOCKED'		=> 'Sticky topic locked new posts',
+	'IMG_STICKY_UNREAD_LOCKED_MINE'	=> 'Sticky topic locked posted to new',
+
+	'IMG_ANNOUNCE_READ'					=> 'Announcement',
+	'IMG_ANNOUNCE_READ_MINE'			=> 'Announcement posted to',
+	'IMG_ANNOUNCE_READ_LOCKED'			=> 'Announcement locked',
+	'IMG_ANNOUNCE_READ_LOCKED_MINE'		=> 'Announcement locked posted to',
+	'IMG_ANNOUNCE_UNREAD'				=> 'Announcement new posts',
+	'IMG_ANNOUNCE_UNREAD_MINE'			=> 'Announcement posted to new',
+	'IMG_ANNOUNCE_UNREAD_LOCKED'		=> 'Announcement locked new posts',
+	'IMG_ANNOUNCE_UNREAD_LOCKED_MINE'	=> 'Announcement locked posted to new',
+
+	'IMG_GLOBAL_READ'					=> 'Global',
+	'IMG_GLOBAL_READ_MINE'				=> 'Global posted to',
+	'IMG_GLOBAL_READ_LOCKED'			=> 'Global locked',
+	'IMG_GLOBAL_READ_LOCKED_MINE'		=> 'Global locked posted to',
+	'IMG_GLOBAL_UNREAD'					=> 'Global new posts',
+	'IMG_GLOBAL_UNREAD_MINE'			=> 'Global posted to new',
+	'IMG_GLOBAL_UNREAD_LOCKED'			=> 'Global locked new posts',
+	'IMG_GLOBAL_UNREAD_LOCKED_MINE'		=> 'Global locked posted to new',
+
+	'IMG_PM_READ'		=> 'Read private message',
+	'IMG_PM_UNREAD'		=> 'Unread private message',
+
+	'IMG_ICON_CONTACT_AIM'		=> 'AIM',
+	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
+	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
+	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
+	'IMG_ICON_CONTACT_MSNM'		=> 'MSNM',
+	'IMG_ICON_CONTACT_PM'		=> 'Send message',
+	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
+	'IMG_ICON_CONTACT_WWW'		=> 'Website',
+
+	'IMG_ICON_POST_DELETE'			=> 'Delete post',
+	'IMG_ICON_POST_EDIT'			=> 'Edit post',
+	'IMG_ICON_POST_INFO'			=> 'Show post details',
+	'IMG_ICON_POST_QUOTE'			=> 'Quote post',
+	'IMG_ICON_POST_REPORT'			=> 'Report post',
+	'IMG_ICON_POST_TARGET'			=> 'Minipost',
+	'IMG_ICON_POST_TARGET_UNREAD'	=> 'New minipost',
+
+
+	'IMG_ICON_TOPIC_ATTACH'			=> 'Attachment',
+	'IMG_ICON_TOPIC_LATEST'			=> 'Last post',
+	'IMG_ICON_TOPIC_NEWEST'			=> 'Last unread post',
+	'IMG_ICON_TOPIC_REPORTED'		=> 'Post reported',
+	'IMG_ICON_TOPIC_UNAPPROVED'		=> 'Post unapproved',
+
+	'IMG_ICON_USER_ONLINE'		=> 'User online',
+	'IMG_ICON_USER_OFFLINE'		=> 'User offline',
+	'IMG_ICON_USER_PROFILE'		=> 'Show profile',
+	'IMG_ICON_USER_SEARCH'		=> 'Search posts',
+	'IMG_ICON_USER_WARN'		=> 'Warn user',
+
+	'IMG_BUTTON_PM_FORWARD'		=> 'Forward private message',
+	'IMG_BUTTON_PM_NEW'			=> 'New private message',
+	'IMG_BUTTON_PM_REPLY'		=> 'Reply private message',
+	'IMG_BUTTON_TOPIC_LOCKED'	=> 'Topic locked',
+	'IMG_BUTTON_TOPIC_NEW'		=> 'New topic',
+	'IMG_BUTTON_TOPIC_REPLY'	=> 'Reply topic',
 
 	'IMG_USER_ICON1'		=> 'User defined image 1',
 	'IMG_USER_ICON2'		=> 'User defined image 2',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b799f1ae6b..18348278ab 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -557,7 +557,7 @@ $lang = array_merge($lang, array(
 	'VIEW_BOOKMARKS'			=> 'View bookmarks',
 	'VIEW_FORUM_LOGS'			=> 'View Logs',
 	'VIEW_LATEST_POST'			=> 'View latest post',
-	'VIEW_NEWEST_POST'			=> 'View newest post',
+	'VIEW_NEWEST_POST'			=> 'View latest unread post',
 	'VIEW_NOTES'				=> 'View user notes',
 	'VIEW_ONLINE_TIME'			=> 'This data is based on users active over the past %d minute',
 	'VIEW_ONLINE_TIMES'			=> 'This data is based on users active over the past %d minutes',
diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt
index a0da5e28ba..5fd5592f7c 100644
--- a/phpBB/language/en/email/admin_send_email.txt
+++ b/phpBB/language/en/email/admin_send_email.txt
@@ -10,3 +10,6 @@ Message sent to you follows:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 {MESSAGE}
+
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f92b1c3751..0383fa6ef7 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
 	'DLL_MYSQL4'				=> 'MySQL 4.x/5.x',
 	'DLL_MYSQLI'				=> 'MySQL 4.1.x/5.x with MySQLi Extension',
 	'DLL_ORACLE'				=> 'Oracle',
-	'DLL_POSTGRES'				=> 'PostgreSQL 7.x',
+	'DLL_POSTGRES'				=> 'PostgreSQL 7.x/8.x',
 	'DLL_SQLITE'				=> 'SQLite',
 	'DLL_XML'					=> 'XML support [ Jabber ]',
 	'DLL_ZLIB'					=> 'zlib Compression support [ gz, .tar.gz, .zip ]',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 7ef4daf93c..225d2927d3 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -217,7 +217,7 @@ switch ($mode)
 		$db->sql_freeresult($result);
 
 		$template->assign_vars(array(
-			'PM_IMG'		=> $user->img('btn_pm', $user->lang['SEND_PRIVATE_MESSAGE']))
+			'PM_IMG'		=> $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']))
 		);
 	break;
 
@@ -462,15 +462,15 @@ switch ($mode)
 			'SIGNATURE'		=> (!empty($member['user_sig'])) ? str_replace("\n", '<br />', $member['user_sig']) : '',
 
 			'AVATAR_IMG'	=> $poster_avatar,
-			'PM_IMG'		=> $user->img('btn_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
-			'EMAIL_IMG'		=> $user->img('btn_email', $user->lang['EMAIL']),
-			'WWW_IMG'		=> $user->img('btn_www', $user->lang['WWW']),
-			'ICQ_IMG'		=> $user->img('btn_icq', $user->lang['ICQ']),
-			'AIM_IMG'		=> $user->img('btn_aim', $user->lang['AIM']),
-			'MSN_IMG'		=> $user->img('btn_msnm', $user->lang['MSNM']),
-			'YIM_IMG'		=> $user->img('btn_yim', $user->lang['YIM']),
-			'JABBER_IMG'	=> $user->img('btn_jabber', $user->lang['JABBER']),
-			'SEARCH_IMG'	=> $user->img('btn_search', $user->lang['SEARCH']),
+			'PM_IMG'		=> $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
+			'EMAIL_IMG'		=> $user->img('icon_contact_email', $user->lang['EMAIL']),
+			'WWW_IMG'		=> $user->img('icon_contact_www', $user->lang['WWW']),
+			'ICQ_IMG'		=> $user->img('icon_contact_icq', $user->lang['ICQ']),
+			'AIM_IMG'		=> $user->img('icon_contact_aim', $user->lang['AIM']),
+			'MSN_IMG'		=> $user->img('icon_contact_msnm', $user->lang['MSNM']),
+			'YIM_IMG'		=> $user->img('icon_contact_yahoo', $user->lang['YIM']),
+			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),
+			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']),
 
 			'S_PROFILE_ACTION'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group'),
 			'S_GROUP_OPTIONS'	=> $group_options,
@@ -1210,16 +1210,16 @@ switch ($mode)
 			'PAGE_NUMBER'	=> on_page($total_users, $config['topics_per_page'], $start),
 			'TOTAL_USERS'	=> ($total_users == 1) ? $user->lang['LIST_USER'] : sprintf($user->lang['LIST_USERS'], $total_users),
 
-			'PROFILE_IMG'	=> $user->img('btn_profile', $user->lang['PROFILE']),
-			'PM_IMG'		=> $user->img('btn_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
-			'EMAIL_IMG'		=> $user->img('btn_email', $user->lang['EMAIL']),
-			'WWW_IMG'		=> $user->img('btn_www', $user->lang['WWW']),
-			'ICQ_IMG'		=> $user->img('btn_icq', $user->lang['ICQ']),
-			'AIM_IMG'		=> $user->img('btn_aim', $user->lang['AIM']),
-			'MSN_IMG'		=> $user->img('btn_msnm', $user->lang['MSNM']),
-			'YIM_IMG'		=> $user->img('btn_yim', $user->lang['YIM']),
-			'JABBER_IMG'	=> $user->img('btn_jabber', $user->lang['JABBER']),
-			'SEARCH_IMG'	=> $user->img('btn_search', $user->lang['SEARCH']),
+			'PROFILE_IMG'	=> $user->img('icon_user_profile', $user->lang['PROFILE']),
+			'PM_IMG'		=> $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
+			'EMAIL_IMG'		=> $user->img('icon_contact_email', $user->lang['EMAIL']),
+			'WWW_IMG'		=> $user->img('icon_contact_www', $user->lang['WWW']),
+			'ICQ_IMG'		=> $user->img('icon_contact_icq', $user->lang['ICQ']),
+			'AIM_IMG'		=> $user->img('icon_contact_aim', $user->lang['AIM']),
+			'MSN_IMG'		=> $user->img('icon_contact_msnm', $user->lang['MSNM']),
+			'YIM_IMG'		=> $user->img('icon_contact_yahoo', $user->lang['YIM']),
+			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),
+			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']),
 
 			'U_FIND_MEMBER'			=> ($config['load_search'] || $auth->acl_get('a_')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser') : '',
 			'U_HIDE_FIND_MEMBER'	=> ($mode == 'searchuser') ? $u_hide_find_member : '',
@@ -1346,7 +1346,7 @@ function show_profile($data)
 		'POSTS'			=> ($data['user_posts']) ? $data['user_posts'] : 0,
   		'WARNINGS'		=> isset($data['user_warnings']) ? $data['user_warnings'] : 0,
 
-		'ONLINE_IMG'		=>  (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')),
+		'ONLINE_IMG'		=>  (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
 		'S_ONLINE'			=> ($config['load_onlinetrack'] && $online) ? true : false,
 		'RANK_IMG'			=> $rank_img,
 		'RANK_IMG_SRC'		=> $rank_img_src,
diff --git a/phpBB/posting.php b/phpBB/posting.php
index fb63904a48..8210767ec2 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1135,7 +1135,7 @@ $template->assign_vars(array(
 	'IMG_STATUS'			=> ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
 	'FLASH_STATUS'			=> ($flash_status) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],
 	'SMILIES_STATUS'		=> ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
-	'MINI_POST_IMG'			=> $user->img('icon_post', $user->lang['POST']),
+	'MINI_POST_IMG'			=> $user->img('icon_post_target', $user->lang['POST']),
 	'POST_DATE'				=> ($post_data['post_time']) ? $user->format_date($post_data['post_time']) : '',
 	'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
 	'TOPIC_TIME_LIMIT'		=> (int) $post_data['topic_time_limit'],
@@ -1243,7 +1243,7 @@ function upload_popup($forum_style = 0)
 	);
 
 	$template->assign_vars(array(
-		'PROGRESS_BAR'	=> $user->img('attach_progress_bar', $user->lang['UPLOAD_IN_PROGRESS']))
+		'PROGRESS_BAR'	=> $user->img('upload_bar', $user->lang['UPLOAD_IN_PROGRESS']))
 	);
 
 	$template->display('popup');
diff --git a/phpBB/search.php b/phpBB/search.php
index 147cf49b49..70a62373cb 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -465,10 +465,10 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 		'S_SEARCH_ACTION'		=> $u_search,
 		'S_SHOW_TOPICS'			=> ($show_results == 'posts') ? false : true,
 
-		'GOTO_PAGE_IMG'			=> $user->img('icon_post', 'GOTO_PAGE'),
-		'NEWEST_POST_IMG'		=> $user->img('icon_post_newest', 'VIEW_NEWEST_POST'),
-		'REPORTED_IMG'			=> $user->img('icon_reported', 'TOPIC_REPORTED'),
-		'UNAPPROVED_IMG'		=> $user->img('icon_unapproved', 'TOPIC_UNAPPROVED'),
+		'GOTO_PAGE_IMG'			=> $user->img('icon_post_target', 'GOTO_PAGE'),
+		'NEWEST_POST_IMG'		=> $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
+		'REPORTED_IMG'			=> $user->img('icon_topic_reported', 'TOPIC_REPORTED'),
+		'UNAPPROVED_IMG'		=> $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'),
 
 		'U_SEARCH_WORDS'	=> append_sid("{$phpbb_root_path}search.$phpEx", "keywords=$u_hilit" . (($author) ? '&amp;author=' . urlencode($author) : '') . (($author_id) ? '&amp;author_id=' . $author_id : '') . $u_show_results))
 	);
@@ -653,14 +653,14 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 					'PAGINATION'		=> topic_generate_pagination($replies, $view_topic_url),
 					'TOPIC_TYPE'		=> $topic_type,
 
-					'LAST_POST_IMG'			=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
+					'LAST_POST_IMG'			=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
 					'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 					'TOPIC_FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, false, '', 'src'),
 					'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
 					'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
 					'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-					'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
-					'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? $user->img('icon_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
+					'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+					'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
 
 					'S_TOPIC_GLOBAL'		=> (!$forum_id) ? true : false,
 					'S_TOPIC_TYPE'			=> $row['topic_type'],
diff --git a/phpBB/styles/subSilver/imageset/folder_announce.gif b/phpBB/styles/subSilver/imageset/announce_read.gif
index 0589feb14f..0589feb14f 100644
--- a/phpBB/styles/subSilver/imageset/folder_announce.gif
+++ b/phpBB/styles/subSilver/imageset/announce_read.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_announce.gif b/phpBB/styles/subSilver/imageset/announce_read_locked.gif
index a738616e06..a738616e06 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_announce.gif
+++ b/phpBB/styles/subSilver/imageset/announce_read_locked.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_announce_posted.gif b/phpBB/styles/subSilver/imageset/announce_read_locked_mine.gif
index f7ffe7f8dd..f7ffe7f8dd 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_announce_posted.gif
+++ b/phpBB/styles/subSilver/imageset/announce_read_locked_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_announce_posted.gif b/phpBB/styles/subSilver/imageset/announce_read_mine.gif
index 636d353867..636d353867 100644
--- a/phpBB/styles/subSilver/imageset/folder_announce_posted.gif
+++ b/phpBB/styles/subSilver/imageset/announce_read_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_announce_new.gif b/phpBB/styles/subSilver/imageset/announce_unread.gif
index 56b2702b17..56b2702b17 100644
--- a/phpBB/styles/subSilver/imageset/folder_announce_new.gif
+++ b/phpBB/styles/subSilver/imageset/announce_unread.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_announce_new.gif b/phpBB/styles/subSilver/imageset/announce_unread_locked.gif
index 37033da653..37033da653 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_announce_new.gif
+++ b/phpBB/styles/subSilver/imageset/announce_unread_locked.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_announce_new_posted.gif b/phpBB/styles/subSilver/imageset/announce_unread_locked_mine.gif
index d91f2520ca..d91f2520ca 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_announce_new_posted.gif
+++ b/phpBB/styles/subSilver/imageset/announce_unread_locked_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_announce_new_posted.gif b/phpBB/styles/subSilver/imageset/announce_unread_mine.gif
index e1dd23a0bf..e1dd23a0bf 100644
--- a/phpBB/styles/subSilver/imageset/folder_announce_new_posted.gif
+++ b/phpBB/styles/subSilver/imageset/announce_unread_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_approve.gif b/phpBB/styles/subSilver/imageset/en/btn_approve.gif
deleted file mode 100644
index 7bd9bdb602..0000000000
--- a/phpBB/styles/subSilver/imageset/en/btn_approve.gif
+++ /dev/null
diff --git a/phpBB/styles/subSilver/imageset/en/btn_post_pm.gif b/phpBB/styles/subSilver/imageset/en/button_pm_new.gif
index 6bc193c412..6bc193c412 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_post_pm.gif
+++ b/phpBB/styles/subSilver/imageset/en/button_pm_new.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_reply_pm.gif b/phpBB/styles/subSilver/imageset/en/button_pm_reply.gif
index c476f06a44..c476f06a44 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_reply_pm.gif
+++ b/phpBB/styles/subSilver/imageset/en/button_pm_reply.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_locked.gif b/phpBB/styles/subSilver/imageset/en/button_topic_locked.gif
index f4aaced107..f4aaced107 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_locked.gif
+++ b/phpBB/styles/subSilver/imageset/en/button_topic_locked.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_post.gif b/phpBB/styles/subSilver/imageset/en/button_topic_new.gif
index 0c1e6b9f23..0c1e6b9f23 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_post.gif
+++ b/phpBB/styles/subSilver/imageset/en/button_topic_new.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_reply.gif b/phpBB/styles/subSilver/imageset/en/button_topic_reply.gif
index 15cbc700ee..15cbc700ee 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_reply.gif
+++ b/phpBB/styles/subSilver/imageset/en/button_topic_reply.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_aim.gif b/phpBB/styles/subSilver/imageset/en/icon_contact_aim.gif
index c6533e2817..c6533e2817 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_aim.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_contact_aim.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_email.gif b/phpBB/styles/subSilver/imageset/en/icon_contact_email.gif
index f126a1960d..f126a1960d 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_email.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_contact_email.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_icq.gif b/phpBB/styles/subSilver/imageset/en/icon_contact_icq.gif
index ba3fa12436..ba3fa12436 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_icq.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_contact_icq.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_jabber.gif b/phpBB/styles/subSilver/imageset/en/icon_contact_jabber.gif
index be2e53f9c2..be2e53f9c2 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_jabber.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_contact_jabber.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_msnm.gif b/phpBB/styles/subSilver/imageset/en/icon_contact_msnm.gif
index e3a5901bfc..e3a5901bfc 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_msnm.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_contact_msnm.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_pm.gif b/phpBB/styles/subSilver/imageset/en/icon_contact_pm.gif
index 26ac558c2f..26ac558c2f 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_pm.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_contact_pm.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_www.gif b/phpBB/styles/subSilver/imageset/en/icon_contact_www.gif
index 14a33b36a5..14a33b36a5 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_www.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_contact_www.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_yim.gif b/phpBB/styles/subSilver/imageset/en/icon_contact_yahoo.gif
index d11711789f..d11711789f 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_yim.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_contact_yahoo.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_delete.gif b/phpBB/styles/subSilver/imageset/en/icon_post_delete.gif
index e008e5ff9f..e008e5ff9f 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_delete.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_post_delete.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_edit.gif b/phpBB/styles/subSilver/imageset/en/icon_post_edit.gif
index 1511ee34d3..1511ee34d3 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_edit.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_post_edit.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_info.gif b/phpBB/styles/subSilver/imageset/en/icon_post_info.gif
index 166de2724f..166de2724f 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_info.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_post_info.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_quote.gif b/phpBB/styles/subSilver/imageset/en/icon_post_quote.gif
index 4cf103280c..4cf103280c 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_quote.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_post_quote.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_report.gif b/phpBB/styles/subSilver/imageset/en/icon_post_report.gif
index 9a3f65b1e3..9a3f65b1e3 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_report.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_post_report.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_offline.gif b/phpBB/styles/subSilver/imageset/en/icon_user_offline.gif
index 3065f4d7fe..3065f4d7fe 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_offline.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_user_offline.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_online.gif b/phpBB/styles/subSilver/imageset/en/icon_user_online.gif
index b950612c57..b950612c57 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_online.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_user_online.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_profile.gif b/phpBB/styles/subSilver/imageset/en/icon_user_profile.gif
index d9cf7f4c4a..d9cf7f4c4a 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_profile.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_user_profile.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_search.gif b/phpBB/styles/subSilver/imageset/en/icon_user_search.gif
index 46475fbf4c..46475fbf4c 100644
--- a/phpBB/styles/subSilver/imageset/en/btn_search.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_user_search.gif
diff --git a/phpBB/styles/subSilver/imageset/en/btn_warn.gif b/phpBB/styles/subSilver/imageset/en/icon_user_warn.gif
index 44cbcc953a..44cbcc953a 100755..100644
--- a/phpBB/styles/subSilver/imageset/en/btn_warn.gif
+++ b/phpBB/styles/subSilver/imageset/en/icon_user_warn.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_link_big.gif b/phpBB/styles/subSilver/imageset/forum_link.gif
index d5e86d47d7..d5e86d47d7 100644
--- a/phpBB/styles/subSilver/imageset/folder_link_big.gif
+++ b/phpBB/styles/subSilver/imageset/forum_link.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_big.gif b/phpBB/styles/subSilver/imageset/forum_read.gif
index 9b2bc47c67..9b2bc47c67 100644
--- a/phpBB/styles/subSilver/imageset/folder_big.gif
+++ b/phpBB/styles/subSilver/imageset/forum_read.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_locked_big.gif b/phpBB/styles/subSilver/imageset/forum_read_locked.gif
index 436f3d21c8..436f3d21c8 100644
--- a/phpBB/styles/subSilver/imageset/folder_locked_big.gif
+++ b/phpBB/styles/subSilver/imageset/forum_read_locked.gif
diff --git a/phpBB/styles/subSilver/imageset/subfolder_big.gif b/phpBB/styles/subSilver/imageset/forum_read_subforum.gif
index 9179303e7f..9179303e7f 100644
--- a/phpBB/styles/subSilver/imageset/subfolder_big.gif
+++ b/phpBB/styles/subSilver/imageset/forum_read_subforum.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_new_big.gif b/phpBB/styles/subSilver/imageset/forum_unread.gif
index 5eec565b38..5eec565b38 100644
--- a/phpBB/styles/subSilver/imageset/folder_new_big.gif
+++ b/phpBB/styles/subSilver/imageset/forum_unread.gif
diff --git a/phpBB/styles/subSilver/imageset/subfolder_new_big.gif b/phpBB/styles/subSilver/imageset/forum_unread_subforum.gif
index af3c93b1a1..af3c93b1a1 100644
--- a/phpBB/styles/subSilver/imageset/subfolder_new_big.gif
+++ b/phpBB/styles/subSilver/imageset/forum_unread_subforum.gif
diff --git a/phpBB/styles/subSilver/imageset/icon_minipost.gif b/phpBB/styles/subSilver/imageset/icon_post_target.gif
index d172abb060..d172abb060 100644
--- a/phpBB/styles/subSilver/imageset/icon_minipost.gif
+++ b/phpBB/styles/subSilver/imageset/icon_post_target.gif
diff --git a/phpBB/styles/subSilver/imageset/icon_minipost_new.gif b/phpBB/styles/subSilver/imageset/icon_post_target_unread.gif
index 8ec44a1787..8ec44a1787 100644
--- a/phpBB/styles/subSilver/imageset/icon_minipost_new.gif
+++ b/phpBB/styles/subSilver/imageset/icon_post_target_unread.gif
diff --git a/phpBB/styles/subSilver/imageset/icon_attach.gif b/phpBB/styles/subSilver/imageset/icon_topic_attach.gif
index 1c9c89bc70..1c9c89bc70 100644
--- a/phpBB/styles/subSilver/imageset/icon_attach.gif
+++ b/phpBB/styles/subSilver/imageset/icon_topic_attach.gif
diff --git a/phpBB/styles/subSilver/imageset/icon_latest_reply.gif b/phpBB/styles/subSilver/imageset/icon_topic_latest.gif
index b45e57aedb..b45e57aedb 100644
--- a/phpBB/styles/subSilver/imageset/icon_latest_reply.gif
+++ b/phpBB/styles/subSilver/imageset/icon_topic_latest.gif
diff --git a/phpBB/styles/subSilver/imageset/icon_newest_reply.gif b/phpBB/styles/subSilver/imageset/icon_topic_newest.gif
index eca2861836..eca2861836 100644
--- a/phpBB/styles/subSilver/imageset/icon_newest_reply.gif
+++ b/phpBB/styles/subSilver/imageset/icon_topic_newest.gif
diff --git a/phpBB/styles/subSilver/imageset/icon_reported.gif b/phpBB/styles/subSilver/imageset/icon_topic_reported.gif
index 026092854a..026092854a 100644
--- a/phpBB/styles/subSilver/imageset/icon_reported.gif
+++ b/phpBB/styles/subSilver/imageset/icon_topic_reported.gif
diff --git a/phpBB/styles/subSilver/imageset/icon_unapproved.gif b/phpBB/styles/subSilver/imageset/icon_topic_unapproved.gif
index 2ccaf19c23..2ccaf19c23 100644
--- a/phpBB/styles/subSilver/imageset/icon_unapproved.gif
+++ b/phpBB/styles/subSilver/imageset/icon_topic_unapproved.gif
diff --git a/phpBB/styles/subSilver/imageset/imageset.cfg b/phpBB/styles/subSilver/imageset/imageset.cfg
index 03315eedbb..f80c3515a4 100644
--- a/phpBB/styles/subSilver/imageset/imageset.cfg
+++ b/phpBB/styles/subSilver/imageset/imageset.cfg
@@ -22,83 +22,101 @@ copyright = &copy; phpBB Group, 2003
 version = 2.1.1
 
 # Images 
-img_site_logo = sitelogo.gif*94*170
-img_btn_post = {LANG}/btn_post.gif*27*97
-img_btn_post_pm = {LANG}/btn_post_pm.gif*27*97
-img_btn_reply = {LANG}/btn_reply.gif*27*97
-img_btn_reply_pm = {LANG}/btn_reply_pm.gif*20*90
-img_btn_locked = {LANG}/btn_locked.gif*27*97
-img_btn_profile = {LANG}/btn_profile.gif*20*72
-img_btn_pm = {LANG}/btn_pm.gif*20*72
-img_btn_delete = {LANG}/btn_delete.gif*20*20
-img_btn_info = {LANG}/btn_info.gif*20*20
-img_btn_quote = {LANG}/btn_quote.gif*20*90
-img_btn_search = {LANG}/btn_search.gif*20*72
-img_btn_edit = {LANG}/btn_edit.gif*20*90
-img_btn_report = {LANG}/btn_report.gif*20*20
-img_btn_warn = {LANG}/btn_warn.gif*20*20
-img_btn_email = {LANG}/btn_email.gif*20*72
-img_btn_www = {LANG}/btn_www.gif*20*72
-img_btn_icq = {LANG}/btn_icq.gif*20*72
-img_btn_aim = {LANG}/btn_aim.gif*20*72
-img_btn_yim = {LANG}/btn_yim.gif*20*72
-img_btn_msnm = {LANG}/btn_msnm.gif*20*72
-img_btn_jabber = {LANG}/btn_jabber.gif*20*72
-img_btn_online = {LANG}/btn_online.gif*20*72
-img_btn_offline = {LANG}/btn_offline.gif*20*72
-img_btn_friend =
-img_btn_foe =
-img_icon_unapproved = icon_unapproved.gif*18*19
-img_icon_reported = icon_reported.gif*18*19
-img_icon_attach = icon_attach.gif*18*14
-img_icon_post = icon_minipost.gif*9*12
-img_icon_post_new = icon_minipost_new.gif*9*12
-img_icon_post_latest = icon_latest_reply.gif*9*18
-img_icon_post_newest = icon_newest_reply.gif*9*18
-img_forum = folder_big.gif*25*46
-img_forum_new = folder_new_big.gif*25*46
-img_forum_locked = folder_locked_big.gif*25*46
-img_forum_link = folder_link_big.gif*25*46
-img_sub_forum = subfolder_big.gif*25*46
-img_sub_forum_new = subfolder_new_big.gif*25*46
-img_folder = folder.gif*18*19
-img_folder_moved = folder_moved.gif*18*19
-img_folder_post = folder_posted.gif*18*19
-img_folder_new = folder_new.gif*18*19
-img_folder_new_post = folder_new_posted.gif*18*19
-img_folder_hot = folder_hot.gif*18*19
-img_folder_hot_post = folder_hot_posted.gif*18*19
-img_folder_hot_new = folder_new_hot.gif*18*19
-img_folder_hot_new_post = folder_new_hot_posted.gif*18*19
-img_folder_lock = folder_lock.gif*18*19
-img_folder_lock_post = folder_lock_posted.gif*18*19
-img_folder_lock_new = folder_lock_new.gif*18*19
-img_folder_lock_new_post = folder_lock_new_posted.gif*18*19
-img_folder_lock_announce = folder_lock_announce.gif*18*19
-img_folder_lock_announce_new = folder_lock_announce_new.gif*18*19
-img_folder_lock_announce_post = folder_lock_announce_posted.gif*18*19
-img_folder_lock_announce_new_post = folder_lock_announce_new_posted.gif*18*19
-img_folder_lock_global = folder_lock_announce.gif*18*19
-img_folder_lock_global_new = folder_lock_announce_new.gif*18*19
-img_folder_lock_global_post = folder_lock_announce_posted.gif*18*19
-img_folder_lock_global_new_post = folder_lock_announce_new_posted.gif*18*19
-img_folder_lock_sticky = folder_lock_sticky.gif*18*19
-img_folder_lock_sticky_new = folder_lock_sticky_new.gif*18*19
-img_folder_lock_sticky_post = folder_lock_sticky_posted.gif*18*19
-img_folder_lock_sticky_new_post = folder_lock_sticky_new_posted.gif*18*19
-img_folder_sticky = folder_sticky.gif*18*19
-img_folder_sticky_post = folder_sticky_posted.gif*18*19
-img_folder_sticky_new = folder_sticky_new.gif*18*19
-img_folder_sticky_new_post = folder_sticky_new_posted.gif*18*19
-img_folder_announce = folder_announce.gif*18*19
-img_folder_announce_post = folder_announce_posted.gif*18*19
-img_folder_announce_new = folder_announce_new.gif*18*19
-img_folder_announce_new_post = folder_announce_new_posted.gif*18*19
-img_folder_global = folder_announce.gif*18*19
-img_folder_global_post = folder_announce_posted.gif*18*19
-img_folder_global_new = folder_announce_new.gif*18*19
-img_folder_global_new_post = folder_announce_new_posted.gif*18*19
-img_poll_left = vote_lcap.gif*12*4
-img_poll_center = voting_bar.gif*12*
-img_poll_right = vote_rcap.gif*12*4
-img_attach_progress_bar = progress_bar.gif*16*280
+img_site_logo = site_logo.gif*94*170
+img_upload_bar = upload_bar.gif*16*280
+img_poll_left = poll_left.gif*12*4
+img_poll_center = poll_center.gif*12*
+img_poll_right = poll_right.gif*12*4
+img_icon_friend =
+img_icon_foe =
+
+img_forum_link = forum_link.gif*25*46
+img_forum_read = forum_read.gif*25*46
+img_forum_read_locked = forum_read_locked.gif*25*46
+img_forum_read_subforum = forum_read_subforum.gif*25*46
+img_forum_unread = forum_unread.gif*25*46
+img_forum_unread_locked = forum_unread_locked.gif*25*46
+img_forum_unread_subforum = forum_unread_subforum.gif*25*46
+
+img_topic_moved = topic_moved.gif*18*19
+
+img_topic_read = topic_read.gif*18*19
+img_topic_read_mine = topic_read_mine.gif*18*19
+img_topic_read_hot = topic_read_hot.gif*18*19
+img_topic_read_hot_mine = topic_read_hot_mine.gif*18*19
+img_topic_read_locked = topic_read_locked.gif*18*19
+img_topic_read_locked_mine = topic_read_locked_mine.gif*18*19
+
+img_topic_unread = topic_unread.gif*18*19
+img_topic_unread_mine = topic_unread_mine.gif*18*19
+img_topic_unread_hot = topic_unread_hot.gif*18*19
+img_topic_unread_hot_mine = topic_unread_hot_mine.gif*18*19
+img_topic_unread_locked = topic_unread_locked.gif*18*19
+img_topic_unread_locked_mine = topic_unread_locked_mine.gif*18*19
+
+img_sticky_read = sticky_read.gif*18*19
+img_sticky_read_mine = sticky_read_mine.gif*18*19
+img_sticky_read_locked = sticky_read_locked.gif*18*19
+img_sticky_read_locked_mine = sticky_read_locked_mine.gif*18*19
+img_sticky_unread = sticky_unread.gif*18*19
+img_sticky_unread_mine = sticky_unread_mine.gif*18*19
+img_sticky_unread_locked = sticky_unread_locked.gif*18*19
+img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*18*19
+
+img_announce_read = announce_read.gif*18*19
+img_announce_read_mine = announce_read_mine.gif*18*19
+img_announce_read_locked = announce_read_locked.gif*18*19
+img_announce_read_locked_mine = announce_read_locked_mine.gif*18*19
+img_announce_unread = announce_unread.gif*18*19
+img_announce_unread_mine = announce_unread_mine.gif*18*19
+img_announce_unread_locked = announce_unread_locked.gif*18*19
+img_announce_unread_locked_mine = announce_unread_locked_mine.gif*18*19
+
+img_global_read = announce_read.gif*18*19
+img_global_read_mine = announce_read_mine.gif*18*19
+img_global_read_locked = announce_read_locked.gif*18*19
+img_global_read_locked_mine = announce_read_locked_mine.gif*18*19
+img_global_unread = announce_unread.gif*18*19
+img_global_unread_mine = announce_unread_mine.gif*18*19
+img_global_unread_locked = announce_unread_locked.gif*18*19
+img_global_unread_locked_mine = announce_unread_locked_mine.gif*18*19
+
+img_pm_read = topic_read.gif*18*19
+img_pm_unread = topic_unread.gif*18*19
+
+img_icon_contact_aim = {LANG}/icon_contact_aim.gif*20*72
+img_icon_contact_email = {LANG}/icon_contact_email.gif*20*72
+img_icon_contact_icq = {LANG}/icon_contact_icq.gif*20*72
+img_icon_contact_jabber = {LANG}/icon_contact_jabber.gif*20*72
+img_icon_contact_msnm = {LANG}/icon_contact_msnm.gif*20*72
+img_icon_contact_pm = {LANG}/icon_contact_pm.gif*20*72
+img_icon_contact_yahoo = {LANG}/icon_contanct_yahoo.gif*20*72
+img_icon_contact_www = {LANG}/icon_contact_www.gif*20*72
+
+img_icon_post_delete = {LANG}/icon_post_delete.gif*20*20
+img_icon_post_edit = {LANG}/icon_post_edit.gif*20*90
+img_icon_post_info = {LANG}/icon_post_info.gif*20*20
+img_icon_post_quote = {LANG}/icon_post_quote.gif*20*90
+img_icon_post_report = {LANG}/icon_post_report.gif*20*20
+img_icon_post_target = icon_post_target.gif*9*12
+img_icon_post_target_unread = icon_post_target_unread.gif*9*12
+
+img_icon_topic_attach = icon_topic_attach.gif*18*14
+img_icon_topic_latest = icon_topic_latest.gif*9*18
+img_icon_topic_newest = icon_topic_newest.gif*9*18
+img_icon_topic_reported = icon_topic_reported.gif*18*19
+img_icon_topic_unapproved = icon_topic_unapproved.gif*18*19
+
+img_icon_user_online = {LANG}/icon_user_online.gif*20*72
+img_icon_user_offline = {LANG}/icon_user_offline.gif*20*72
+img_icon_user_profile = {LANG}/icon_user_profile.gif*20*72
+img_icon_user_search = {LANG}/icon_user_search.gif*20*72
+img_icon_user_warn = {LANG}/icon_user_warn.gif*20*20
+
+img_button_pm_forward =
+img_button_pm_new = {LANG}/button_pm_new.gif*27*97
+img_button_pm_reply = {LANG}/button_pm_reply.gif*20*90
+img_button_topic_locked = {LANG}/button_topic_locked.gif*27*97
+img_button_topic_new = {LANG}/button_topic_new.gif*27*97
+img_button_topic_reply = {LANG}/button_topic_reply.gif*27*97
+
diff --git a/phpBB/styles/subSilver/imageset/voting_bar.gif b/phpBB/styles/subSilver/imageset/poll_center.gif
index 99473151ec..99473151ec 100644
--- a/phpBB/styles/subSilver/imageset/voting_bar.gif
+++ b/phpBB/styles/subSilver/imageset/poll_center.gif
diff --git a/phpBB/styles/subSilver/imageset/vote_lcap.gif b/phpBB/styles/subSilver/imageset/poll_left.gif
index 269088b81d..269088b81d 100644
--- a/phpBB/styles/subSilver/imageset/vote_lcap.gif
+++ b/phpBB/styles/subSilver/imageset/poll_left.gif
diff --git a/phpBB/styles/subSilver/imageset/vote_rcap.gif b/phpBB/styles/subSilver/imageset/poll_right.gif
index f9584e23a1..f9584e23a1 100644
--- a/phpBB/styles/subSilver/imageset/vote_rcap.gif
+++ b/phpBB/styles/subSilver/imageset/poll_right.gif
diff --git a/phpBB/styles/subSilver/imageset/sitelogo.gif b/phpBB/styles/subSilver/imageset/site_logo.gif
index f149bbc15e..f149bbc15e 100644
--- a/phpBB/styles/subSilver/imageset/sitelogo.gif
+++ b/phpBB/styles/subSilver/imageset/site_logo.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_sticky.gif b/phpBB/styles/subSilver/imageset/sticky_read.gif
index 09861a996c..09861a996c 100644
--- a/phpBB/styles/subSilver/imageset/folder_sticky.gif
+++ b/phpBB/styles/subSilver/imageset/sticky_read.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_sticky.gif b/phpBB/styles/subSilver/imageset/sticky_read_locked.gif
index 24bca303d6..24bca303d6 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_sticky.gif
+++ b/phpBB/styles/subSilver/imageset/sticky_read_locked.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_sticky_posted.gif b/phpBB/styles/subSilver/imageset/sticky_read_locked_mine.gif
index 3fd04ec3a9..3fd04ec3a9 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_sticky_posted.gif
+++ b/phpBB/styles/subSilver/imageset/sticky_read_locked_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_sticky_posted.gif b/phpBB/styles/subSilver/imageset/sticky_read_mine.gif
index 381634c364..381634c364 100644
--- a/phpBB/styles/subSilver/imageset/folder_sticky_posted.gif
+++ b/phpBB/styles/subSilver/imageset/sticky_read_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_sticky_new.gif b/phpBB/styles/subSilver/imageset/sticky_unread.gif
index dd2e366543..dd2e366543 100644
--- a/phpBB/styles/subSilver/imageset/folder_sticky_new.gif
+++ b/phpBB/styles/subSilver/imageset/sticky_unread.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_sticky_new.gif b/phpBB/styles/subSilver/imageset/sticky_unread_locked.gif
index 608f4822e3..608f4822e3 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_sticky_new.gif
+++ b/phpBB/styles/subSilver/imageset/sticky_unread_locked.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_sticky_new_posted.gif b/phpBB/styles/subSilver/imageset/sticky_unread_locked_mine.gif
index fe5e115312..fe5e115312 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_sticky_new_posted.gif
+++ b/phpBB/styles/subSilver/imageset/sticky_unread_locked_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_sticky_new_posted.gif b/phpBB/styles/subSilver/imageset/sticky_unread_mine.gif
index b5fc3b3627..b5fc3b3627 100644
--- a/phpBB/styles/subSilver/imageset/folder_sticky_new_posted.gif
+++ b/phpBB/styles/subSilver/imageset/sticky_unread_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_moved.gif b/phpBB/styles/subSilver/imageset/topic_moved.gif
index fe758f02ca..fe758f02ca 100644
--- a/phpBB/styles/subSilver/imageset/folder_moved.gif
+++ b/phpBB/styles/subSilver/imageset/topic_moved.gif
diff --git a/phpBB/styles/subSilver/imageset/folder.gif b/phpBB/styles/subSilver/imageset/topic_read.gif
index c16bfa75d5..c16bfa75d5 100644
--- a/phpBB/styles/subSilver/imageset/folder.gif
+++ b/phpBB/styles/subSilver/imageset/topic_read.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_hot.gif b/phpBB/styles/subSilver/imageset/topic_read_hot.gif
index a7e8831e2c..a7e8831e2c 100644
--- a/phpBB/styles/subSilver/imageset/folder_hot.gif
+++ b/phpBB/styles/subSilver/imageset/topic_read_hot.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_hot_posted.gif b/phpBB/styles/subSilver/imageset/topic_read_hot_mine.gif
index 335ae77645..335ae77645 100644
--- a/phpBB/styles/subSilver/imageset/folder_hot_posted.gif
+++ b/phpBB/styles/subSilver/imageset/topic_read_hot_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock.gif b/phpBB/styles/subSilver/imageset/topic_read_locked.gif
index 10eb776972..10eb776972 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock.gif
+++ b/phpBB/styles/subSilver/imageset/topic_read_locked.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_posted.gif b/phpBB/styles/subSilver/imageset/topic_read_locked_mine.gif
index 3f24928b48..3f24928b48 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_posted.gif
+++ b/phpBB/styles/subSilver/imageset/topic_read_locked_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_posted.gif b/phpBB/styles/subSilver/imageset/topic_read_mine.gif
index 560927aa06..560927aa06 100644
--- a/phpBB/styles/subSilver/imageset/folder_posted.gif
+++ b/phpBB/styles/subSilver/imageset/topic_read_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_new.gif b/phpBB/styles/subSilver/imageset/topic_unread.gif
index 4e56157dce..4e56157dce 100644
--- a/phpBB/styles/subSilver/imageset/folder_new.gif
+++ b/phpBB/styles/subSilver/imageset/topic_unread.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_new_hot.gif b/phpBB/styles/subSilver/imageset/topic_unread_hot.gif
index 25ced64b83..25ced64b83 100644
--- a/phpBB/styles/subSilver/imageset/folder_new_hot.gif
+++ b/phpBB/styles/subSilver/imageset/topic_unread_hot.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_new_hot_posted.gif b/phpBB/styles/subSilver/imageset/topic_unread_hot_mine.gif
index 4d3937ae28..4d3937ae28 100644
--- a/phpBB/styles/subSilver/imageset/folder_new_hot_posted.gif
+++ b/phpBB/styles/subSilver/imageset/topic_unread_hot_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_new.gif b/phpBB/styles/subSilver/imageset/topic_unread_locked.gif
index 720e210289..720e210289 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_new.gif
+++ b/phpBB/styles/subSilver/imageset/topic_unread_locked.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_lock_new_posted.gif b/phpBB/styles/subSilver/imageset/topic_unread_locked_mine.gif
index 90873431ef..90873431ef 100644
--- a/phpBB/styles/subSilver/imageset/folder_lock_new_posted.gif
+++ b/phpBB/styles/subSilver/imageset/topic_unread_locked_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/folder_new_posted.gif b/phpBB/styles/subSilver/imageset/topic_unread_mine.gif
index 34fd2ec179..34fd2ec179 100644
--- a/phpBB/styles/subSilver/imageset/folder_new_posted.gif
+++ b/phpBB/styles/subSilver/imageset/topic_unread_mine.gif
diff --git a/phpBB/styles/subSilver/imageset/progress_bar.gif b/phpBB/styles/subSilver/imageset/upload_bar.gif
index 75cf61c59e..75cf61c59e 100644
--- a/phpBB/styles/subSilver/imageset/progress_bar.gif
+++ b/phpBB/styles/subSilver/imageset/upload_bar.gif
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index a016c4b51e..794352a17d 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -240,23 +240,23 @@ $template->assign_vars(array(
 	'TOTAL_TOPICS'	=> ($s_display_active) ? false : (($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count)),
 	'MODERATORS'	=> (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '',
 
-	'POST_IMG'					=> ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('btn_locked', $post_alt) : $user->img('btn_post', $post_alt),
-	'NEWEST_POST_IMG'			=> $user->img('icon_post_newest', 'VIEW_NEWEST_POST'),
-	'LAST_POST_IMG'				=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
-	'FOLDER_IMG'				=> $user->img('folder', 'NO_NEW_POSTS'),
-	'FOLDER_NEW_IMG'			=> $user->img('folder_new', 'NEW_POSTS'),
-	'FOLDER_HOT_IMG'			=> $user->img('folder_hot', 'NO_NEW_POSTS_HOT'),
-	'FOLDER_HOT_NEW_IMG'		=> $user->img('folder_hot_new', 'NEW_POSTS_HOT'),
-	'FOLDER_LOCKED_IMG'			=> $user->img('folder_lock', 'NO_NEW_POSTS_LOCKED'),
-	'FOLDER_LOCKED_NEW_IMG'		=> $user->img('folder_lock_new', 'NEW_POSTS_LOCKED'),
-	'FOLDER_STICKY_IMG'			=> $user->img('folder_sticky', 'POST_STICKY'),
-	'FOLDER_STICKY_NEW_IMG'		=> $user->img('folder_sticky_new', 'POST_STICKY'),
-	'FOLDER_ANNOUNCE_IMG'		=> $user->img('folder_announce', 'POST_ANNOUNCEMENT'),
-	'FOLDER_ANNOUNCE_NEW_IMG'	=> $user->img('folder_announce_new', 'POST_ANNOUNCEMENT'),
-	'FOLDER_MOVED_IMG'			=> $user->img('folder_moved', 'TOPIC_MOVED'),
-	'REPORTED_IMG'				=> $user->img('icon_reported', 'TOPIC_REPORTED'),
-	'UNAPPROVED_IMG'			=> $user->img('icon_unapproved', 'TOPIC_UNAPPROVED'),
-	'GOTO_PAGE_IMG'				=> $user->img('icon_post', 'GOTO_PAGE'),
+	'POST_IMG'					=> ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', $post_alt) : $user->img('button_topic_new', $post_alt),
+	'NEWEST_POST_IMG'			=> $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
+	'LAST_POST_IMG'				=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
+	'FOLDER_IMG'				=> $user->img('topic_read', 'NO_NEW_POSTS'),
+	'FOLDER_NEW_IMG'			=> $user->img('topic_unread', 'NEW_POSTS'),
+	'FOLDER_HOT_IMG'			=> $user->img('topic_read_hot', 'NO_NEW_POSTS_HOT'),
+	'FOLDER_HOT_NEW_IMG'		=> $user->img('topic_unread_hot', 'NEW_POSTS_HOT'),
+	'FOLDER_LOCKED_IMG'			=> $user->img('topic_read_locked', 'NO_NEW_POSTS_LOCKED'),
+	'FOLDER_LOCKED_NEW_IMG'		=> $user->img('topic_unread_locked', 'NEW_POSTS_LOCKED'),
+	'FOLDER_STICKY_IMG'			=> $user->img('sticky_read', 'POST_STICKY'),
+	'FOLDER_STICKY_NEW_IMG'		=> $user->img('sticky_unread', 'POST_STICKY'),
+	'FOLDER_ANNOUNCE_IMG'		=> $user->img('announce_read', 'POST_ANNOUNCEMENT'),
+	'FOLDER_ANNOUNCE_NEW_IMG'	=> $user->img('announce_unread', 'POST_ANNOUNCEMENT'),
+	'FOLDER_MOVED_IMG'			=> $user->img('topic_moved', 'TOPIC_MOVED'),
+	'REPORTED_IMG'				=> $user->img('icon_topic_reported', 'TOPIC_REPORTED'),
+	'UNAPPROVED_IMG'			=> $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'),
+	'GOTO_PAGE_IMG'				=> $user->img('icon_post_target', 'GOTO_PAGE'),
 
 	'L_NO_TOPICS' 			=> ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['POST_FORUM_LOCKED'] : $user->lang['NO_TOPICS'],
 
@@ -529,8 +529,8 @@ if (sizeof($topic_list))
 			'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
 			'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
 			'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-			'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
-			'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? $user->img('icon_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
+			'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+			'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
 
 			'S_TOPIC_TYPE'			=> $row['topic_type'],
 			'S_USER_POSTED'			=> (isset($row['topic_posted']) && $row['topic_posted']) ? true : false,
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index ef17751c3c..694f173268 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -514,26 +514,26 @@ $template->assign_vars(array(
 	'U_MCP' 		=> ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=topic_view&amp;f=$forum_id&amp;t=$topic_id&amp;start=$start&amp;$u_sort_param", true, $user->session_id) : '',
 	'MODERATORS'	=> (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : '',
 
-	'POST_IMG' 			=> ($topic_data['forum_status'] == ITEM_LOCKED) ? $user->img('btn_locked', 'FORUM_LOCKED') : $user->img('btn_post', 'POST_NEW_TOPIC'),
-	'QUOTE_IMG' 		=> $user->img('btn_quote', 'REPLY_WITH_QUOTE'),
-	'REPLY_IMG'			=> ($topic_data['forum_status'] == ITEM_LOCKED || $topic_data['topic_status'] == ITEM_LOCKED) ? $user->img('btn_locked', 'TOPIC_LOCKED') : $user->img('btn_reply', 'REPLY_TO_TOPIC'),
-	'EDIT_IMG' 			=> $user->img('btn_edit', 'EDIT_POST'),
-	'DELETE_IMG' 		=> $user->img('btn_delete', 'DELETE_POST'),
-	'INFO_IMG' 			=> $user->img('btn_info', 'VIEW_INFO'),
-	'PROFILE_IMG'		=> $user->img('btn_profile', 'READ_PROFILE'),
-	'SEARCH_IMG' 		=> $user->img('btn_search', 'SEARCH_USER_POSTS'),
-	'PM_IMG' 			=> $user->img('btn_pm', 'SEND_PRIVATE_MESSAGE'),
-	'EMAIL_IMG' 		=> $user->img('btn_email', 'SEND_EMAIL'),
-	'WWW_IMG' 			=> $user->img('btn_www', 'VISIT_WEBSITE'),
-	'ICQ_IMG' 			=> $user->img('btn_icq', 'ICQ'),
-	'AIM_IMG' 			=> $user->img('btn_aim', 'AIM'),
-	'MSN_IMG' 			=> $user->img('btn_msnm', 'MSNM'),
-	'YIM_IMG' 			=> $user->img('btn_yim', 'YIM'),
-	'JABBER_IMG'		=> $user->img('btn_jabber', 'JABBER') ,
-	'REPORT_IMG'		=> $user->img('btn_report', 'REPORT_POST'),
-	'REPORTED_IMG'		=> $user->img('icon_reported', 'POST_REPORTED'),
-	'UNAPPROVED_IMG'	=> $user->img('icon_unapproved', 'POST_UNAPPROVED'),
-	'WARN_IMG'			=> $user->img('btn_warn', 'WARN_USER'),
+	'POST_IMG' 			=> ($topic_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'FORUM_LOCKED') : $user->img('button_topic_new', 'POST_NEW_TOPIC'),
+	'QUOTE_IMG' 		=> $user->img('icon_post_quote', 'REPLY_WITH_QUOTE'),
+	'REPLY_IMG'			=> ($topic_data['forum_status'] == ITEM_LOCKED || $topic_data['topic_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'TOPIC_LOCKED') : $user->img('button_topic_reply', 'REPLY_TO_TOPIC'),
+	'EDIT_IMG' 			=> $user->img('icon_post_edit', 'EDIT_POST'),
+	'DELETE_IMG' 		=> $user->img('icon_post_delete', 'DELETE_POST'),
+	'INFO_IMG' 			=> $user->img('icon_post_info', 'VIEW_INFO'),
+	'PROFILE_IMG'		=> $user->img('icon_user_profile', 'READ_PROFILE'),
+	'SEARCH_IMG' 		=> $user->img('icon_user_search', 'SEARCH_USER_POSTS'),
+	'PM_IMG' 			=> $user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'),
+	'EMAIL_IMG' 		=> $user->img('icon_contact_email', 'SEND_EMAIL'),
+	'WWW_IMG' 			=> $user->img('icon_contact_www', 'VISIT_WEBSITE'),
+	'ICQ_IMG' 			=> $user->img('icon_contact_icq', 'ICQ'),
+	'AIM_IMG' 			=> $user->img('icon_contact_aim', 'AIM'),
+	'MSN_IMG' 			=> $user->img('icon_contact_msnm', 'MSNM'),
+	'YIM_IMG' 			=> $user->img('icon_contact_yahoo', 'YIM'),
+	'JABBER_IMG'		=> $user->img('icon_contact_jabber', 'JABBER') ,
+	'REPORT_IMG'		=> $user->img('icon_post_report', 'REPORT_POST'),
+	'REPORTED_IMG'		=> $user->img('icon_topic_reported', 'POST_REPORTED'),
+	'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
+	'WARN_IMG'			=> $user->img('icon_user_warn', 'WARN_USER'),
 
 	'S_SELECT_SORT_DIR' 	=> $s_sort_dir,
 	'S_SELECT_SORT_KEY' 	=> $s_sort_key,
@@ -1364,12 +1364,12 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'EDIT_REASON'		=> $row['post_edit_reason'],
 		'BUMPED_MESSAGE'	=> $l_bumped_by,
 
-		'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_new', 'NEW_POST') : $user->img('icon_post', 'POST'),
+		'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'NEW_POST') : $user->img('icon_post_target', 'POST'),
 		'POST_ICON_IMG'			=> (!empty($row['icon_id'])) ? $icons[$row['icon_id']]['img'] : '',
 		'POST_ICON_IMG_WIDTH'	=> (!empty($row['icon_id'])) ? $icons[$row['icon_id']]['width'] : '',
 		'POST_ICON_IMG_HEIGHT'	=> (!empty($row['icon_id'])) ? $icons[$row['icon_id']]['height'] : '',
 		'ICQ_STATUS_IMG'		=> $user_cache[$poster_id]['icq_status_img'],
-		'ONLINE_IMG'			=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')),
+		'ONLINE_IMG'			=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
 		'S_ONLINE'				=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false),
 
 		'FORCE_ENCODING'	=> ($row['post_encoding'] != $user->lang['ENCODING']) ? sprintf($user->lang['POST_ENCODING'], $row['poster'], '<a href="' . $viewtopic_url . "&amp;p={$row['post_id']}&amp;view=encoding#p{$row['post_id']}" . '">', '</a>') : '',