diff --git a/phpBB/styles/subSilver/template/attachment.html b/phpBB/styles/subSilver/template/attachment.html
index 357a44bd62..41dddaef34 100644
--- a/phpBB/styles/subSilver/template/attachment.html
+++ b/phpBB/styles/subSilver/template/attachment.html
@@ -60,15 +60,14 @@
 <!-- END IMAGE -->
 
 <!-- BEGIN THUMBNAIL -->
-	<span class="postbody">{COMMENT}<br />
-	<a href="{U_DOWNLOAD_LINK}" target="_blank"><img src="{THUMB_IMG}" alt="{DOWNLOAD_NAME}" border="0" /></a></span>
-	<br /><span class="gensmall">{DOWNLOAD_NAME} - {L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span><br /><br />
+	<span class="gensmall"><b>{L_COMMENT}:</b> {COMMENT}</span><hr />
+	<a href="{U_DOWNLOAD_LINK}" target="_blank"><img src="{THUMB_IMG}" alt="{DOWNLOAD_NAME}" border="0" /></a></span><br clear="all" />
+	<span class="gensmall">{DOWNLOAD_NAME} - {L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span>
 <!-- END THUMBNAIL -->
 
 <!-- BEGIN FILE -->
-	<span class="postbody">{COMMENT}</span><br />
-	<span class="postbody">{UPLOAD_IMG}
-	<a href="{U_DOWNLOAD_LINK}" target="_blank">{DOWNLOAD_NAME}</a> - {FILESIZE} {SIZE_VAR}<br /></span>
-	<span class="gensmall">{L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span><br /><br />
+	<span class="gensmall"><b>{L_COMMENT}:</b> {COMMENT}</span><hr />
+	<span class="postbody">{UPLOAD_IMG} <a href="{U_DOWNLOAD_LINK}" target="_blank">{DOWNLOAD_NAME}</a> - {FILESIZE} {SIZE_VAR}</span><br clear="all" />
+	<span class="gensmall">{L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span>
 <!-- END FILE -->
 			
diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html
index 56b7907396..d07d15f598 100644
--- a/phpBB/styles/subSilver/template/index_body.html
+++ b/phpBB/styles/subSilver/template/index_body.html
@@ -1,82 +1,85 @@
 <!-- INCLUDE overall_header.html -->
 
-<table width="95%" cellspacing="0" cellpadding="2" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td width="100%" align="left" valign="bottom"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td align="left" valign="bottom"><span class="gensmall">{TOTAL_POSTS} / {TOTAL_TOPICS}<br />{TOTAL_USERS} / {NEWEST_USER}</span><br /><br /><a class="nav"  href="{U_INDEX}">{L_INDEX}</a></td>
-				<td class="gensmall" align="right" valign="top"><!-- IF S_USER_LOGGED_IN --><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a><br /><!-- ENDIF --><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a></td>
-			</tr>
-		</table></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<br clear="all" />
+
+<table class="tablebg" cellspacing="1">
 	<tr>
-		<th colspan="2" nowrap="nowrap">&nbsp;{L_FORUM}&nbsp;</th>
-		<th width="50" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
-		<th width="50" nowrap="nowrap">&nbsp;{L_POSTS}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
+		<td class="cat" colspan="5" align="right" valign="middle"><a class="nav" href="{U_MARK_READ}">{L_MARK_FORUMS_READ}</a>&nbsp;</td>
+	</tr>
+	<tr>
+		<th colspan="2">&nbsp;{L_FORUM}&nbsp;</th>
+		<th width="50">&nbsp;{L_TOPICS}&nbsp;</th>
+		<th width="50">&nbsp;{L_POSTS}&nbsp;</th>
+		<th>&nbsp;{L_LAST_POST}&nbsp;</th>
 	</tr>
 	<!-- BEGIN forumrow -->
 	<!-- IF forumrow.S_IS_CAT -->
 	<tr>
-		<td class="cat" colspan="2" height="28"><a class="cattitle" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></td>
+		<td class="cat" colspan="2"><a class="cattitle" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></td>
 		<td class="catdiv" colspan="3" align="right">&nbsp;</td>
 	</tr>
 	<!-- ELSEIF forumrow.S_IS_LINK -->
 	<tr>
-		<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
-		<td class="row1" height="50"><a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><br />
-			<table cellspacing="5" cellpadding="0" border="0">
-				<tr>
-					<td><span class="gensmall">{forumrow.FORUM_DESC}</span></td>
-				</tr>
-			</table></td>
-		<td class="row2" colspan="3" align="center" valign="middle" height="50"><!-- IF forumrow.CLICKS neq '' --><span class="gensmall">{L_REDIRECTS}: {forumrow.CLICKS}</span><!-- ENDIF --></td>
+		<td class="row1" width="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
+		<!-- IF forumrow.CLICKS -->
+		<td class="row1">
+		<!-- ELSE -->
+		<td class="row1" colspan="4">
+		<!-- ENDIF -->
+		<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><br /><div class="gensmall" style="padding: 4px;">{forumrow.FORUM_DESC}</div></td>
+		<!-- IF forumrow.CLICKS -->
+		<td class="row2" colspan="3" align="center" valign="middle" ><span class="gensmall">{L_REDIRECTS}: {forumrow.CLICKS}</span></td>
+		<!-- ENDIF -->
 	</tr>
 	<!-- ELSE -->
 	<tr>
-		<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
-		<td class="row1" width="100%" height="50" valign="top"><a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><br />
-			<table cellspacing="5" cellpadding="0" border="0">
-				<tr>
-					<td><span class="gensmall">{forumrow.FORUM_DESC}</span></td>
-				</tr>
-			</table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{forumrow.L_MODERATOR_STR}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM_STR}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
-		<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.TOPICS}</span></td>
-		<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.POSTS}</span></td>
-		<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"><span class="gensmall"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POSTER --><a href="{forumrow.U_LAST_POSTER}">{forumrow.LAST_POSTER}</a><!-- ELSE -->{forumrow.LAST_POSTER}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></span></td>
+		<td class="row1" width="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
+		<td class="row1" width="100%" valign="top"><a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><br />
+
+			<div class="gensmall" style="padding: 4px;">{forumrow.FORUM_DESC}</div>
+
+			<div class="gensmall"><!-- IF forumrow.MODERATORS --><b>{forumrow.L_MODERATOR_STR}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM_STR}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></div>
+		</td>
+		<td class="row2" align="center" valign="middle"><span class="gensmall">{forumrow.TOPICS}</span></td>
+		<td class="row2" align="center" valign="middle"><span class="gensmall">{forumrow.POSTS}</span></td>
+		<td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="gensmall"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POSTER --><a href="{forumrow.U_LAST_POSTER}">{forumrow.LAST_POSTER}</a><!-- ELSE -->{forumrow.LAST_POSTER}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></span></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="5" height="28" align="center"><span class="gensmall">{L_NO_FORUMS}</span></td>
+		<td class="row1" colspan="5" align="center"><span class="gensmall">{L_NO_FORUMS}</span></td>
 	</tr>
 	<!-- END forumrow -->
 </table>
 
-<table width="95%" cellspacing="0" cellpadding="2" border="0" align="center">
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td align="left"><span class="gensmall"><a href="{U_MARK_READ}"><b>{L_MARK_FORUMS_READ}</b></a></span></td>
-		<td align="right"><span class="gensmall">{S_TIMEZONE}</span></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 <br clear="all" />
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="cat" colspan="2" height="28"><a class="cattitle" href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></td>
+		<td class="cat" colspan="2"><a class="cattitle" href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></td>
 	</tr>
 	<tr>
 		<!-- IF LEGEND -->
-		<td class="row1" width="46" rowspan="2" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
+		<td class="row1" rowspan="2" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
 		<!-- ELSE -->
-		<td class="row1" width="46" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
+		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
 		<!-- ENDIF -->
-		<td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}<br /><br />{L_ONLINE_EXPLAIN}</span></td>
+		<td class="row1" width="100%"><span class="gensmall">{TOTAL_USERS_ONLINE}<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}<br /><br />{L_ONLINE_EXPLAIN}</span></td>
 	</tr>
 	<!-- IF LEGEND -->
 	<tr>
@@ -89,31 +92,45 @@
 <!-- IF S_DISPLAY_BIRTHDAY_LIST -->
 <br clear="all" />
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="cat" colspan="2" height="28"><span class="cattitle">{L_BIRTHDAYS}</span></td>
+		<td class="cat" colspan="2"><span class="cattitle">{L_BIRTHDAYS}</span></td>
 	</tr>
 	<tr>
-		<td class="row1" width="46" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
-		<td class="row1" width="100%" align="left"><span class="gensmall"><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></span></td>
+		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
+		<td class="row1" width="100%"><span class="gensmall"><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></span></td>
 	</tr>
 </table>
 <!-- ENDIF -->
 
-<!-- IF not S_USER_LOGGED_IN -->
-<form method="post" action="{S_LOGIN_ACTION}"><table class="tablebg" width="95%" cellspacing="1" cellpadding="3" border="0" align="center">
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="cat" height="28"><a class="cattitle" href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></td>
+		<td class="cat" colspan="2"><span class="cattitle">{L_STATISTICS}</span></td>
 	</tr>
 	<tr>
-		<td class="row1" height="28" align="center" valign="middle"><span class="gensmall">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="gensmall">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" name="autologin" />&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
+		<td class="row1"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
+		<td class="row1" width="100%" valign="middle"><span class="gensmall">{TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}</span></td>
+	</tr>
+</table>
+
+<!-- IF not S_USER_LOGGED_IN -->
+<br clear="all" />
+
+<form method="post" action="{S_LOGIN_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="cat"><a class="cattitle" href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></td>
+	</tr>
+	<tr>
+		<td class="row1" align="center"><span class="gensmall">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="gensmall">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" name="autologin" />&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
 	</tr>
 </table></form>
 <!-- ENDIF -->
 
 <br clear="all" />
 
-<table cellspacing="3" cellpadding="0" border="0" align="center">
+<table align="center">
 	<tr>
 		<td width="20" align="center">{FORUM_NEW_IMG}</td>
 		<td><span class="gensmall">{L_NEW_POSTS}</span></td>
@@ -126,4 +143,5 @@
 	</tr>
 </table>
 
+
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/login_body.html b/phpBB/styles/subSilver/template/login_body.html
index 9a6301d49a..c421d60b45 100644
--- a/phpBB/styles/subSilver/template/login_body.html
+++ b/phpBB/styles/subSilver/template/login_body.html
@@ -1,15 +1,16 @@
-<!-- $Id$ -->
 <!-- INCLUDE overall_header.html -->
 
-<form action="{S_LOGIN_ACTION}" method="post"><table width="45%" cellspacing="2" cellpadding="2" border="0" align="center">
+<!-- $Id$ -->
+
+<form action="{S_LOGIN_ACTION}" method="post"><table width="50%" cellspacing="1">
 	<tr> 
 		<td align="left"><a class="nav" href="{U_INDEX}">{L_INDEX}</a></td>
 	</tr>
 </table>
 
-<table class="tablebg" width="45%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="50%" cellspacing="1">
 	<tr> 
-		<th height="28">{L_LOGIN}</th>
+		<th>{L_LOGIN}</th>
 	</tr>
 	<!-- IF LOGIN_EXPLAIN -->
 	<tr>
@@ -17,10 +18,10 @@
 	</tr>
 	<!-- ENDIF -->
 	<tr> 
-		<td class="row1" align="center"><table cellspacing="1" cellpadding="2" border="0">
+		<td class="row1"><table cellspacing="1" cellpadding="2">
 			<!-- IF LOGIN_ERROR -->
 			<tr>
-				<td class="gensmall" colspan="2" align="center"><span style="color:red">{LOGIN_ERROR}</span></td>
+				<td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td>
 			</tr>
 			<!-- ENDIF -->
 			<tr> 
@@ -40,10 +41,7 @@
 				<td><input type="checkbox" name="viewonline" tabindex="5" /> <span class="gensmall">{L_HIDE_ME}</span></td>
 			</tr>
 			<tr>
-				<td class="gensmall" colspan="2" align="center"><a href="{U_TERMS_USE}">{L_TERMS_USE}</a></td>
-			</tr>
-			<tr>
-				<td class="gensmall" colspan="2" align="center"><a href="{U_PRIVACY}">{L_PRIVACY}</a></td>
+				<td class="gensmall" colspan="2" align="center"><a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a></td>
 			</tr>
 		</table></td>
 	</tr>
diff --git a/phpBB/styles/subSilver/template/overall_footer.html b/phpBB/styles/subSilver/template/overall_footer.html
index 4fcca501ac..4c5a4e6249 100644
--- a/phpBB/styles/subSilver/template/overall_footer.html
+++ b/phpBB/styles/subSilver/template/overall_footer.html
@@ -1,5 +1,6 @@
 
-<div align="center"><br /><!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
+</div>
+
 <!--
 	We request you retain the full copyright notice below including the link to www.phpbb.com.
 	This not only gives respect to the large amount of time given freely by the developers
@@ -10,7 +11,14 @@
 
 	The phpBB Group : 2003
 // -->
-<span class="copyright">Powered by <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a> {PHPBB_VERSION} &copy; 2002, 2003 phpBB Group<br />{TRANSLATION_INFO}<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span></div>
+
+<div id="footer">
+
+<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
+
+<span class="copyright">Powered by <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a> {PHPBB_VERSION} &copy; 2002, 2003 phpBB Group<br />{TRANSLATION_INFO}<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span>
+
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html
index 9ac8c8b047..09772bed0b 100644
--- a/phpBB/styles/subSilver/template/overall_header.html
+++ b/phpBB/styles/subSilver/template/overall_header.html
@@ -1,12 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html dir="{S_CONTENT_DIRECTION}">
+<?xml version="1.0" encoding="{S_CONTENT_ENCODING}"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
-<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
 {META}
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 <!-- IF T_STYLESHEET_LINK -->
-<link rel="stylesheet" href="{T_STYLESHEET_LINK}" name="{T_STYLESHEET_NAME}" type="text/css">
+<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
 <!-- ELSE -->
 <style type="text/css">
 <!--
@@ -18,7 +20,7 @@
 <!--
 
 <!-- IF S_USER_PM_POPUP -->
-if ({PRIVATE_MESSAGE_NEW_FLAG})
+if ({S_NEW_PM})
 {
 	window.open('{U_PRIVATEMSGS}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');
 }
@@ -48,26 +50,30 @@ function jumpto()
 
 <a name="top"></a>
 
-<table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
-	<tr>
-		<td height="110" nowrap="nowrap"><a href="{U_INDEX}"><img src="{T_THEME_PATH}/images/sitelogo.jpg" border="0" alt="" title="" /></a></td>
-		<td width="100%" align="center" valign="middle"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}</span></td>
-	</tr>
-</table>
+<div id="header">
+	
+	<div id="logodesc"><table width="100%" cellspacing="0">
+		<tr>
+			<td><a href="{U_INDEX}"><img src="{T_THEME_PATH}/images/sitelogo.jpg" border="0" alt="" title="" /></a></td>
+			<td width="100%" align="center"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}</span></td>
+		</tr>
+	</table></div>
 
-<table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
-	<tr>
-		<td class="mainmenu" height="25" valign="middle" nowrap="nowrap"><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a>&nbsp;<!-- IF S_USER_LOGGED_IN --><!-- IF S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a><!-- ENDIF --><!-- ELSE --> &nbsp;<a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a><!-- ENDIF -->&nbsp;</td>
+	<div id="menu"><table width="100%" cellspacing="0">
+		<tr>
+			<td><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" /> {L_LOGIN_LOGOUT}</a>&nbsp;<!-- IF S_USER_LOGGED_IN --><!-- IF S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" /> {PRIVATE_MESSAGE_INFO}</a><!-- ENDIF --><!-- ELSE --> &nbsp;<a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" /> {L_REGISTER}</a><!-- ENDIF --></td>
+			<td align="right"><a href="{U_FAQ}"><img src="{T_THEME_PATH}/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" /> {L_FAQ}</a><!-- IF S_DISPLAY_SEARCH -->&nbsp; &nbsp;<a href="{U_SEARCH}"><img src="{T_THEME_PATH}/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" /> {L_SEARCH}</a><!-- ENDIF --><!-- IF S_DISPLAY_MEMBERLIST -->&nbsp; &nbsp;<a href="{U_MEMBERLIST}"><img src="{T_THEME_PATH}/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" /> {L_MEMBERLIST}</a><!-- ENDIF -->&nbsp; &nbsp;<a href="{U_GROUP_CP}"><img src="{T_THEME_PATH}/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" /> {L_USERGROUPS}</a><!-- IF S_USER_LOGGED_IN -->&nbsp; &nbsp;<a href="{U_PROFILE}"><img src="{T_THEME_PATH}/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" /> {L_PROFILE}</a><!-- ENDIF --></td>
+		</tr>
+	</table></div>
 
-		<td class="mainmenu" height="25" align="right" valign="middle" nowrap="nowrap">&nbsp;<a href="{U_FAQ}"><img src="{T_THEME_PATH}/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a><!-- IF S_DISPLAY_SEARCH -->&nbsp; &nbsp;<a href="{U_SEARCH}"><img src="{T_THEME_PATH}/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a><!-- ENDIF --><!-- IF S_DISPLAY_MEMBERLIST -->&nbsp; &nbsp;<a href="{U_MEMBERLIST}"><img src="{T_THEME_PATH}/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a><!-- ENDIF -->&nbsp; &nbsp;<a href="{U_GROUP_CP}"><img src="{T_THEME_PATH}/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a><!-- IF S_USER_LOGGED_IN -->&nbsp; &nbsp;<a href="{U_PROFILE}"><img src="{T_THEME_PATH}/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a><!-- ENDIF --></td>
-	</tr>
-	<tr>
-		<td colspan="2"><img src="images/spacer.gif" height="10" alt="" /></td>
-	</tr>
-	<tr>
-		<td class="gensmall">&nbsp;<!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ENDIF --></td>
-		<td class="gensmall" align="right">{CURRENT_TIME}</td>
-	</tr>
-</table>
+	<div id="info"><table width="100%" cellspacing="0">
+		<tr>
+			<td><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ENDIF --></td>
+			<!-- td align="center"><-- IF S_USER_LOGGED_IN -- ><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a> | <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a> | <-- ENDIF -- ><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a></td -->
+			<td align="right">{CURRENT_TIME}<br /></td>
+		</tr>
+	</table></div>
 
-<br clear="all" />
+</div>
+
+<div id="maintable">
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html
index ec0b4834aa..757c116c85 100644
--- a/phpBB/styles/subSilver/template/posting_body.html
+++ b/phpBB/styles/subSilver/template/posting_body.html
@@ -1,7 +1,7 @@
-<!-- $Id$ -->
-
 <!-- INCLUDE overall_header.html -->
 
+<!-- $Id$ -->
+
 <script language="javascript" type="text/javascript">
 <!--
 
@@ -43,43 +43,57 @@ function checkForm()
 </script>
 <script language="javascript" type="text/javascript" src="styles/subSilver/template/editor.js"></script>
 
-<form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)" {S_FORM_ENCTYPE}>
+<form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"{S_FORM_ENCTYPE}>
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td colspan="2" align="left" valign="bottom"><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- IF TOPIC_TITLE --> :: <a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ENDIF --><!-- IF MODERATORS neq '' --><br /><b class="gensmall">{L_MODERATORS}: {MODERATORS}</b><br /><!-- ENDIF --></td>
-</tr>
-<tr>
-	<td class="nav" width="100%" align="left" valign="middle"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
-</tr>
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+	<!-- IF RULES_LINK -->
+	<tr>
+		<td class="row2"><span class="nav"><a href="">Forum Rules</a></span></td>
+	</tr>
+	<!-- ELSEIF RULES_TEXT -->
+	<tr>
+	</tr>
+	<!-- ENDIF -->
 </table>
 
+<br clear="all" />
+
+<div><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- ENDIF --></div>
+<div class="gensmall" style="float:left"><!-- IF MODERATORS --><b >{L_MODERATORS}: {MODERATORS}</b><!-- ENDIF --></div>
+<div class="gensmall" style="float:right"><!-- IF U_MCP -->[ <a href="{U_MCP}">{L_MCP}</a> ]<!-- ENDIF --></div>
+
+<br clear="all" /><br />
+
 <!-- IF S_DRAFT_LOADED -->
-<table class="tablebg" width="95%" border="0" cellspacing="1" cellpadding="4" align="center">
-<tr>
-	<th height="28" align="center">{L_INFORMATION}</th>
-</tr>
-<tr>
-	<td class="row1" align="center"><span class="gen">{L_DRAFT_LOADED}</span></td>
-</tr>
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th align="center">{L_INFORMATION}</th>
+	</tr>
+	<tr>
+		<td class="row1" align="center"><span class="gen">{L_DRAFT_LOADED}</span></td>
+	</tr>
 </table>
-<br />
+
+<br clear="all" />
 <!-- ENDIF -->
 
 <!-- IF S_SHOW_DRAFTS -->
-<table class="tablebg" width="95%" border="0" cellspacing="1" cellpadding="4" align="center">
-<tr>
-	<th colspan="3" height="28" align="center">{L_LOAD_DRAFT}</th>
-</tr>
-<tr class="row1">
-	<td colspan="3" class="gen" align="center">{L_LOAD_DRAFT_EXPLAIN}</td>
-</tr>
-<tr>
-	<th>{L_SAVE_DATE}</th>
-	<th>{L_DRAFT_TITLE}</th>
-	<th>{L_OPTIONS}</th>
-</tr>
-<!-- BEGIN draftrow -->
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th colspan="3" align="center">{L_LOAD_DRAFT}</th>
+	</tr>
+	<tr>
+		<td class="row1" colspan="3" align="center"><span class="gen">{L_LOAD_DRAFT_EXPLAIN}</span></td>
+	</tr>
+	<tr>
+		<th>{L_SAVE_DATE}</th>
+		<th>{L_DRAFT_TITLE}</th>
+		<th>{L_OPTIONS}</th>
+	</tr>
+	<!-- BEGIN draftrow -->
 
 	<!-- IF draftrow.S_ROW_COUNT is even -->
 	<tr class="row1">
@@ -91,121 +105,37 @@ function checkForm()
 		<td><b class="gen">{draftrow.DRAFT_SUBJECT}</b><!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span><!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span><!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF --></td>
 		<td align="center"><span class="gen"><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a></td>
 	</tr>
-<!-- END draftrow -->
+	<!-- END draftrow -->
 </table>
-<br />
+
+<br clear="all" />
 <!-- ENDIF -->
 
-<!-- IF S_POST_REVIEW -->
-<table class="tablebg" width="95%" border="0" cellspacing="1" cellpadding="4" align="center">
-<tr>
-	<th height="28" align="center">{L_POST_REVIEW}</th>
-</tr>
-<tr>
-	<td class="row1" align="center"><span class="gen">{L_POST_REVIEW_EXPLAIN}</span></td>
-</tr>
-<tr>
-	<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-</tr>
-<tr>
-	<td class="row1">
-		<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-		<tr>
-			<th width="22%" height="28">{L_AUTHOR}</th>
-			<th>{L_MESSAGE}</th>
-		</tr>
-		<!-- BEGIN post_review_row -->
-		<!-- IF post_review_row.S_ROW_COUNT is even -->
-		<tr class="row1">
-		<!-- ELSE -->
-		<tr class="row2">
-		<!-- ENDIF -->
-			<td rowspan="2" align="left" valign="top"><a name="{post_review_row.U_POST_ID}"></a>
-				<table width="150" cellspacing="0" cellpadding="4" border="0">
-				<tr>
-					<td align="center"><b class="postauthor">{post_review_row.POSTER_NAME}</b></td>
-				</tr>
-				<tr>
-					<td align="center">{post_review_row.KARMA_IMG}</td>
-				</tr>
-				</table>
-			</td>
-			<td width="100%" height="28">
-				<table width="100%" cellspacing="0" cellpadding="0" border="0">
-				<tr>
-					<td>&nbsp;</td>
-					<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
-					<td class="gensmall" width="100%" valign="middle">{post_review_row.POST_SUBJECT}</td>
-					<td>&nbsp;</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<!-- IF post_review_row.S_ROW_COUNT is even -->
-		<tr class="row1">
-		<!-- ELSE -->
-		<tr class="row2">
-		<!-- ENDIF -->
-			<td valign="top">
-				<table width="100%" cellspacing="0" cellpadding="5" border="0">
-				<tr>
-					<td valign="top">
-						<table width="100%" cellspacing="0" cellpadding="2">
-						<tr>
-							<td class="postbody">{post_review_row.MESSAGE}</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<table width="100%" cellspacing="0" cellpadding="0" border="0">
-						<tr valign="middle">
-							<td width="100%">&nbsp;</td>
-							<td width="10" nowrap="nowrap"><a href="{post_review_row.U_MINI_POST}" target="post_review">{post_review_row.MINI_POST_IMG}</a></td>
-							<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {post_review_row.POST_DATE}</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-		</tr>
-		<!-- END post_review_row -->
-		</table>
-	</td>
-</tr>
-</table>
-<br />
-<!-- ENDIF -->
+
+<!-- IF S_POST_REVIEW --><!-- INCLUDE posting_review.html --><!-- ENDIF -->
+
 
 <!-- IF S_UNGLOBALISE -->
-<table class="tablebg" width="95%" border="0" cellspacing="1" cellpadding="4" align="center">
-<tr>
-	<th height="28" align="center">{L_MOVE}</th>
-</tr>
-<tr>
-	<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-</tr>
-<tr> 
-	<td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br />
-	<input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" />
-	&nbsp;&nbsp; 
-	<input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" />
-	</td>
-</tr>
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th>{L_MOVE}</th>
+	</tr>
+	<tr>
+		<td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+	</tr>
+	<tr> 
+		<td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br /><input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" />&nbsp;&nbsp; <input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></td>
+	</tr>
 </table>
-<br />
+
+<br clear="all" />
 <!-- ENDIF -->
 
 <!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<th colspan="2" height="28"><b>{L_POST_A}</b></th>
+		<th colspan="2"><b>{L_POST_A}</b></th>
 	</tr>
 
 	<!-- IF ERROR -->
@@ -220,6 +150,7 @@ function checkForm()
 		<td class="row2"><input type="checkbox" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td>
 	</tr>
 	<!-- ENDIF -->
+
 	<!-- IF S_SHOW_TOPIC_ICONS -->
 	<tr>
 		<td class="row1"><b class="genmed">{L_ICON}:</b></td>
@@ -230,12 +161,14 @@ function checkForm()
 		</table></td>
 	</tr>
 	<!-- ENDIF -->
+
 	<!-- IF S_DISPLAY_USERNAME -->
 	<tr>
 		<td class="row1"><b class="genmed">{L_USERNAME}:</b></td>
 		<td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td>
 	</tr>
 	<!-- ENDIF -->
+
 	<tr>
 		<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td>
 		<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{SUBJECT}" /></td>
@@ -248,11 +181,13 @@ function checkForm()
 			<tr>
 				<td align="center"><!-- BEGIN emoticon --><a href="javascript:emoticon('{emoticon.SMILEY_CODE}')"><img src="{emoticon.SMILEY_IMG}" width="{emoticon.SMILEY_WIDTH}" height="{emoticon.SMILEY_HEIGHT}" border="0" alt="{emoticon.SMILEY_DESC}" title="{emoticon.SMILEY_DESC}" onclick="emoticon('{emoticon.SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END emoticon --></td>
 			</tr>
+
 			<!-- IF S_SHOW_EMOTICON_LINK -->
 			<tr>
 				<td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300');return false;" target="_phpbbsmilies">{L_MORE_EMOTICONS}</a></td>
 			</tr>
 			<!-- ENDIF -->
+
 		</table></td>
 		<td class="row2" valign="top"><table cellspacing="0" cellpadding="2" border="0">
 			<tr align="center" valign="middle">
@@ -316,41 +251,47 @@ function checkForm()
 				<td class="gensmall">{SMILIES_STATUS}</td>
 			</tr>
 		</table></td>
-		<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
+		<td class="row2"><table cellpadding="1">
 			<!-- IF S_HTML_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" name="disable_html"{S_HTML_CHECKED} /></td>
 				<td class="gen">{L_DISABLE_HTML}</td>
 			</tr>
 			<!-- ENDIF -->
+
 			<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
 				<td class="gen">{L_DISABLE_BBCODE}</td>
 			</tr>
 			<!-- ENDIF -->
+
 			<!-- IF S_SMILIES_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" name="disable_smilies"{S_SMILIES_CHECKED} /></td>
 				<td class="gen">{L_DISABLE_SMILIES}</td>
 			</tr>
 			<!-- ENDIF -->
+
 			<tr>
 				<td><input type="checkbox" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /></td>
 				<td class="gen">{L_DISABLE_MAGIC_URL}</td>
 			</tr>
+
 			<!-- IF S_SIG_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" name="attach_sig"{S_SIGNATURE_CHECKED} /></td>
 				<td class="gen">{L_ATTACH_SIG}</td>
 			</tr>
 			<!-- ENDIF -->
+
 			<!-- IF S_NOTIFY_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" name="notify"{S_NOTIFY_CHECKED} /></td>
 				<td class="gen">{L_NOTIFY_REPLY}</td>
 			</tr>
 			<!-- ENDIF -->
+
 			<!-- IF S_TYPE_TOGGLE -->
 			<tr>
 				<td>&nbsp;</td>
@@ -359,16 +300,18 @@ function checkForm()
 			<!-- ENDIF -->
 		</table></td>
 	</tr>
+
 	<!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
 	<tr>
 		<td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td> 
 		<td class="row2"><input class="post" type="text" name="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td>
 	</tr>
 	<!-- ENDIF -->
+
 	<!-- IF S_LOCK_TOPIC_ALLOWED or S_LOCK_POST_ALLOWED -->
 	<tr>
 		<td class="row1" valign="top"><b class="genmed">{L_MOD_OPTIONS}:</b></td>
-		<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
+		<td class="row2"><table cellspacing="0">
 			<!-- IF S_LOCK_TOPIC_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" name="lock_topic"{S_LOCK_TOPIC_CHECKED} /></td>
@@ -405,32 +348,36 @@ function checkForm()
 	</tr>
 </table>
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr>
-		<td class="nav" width="100%" align="left" valign="top"><a href="{U_INDEX}">{L_INDEX}</a> <!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
-		<td class="gensmall" align="right" valign="top" nowrap="nowrap">{S_TIMEZONE}</td>
-	</tr>
-</table></form>
-
-<table width="95%" cellspacing="2" border="0" align="center">
-	<tr>
-		<td valign="top" align="right"><!-- INCLUDE jumpbox.html --></td>
-	</tr>
-</table>
+<br clear="all" />
 
 <!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
 
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+</table>
+
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 <br clear="all" />
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<td class="cat"><span class="cattitle">{L_WHO_IS_ONLINE}</span></td>
 	</tr>
-	<tr class="row1">
-		<td class="gensmall" align="left">{LOGGED_IN_USER_LIST}</td>
+	<tr>
+		<td class="row1"><span class="gensmall">{LOGGED_IN_USER_LIST}</span></td>
 	</tr>
 </table>
 <!-- ENDIF -->
 
+<br clear="all" />
+
+<table width="100%" cellspacing="1">
+	<tr>
+		<td align="right"><!-- INCLUDE jumpbox.html --></td>
+	</tr>
+</table>
+
+
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/posting_preview.html b/phpBB/styles/subSilver/template/posting_preview.html
index a9003fc4f4..ac464a278d 100644
--- a/phpBB/styles/subSilver/template/posting_preview.html
+++ b/phpBB/styles/subSilver/template/posting_preview.html
@@ -1,8 +1,8 @@
 <!-- $Id$ -->
  
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
-		<th height="28">{L_PREVIEW}</th>
+		<th>{L_PREVIEW}</th>
 	</tr>
 	<tr> 
 		<td class="row1">{MINI_POST_IMG}<span class="postdetails">{L_POSTED}: {POST_DATE} &nbsp;&nbsp;&nbsp; {L_POST_SUBJECT}: {PREVIEW_SUBJECT}</span></td>
@@ -41,7 +41,7 @@
 		</table></td>
 	</tr>
 	<tr>
-		<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+		<td class="spacer"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
 	</tr>
 </table>
 
diff --git a/phpBB/styles/subSilver/template/posting_topic_review.html b/phpBB/styles/subSilver/template/posting_topic_review.html
index 37966e0f88..421f2b45e3 100644
--- a/phpBB/styles/subSilver/template/posting_topic_review.html
+++ b/phpBB/styles/subSilver/template/posting_topic_review.html
@@ -53,81 +53,76 @@ function addquote(post_id, username) {
 //-->
 </script>
 
-<table class="tablebg" width="95%" border="0" cellpadding="3" cellspacing="1" align="center">
-<tr>
-	<th height="28" align="center">{L_TOPIC_REVIEW} - {TOPIC_TITLE}</th>
-</tr>
-<tr>
-	<td class="row1"><div style="overflow: auto; width: 100%; height: 300px; border: 1px;">
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th align="center">{L_TOPIC_REVIEW} - {TOPIC_TITLE}</th>
+	</tr>
+	<tr>
+		<td class="row1"><div style="overflow: auto; width: 100%; height: 300px;">
 
-		<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-		<tr>
-			<th width="22%" height="28">{L_AUTHOR}</th>
-			<th>{L_MESSAGE}</th>
-		</tr>
-		<!-- BEGIN topic_review_row -->
-		<!-- IF topic_review_row.S_ROW_COUNT is even -->
-		<tr class="row1">
-		<!-- ELSE -->
-		<tr class="row2">
-		<!-- ENDIF -->
-			<td rowspan="2" align="left" valign="top"><a name="{topic_review_row.U_POST_ID}"></a>
-				<table width="150" cellspacing="0" cellpadding="4" border="0">
+			<table class="tablebg" width="100%" cellspacing="1">
 				<tr>
-					<td align="center"><b class="postauthor">{topic_review_row.POSTER_NAME}</b></td>
+					<th width="22%">{L_AUTHOR}</th>
+					<th>{L_MESSAGE}</th>
 				</tr>
-				<tr>
-					<td align="center">{topic_review_row.KARMA_IMG}</td>
-				</tr>
-				</table>
-			</td>
-			<td width="100%" height="28">
-				<table width="100%" cellspacing="0" cellpadding="0" border="0">
-				<tr>
-					<td>&nbsp;</td>
-					<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
-					<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>
-					<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.U_QUOTE --><a href="{topic_review_row.U_QUOTE}">{QUOTE_IMG}</a><!-- ENDIF --></td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<!-- IF topic_review_row.S_ROW_COUNT is even -->
-		<tr class="row1">
-		<!-- ELSE -->
-		<tr class="row2">
-		<!-- ENDIF -->
-			<td valign="top">
-				<table width="100%" cellspacing="0" cellpadding="5" border="0">
-				<tr>
-					<td valign="top">
-						<table width="100%" cellspacing="0" cellpadding="2">
+				<!-- BEGIN topic_review_row -->
+
+				<!-- IF topic_review_row.S_ROW_COUNT is even -->
+				<tr class="row1">
+				<!-- ELSE -->
+				<tr class="row2">
+				<!-- ENDIF -->
+
+					<td rowspan="2" align="left" valign="top"><a name="{topic_review_row.U_POST_ID}"></a><table width="150" cellspacing="0">
 						<tr>
-							<td><div id="message_{topic_review_row.U_POST_ID}" class="postbody">{topic_review_row.MESSAGE}</div></td>
+							<td align="center"><b class="postauthor">{topic_review_row.POSTER_NAME}</b></td>
 						</tr>
-						</table>
-					</td>
+						<tr>
+							<td align="center">{topic_review_row.KARMA_IMG}</td>
+						</tr>
+					</table></td>
+					<td width="100%"><table width="100%" cellspacing="0">
+						<tr>
+							<td>&nbsp;</td>
+							<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
+							<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>
+							<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.U_QUOTE --><a href="{topic_review_row.U_QUOTE}">{QUOTE_IMG}</a><!-- ENDIF --></td>
+						</tr>
+					</table></td>
+				</tr>
+
+				<!-- IF topic_review_row.S_ROW_COUNT is even -->
+				<tr class="row1">
+				<!-- ELSE -->
+				<tr class="row2">
+				<!-- ENDIF -->
+
+					<td valign="top"><table width="100%" cellspacing="0">
+						<tr>
+							<td valign="top"><table width="100%" cellspacing="0" cellpadding="2">
+								<tr>
+									<td><div id="message_{topic_review_row.U_POST_ID}" class="postbody">{topic_review_row.MESSAGE}</div></td>
+								</tr>
+							</table></td>
+						</tr>
+						<tr>
+							<td><table width="100%" cellspacing="0">
+								<tr valign="middle">
+									<td width="100%">&nbsp;</td>
+									<td width="10" nowrap="nowrap"><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a></td>
+									<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {topic_review_row.POST_DATE}</td>
+								</tr>
+							</table></td>
+						</tr>
+					</table></td>
 				</tr>
 				<tr>
-					<td>
-						<table width="100%" cellspacing="0" cellpadding="0" border="0">
-						<tr valign="middle">
-							<td width="100%">&nbsp;</td>
-							<td width="10" nowrap="nowrap"><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a></td>
-							<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {topic_review_row.POST_DATE}</td>
-						</tr>
-						</table>
-					</td>
+					<td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
 				</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-		</tr>
-		<!-- END topic_review_row -->
-		</table>
-	</div></td>
-</tr>
+				<!-- END topic_review_row -->
+			</table>
+		</div></td>
+	</tr>
 </table>
 
+<br clear="all" />
diff --git a/phpBB/styles/subSilver/template/search_body.html b/phpBB/styles/subSilver/template/search_body.html
index ce9033afdb..441ec21eb0 100644
--- a/phpBB/styles/subSilver/template/search_body.html
+++ b/phpBB/styles/subSilver/template/search_body.html
@@ -1,12 +1,14 @@
 <!-- INCLUDE overall_header.html -->
 
-<form method="post" action="{S_SEARCH_ACTION}"><table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr> 
-		<td align="left"><a class="nav" href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<br clear="all" />
+
+<form method="post" action="{S_SEARCH_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
 		<th colspan="4">{L_SEARCH_QUERY}</th>
 	</tr>
@@ -46,11 +48,11 @@
 	<tr> 
 		<td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 	</tr>
-</table>
+</table></form>
 
 <br clear="all" />
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
 		<th colspan="2">{L_RECENT_SEARCHES}</th>
 	</tr>
@@ -70,15 +72,19 @@
 	<!-- END recentsearch -->
 </table>
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr> 
-		<td align="right" valign="middle"><span class="gensmall">{S_TIMEZONE}</span></td>
-	</tr>
-</table></form>
+<br clear="all" />
 
-<table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td align="right" valign="top"><!-- INCLUDE jumpbox.html --></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
+	<tr>
+		<td align="right"><!-- INCLUDE jumpbox.html --></td>
 	</tr>
 </table>
 
diff --git a/phpBB/styles/subSilver/template/ucp_attachments.html b/phpBB/styles/subSilver/template/ucp_attachments.html
index f6cabb4972..94d6c3be15 100644
--- a/phpBB/styles/subSilver/template/ucp_attachments.html
+++ b/phpBB/styles/subSilver/template/ucp_attachments.html
@@ -53,6 +53,16 @@
 	</tr>
 </table>
 
+<br clear="all" />
+
+<table width="100%" cellspacing="2" border="0" align="center">
+	<tr>
+		<td width="20%">&nbsp;</td>
+		<td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td>
+		<td align="right" valign="middle"><b class="gensmall"><a href="javascript:marklist('ucp', true);">{L_MARK_ALL}</a> :: <a  href="javascript:marklist('ucp', false);">{L_UNMARK_ALL}</a></b><!-- IF PAGINATION --><br /><span class="nav">{PAGINATION}</span><!-- ENDIF --></td> 
+	</tr>
+</table>
+
 <!-- ELSE -->
 
 <table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="right">
diff --git a/phpBB/styles/subSilver/template/ucp_footer.html b/phpBB/styles/subSilver/template/ucp_footer.html
index f9d794855d..6f9a92d9ff 100644
--- a/phpBB/styles/subSilver/template/ucp_footer.html
+++ b/phpBB/styles/subSilver/template/ucp_footer.html
@@ -1,23 +1,9 @@
 
-<br clear="all" />
-
-<!-- IF S_DISPLAY_MARK_ALL or S_DISPLAY_PAGINATION -->
-<table width="100%" cellspacing="2" border="0" align="center">
-	<tr>
-<!-- IF S_DISPLAY_PAGINATION -->
-		<td width="20%">&nbsp;</td>
-		<td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td>
-<!-- ENDIF -->
-		<td align="right" valign="middle"><!-- IF S_DISPLAY_MARK_ALL --><b class="gensmall"><a href="javascript:marklist('ucp', true);">{L_MARK_ALL}</a> :: <a  href="javascript:marklist('ucp', false);">{L_UNMARK_ALL}</a></b><br /><!-- ENDIF --><!-- IF S_DISPLAY_PAGINATION --><span class="nav">{PAGINATION}</span><!-- ENDIF --></td> 
-	</tr>
-</table>
-<!-- ENDIF -->
-
 </form>
 
 <table width="100%" cellspacing="2" border="0" align="center">
 	<tr>
-		<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><br /><!-- INCLUDE jumpbox.html --></td> 
+		<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><!-- IF S_JUMPBOX --><br /><br /><!-- INCLUDE jumpbox.html --><!-- ENDIF --></td> 
 	</tr>
 </table>
 
@@ -25,5 +11,4 @@
 	</tr>
 </table>
 
-
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/ucp_main.html b/phpBB/styles/subSilver/template/ucp_main.html
deleted file mode 100644
index a21103e292..0000000000
--- a/phpBB/styles/subSilver/template/ucp_main.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<!-- IF not S_DISPLAY_DRAFTS -->
-<table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="right">
-	<tr>
-		<!-- IF S_DISPLAY_WATCHED -->
-		<th colspan="4" height="28">
-		<!-- ELSE -->
-		<th colspan="3" height="28">
-		<!-- ENDIF -->
-		{L_UCP}</th>
-	</tr>
-
-	<tr class="row1">
-		<!-- IF S_DISPLAY_WATCHED --><td class="genmed" colspan="4" align="center"><!-- ELSE --><td class="genmed" colspan="3" align="center"><!-- ENDIF -->{L_UCP_WELCOME}</td>
-	</tr>
-
-
-	<!-- IF S_DISPLAY_FRONT -->
-	<tr>
-		<th colspan="3" height="28">{L_IMPORTANT_NEWS}</th>
-	</tr>
-
-	<!-- BEGIN topicrow -->
-	<!-- IF topicrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
-
-		<td width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-		<td width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
-		<td class="postdetails" align="center" valign="middle" nowrap="nowrap">{topicrow.LAST_POST_TIME}<br />{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}</td>
-	</tr>
-	<!-- END topicrow -->
-
-	<tr>
-		<th colspan="3" height="28">{L_YOUR_DETAILS}</th>
-	</tr>
-	<tr class="row1">
-		<td class="genmed" colspan="3"><table width="100%" cellspacing="1" cellpadding="2" border="0">
-			<tr> 
-				<td class="gen" align="right" valign="middle" nowrap="nowrap">{L_JOINED}: </td>
-				<td width="100%"><b class="gen">{JOINED}</b></td>
-			</tr>
-			<tr> 
-				<td class="gen" valign="top" align="right" nowrap="nowrap">{L_TOTAL_POSTS}: </td>
-				<td valign="top"><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>
-			</tr>
-		</table></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="3" height="28">&nbsp;</td>
-	</tr>
-	<!-- ENDIF -->
-
-
-	<!-- IF S_DISPLAY_WATCHED -->
-	<tr>
-		<th colspan="4" height="28">{L_WATCHED_FORUMS}</th>
-	</tr>
-
-	<!-- BEGIN forumrow -->
-	<!-- IF forumrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
-		<td width="20" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
-		<td width="100%" class="topictitle"><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></span></td>
-		<td class="gensmall" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POST_AUTHOR --><a href="{forumrow.U_LAST_POST_AUTHOR}">{forumrow.LAST_POST_AUTHOR}</a><!-- ELSE -->{forumrow.LAST_POST_AUTHOR}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td>
-		<td> <input type="checkbox" name="f[{forumrow.FORUM_ID}]" /> </td>
-	</tr>
-	<!-- BEGINELSE -->
-	<tr class="row1">
-		<td colspan="4" height="25" align="center"><b class="genmed">{L_NO_WATCHED_FORUMS}</b></td>
-	</tr>
-	<!-- END forumrow -->
-	<tr>
-		<th colspan="4" height="28">{L_WATCHED_TOPICS}</th>
-	</tr>
-	<!-- BEGIN topicrow -->
-	<!-- IF topicrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
-		<td width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-		<td width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
-		<td class="postdetails" align="center" valign="middle" nowrap="nowrap">{topicrow.LAST_POST_TIME}<br />{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}</td>
-		<td> <input type="checkbox" name="t[{topicrow.TOPIC_ID}]" /> </td>
-	</tr>
-	<!-- BEGINELSE -->
-	<tr class="row1">
-		<td colspan="4" height="25" align="center"><b class="genmed">{L_NO_WATCHED_TOPICS}</b></td>
-	</tr>
-	<!-- END topicrow -->
-	<tr>
-		<td class="cat" colspan="4" height="28" align="right"><input class="btnlite" type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" />&nbsp;</td>
-	</tr>
-	<!-- ENDIF -->
-
-</table>
-
-<!-- ELSE -->
-<table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="right">
-	<tr>
-		<th colspan="5" height="28">{L_UCP}</th>
-	</tr>
-	<tr>
-		<td colspan="5" class="row3" align="center"><span class="gensmall">{L_DRAFTS_EXPLAIN}</span></td>
-	</tr>
-
-	<!-- IF not S_EDIT_DRAFT -->
-
-		<!-- IF S_DRAFT_ROWS -->
-		<tr>
-			<th>{L_SAVE_DATE}</th>
-			<th>{L_DRAFT_TITLE}</th>
-			<th>{L_TOPIC}</th>
-			<th>{L_OPTIONS}</th>
-			<th>{L_DELETE}</th>
-		</tr>
-		<!-- ENDIF -->
-		<!-- BEGIN draftrow -->
-		<!-- IF draftrow.S_ROW_COUNT is even -->
-		<tr class="row1">
-		<!-- ELSE -->
-		<tr class="row2">
-		<!-- ENDIF -->
-			<td class="postdetails">{draftrow.DATE}</td>
-			<td><b class="topictitle">{draftrow.TITLE}</b></td>
-			<td class="topictitle"><!-- IF draftrow.S_POST_TOPIC -->{L_CURRENT_TOPIC}<!-- ELSEIF draftrow.TOPIC_TITLE --><a href="{draftrow.U_VIEW_TOPIC}" target="_blank">{draftrow.TOPIC_TITLE}</a><!-- ELSE --><i>{L_NEW_OR_DELETED_TOPIC}</i><!-- ENDIF --></td>
-			<td align="center"><span class="gen"><!-- IF draftrow.S_FROM_POST --><a href="">{L_INSERT}</a><br /><!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></td>
-			<td align="center"><input type="checkbox" name="d[{draftrow.DRAFT_ID}]" /></td>
-		</tr>
-		<!-- BEGINELSE -->
-		<tr class="row1">
-			<td colspan="5" height="25" align="center"><b class="genmed">{L_NO_SAVED_DRAFTS}</b></td>
-		</tr>
-		<!-- END draftrow -->
-		<tr>
-			<td class="cat" colspan="5" height="28" align="right"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" />&nbsp;</td>
-		</tr>
-
-	<!-- ELSEIF S_EDIT_DRAFT -->
-		<!-- IF ERROR -->
-		<tr>
-			<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
-		</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td class="row1" width="22%"><b class="genmed">{L_DRAFT_TITLE}:</b></td>
-			<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="draft_title" size="45" maxlength="60" tabindex="1" value="{DRAFT_TITLE}" /></td>
-		</tr>
-		<tr>
-			<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td>
-			<td class="row2"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{POST_SUBJECT}" /></td>
-		</tr>
-		<tr> 
-			<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}: </b><br /><span class="gensmall">{L_EDIT_DRAFT_EXPLAIN}</span></td>
-			<td class="row2"><table cellspacing="0" cellpadding="2" border="0">
-				<tr align="center" valign="middle">
-					<td><input class="btnbbcode" type="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" onmouseover="helpline('b')" /></td>
-					<td><input class="btnbbcode" type="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" onmouseover="helpline('i')" /></td>
-					<td><input class="btnbbcode" type="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" onmouseover="helpline('u')" /></td>
-					<td><input class="btnbbcode" type="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" /></td>
-					<td><input class="btnbbcode" type="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" /></td>
-					<td><input class="btnbbcode" type="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" /></td>
-					<td><input class="btnbbcode" type="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" /></td>
-					<td><input class="btnbbcode" type="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onclick="bbstyle(14)" onmouseover="helpline('p')" /></td>
-					<td><input class="btnbbcode" type="button" accesskey="w" name="addbbcode18" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(18)" onmouseover="helpline('w')" /></td>
-				</tr>
-				<tr>
-					<td colspan="9"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-						<tr>
-							<td><span class="genmed"> &nbsp;{L_FONT_SIZE}:</span> <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')">
-								<option value="7">{L_FONT_TINY}</option>
-								<option value="9">{L_FONT_SMALL}</option>
-								<option value="12" selected="selected">{L_FONT_NORMAL}</option>
-								<option value="18">{L_FONT_LARGE}</option>
-								<option  value="24">{L_FONT_HUGE}</option>
-							</select></td>
-							<td class="gensmall" nowrap="nowrap" align="right"><a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></td>
-						</tr>
-					</table></td>
-				</tr>
-				<tr>
-					<td colspan="9"><input class="helpline" type="text" name="helpbox" size="45" maxlength="100" value="{L_STYLES_TIP}" /></td>
-				</tr>
-				<tr>
-					<td colspan="9"><textarea class="post" name="message" rows="10" cols="76" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{POST_MESSAGE}</textarea></td>
-				</tr>
-			</table></td>
-		</tr>
-		<tr class="row3">
-			<td colspan="9" align="left" class="topictitle"><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></td>
-		</tr>
-		<tr>
-			<td class="cat" colspan="2" height="28" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-		</tr>
-	<!-- ENDIF -->
-</table>
-<!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subSilver/template/ucp_main_subscribed.html b/phpBB/styles/subSilver/template/ucp_main_subscribed.html
index 65048b0761..1b7057e6ab 100644
--- a/phpBB/styles/subSilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/subSilver/template/ucp_main_subscribed.html
@@ -58,4 +58,10 @@
 	</tr>
 </table>
 
+<table width="80%" cellspacing="2" border="0" align="right">
+	<tr>
+		<td align="right" valign="middle"><b class="gensmall"><a href="javascript:marklist('ucp', true);">{L_MARK_ALL}</a> :: <a  href="javascript:marklist('ucp', false);">{L_UNMARK_ALL}</a></b></td> 
+	</tr>
+</table>
+
 <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html
index cf810801fe..81d5b93d1a 100644
--- a/phpBB/styles/subSilver/template/viewforum_body.html
+++ b/phpBB/styles/subSilver/template/viewforum_body.html
@@ -1,57 +1,67 @@
 <!-- INCLUDE overall_header.html -->
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- IF S_IS_POSTABLE and MODERATORS --><br /><b class="gensmall">{L_MODERATORS}: {MODERATORS}</b><!-- ENDIF --></td>
-		<td class="gensmall" align="right" valign="bottom"><!-- IF S_IS_POSTABLE and U_MCP -->[ <a href="{U_MCP}">{L_MCP}</a> ]<!-- ENDIF --></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
-	<!-- IF TOTAL_TOPICS -->
+	<!-- IF RULES_LINK -->
+	<tr>
+		<td class="row2"><span class="nav"><a href="">Forum Rules</a></span></td>
+	</tr>
+	<!-- ELSEIF RULES_TEXT -->
 	<tr>
-		<td colspan="2"><table width="100%" cellspacing="0" border="0">
-			<tr>
-				<td class="nav" valign="middle" nowrap="nowrap">{PAGE_NUMBER}</td>
-				<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]&nbsp;</td>
-				<td class="gensmall" width="100%" align="right" nowrap="nowrap"><b>{PAGINATION}</b></td>
-			</tr>
-		</table></td>
 	</tr>
 	<!-- ENDIF -->
 </table>
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
+<br clear="all" />
+
+<div><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a></div>
+<div class="gensmall" style="float:left"><!-- IF S_IS_POSTABLE and MODERATORS --><b >{L_MODERATORS}: {MODERATORS}</b><!-- ENDIF --></div>
+<div class="gensmall" style="float:right"><!-- IF S_IS_POSTABLE and U_MCP -->[ <a href="{U_MCP}">{L_MCP}</a> ]<!-- ENDIF --></div>
+
+<br clear="all" /><br />
+
+<!-- IF S_IS_POSTABLE or TOTAL_TOPICS -->
+<table width="100%" cellspacing="1">
 	<tr>
 		<!-- IF S_IS_POSTABLE -->
-		<td width="10" align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td>
+		<td align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td>
+		<!-- ENDIF -->
+		<!-- IF TOTAL_TOPICS -->
+		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
+		<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]&nbsp;</td>
+		<td class="gensmall" width="100%" align="right" nowrap="nowrap"><b>{PAGINATION}</b></td>
 		<!-- ENDIF -->
-		<td class="nav" width="100%" valign="middle"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
 	</tr>
 </table>
+<!-- ENDIF -->
 
 <!-- IF S_HAS_SUBFORUM -->
 <!-- INCLUDE viewforum_subforum.html -->
 <!-- ENDIF -->
 
 <!-- IF S_IS_POSTABLE -->
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="post" action="{S_TOPIC_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<!-- IF S_TOPIC_ICONS --><td class="cat" colspan="7"><!-- ELSE --><td class="cat" colspan="6"><!-- ENDIF --><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td class="nav" valign="middle">&nbsp;<!-- IF S_WATCH_FORUM -->{S_WATCH_FORUM}<!-- ENDIF --></td>
-				<td class="nav" align="right" valign="middle"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a>&nbsp;</td>
+		<!-- IF S_TOPIC_ICONS --><td class="cat" colspan="7"><!-- ELSE --><td class="cat" colspan="6"><!-- ENDIF --><table width="100%" cellspacing="0">
+			<tr class="nav">
+				<td valign="middle">&nbsp;<!-- IF S_WATCH_FORUM -->{S_WATCH_FORUM}<!-- ENDIF --></td>
+				<td align="right" valign="middle"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a>&nbsp;</td>
 			</tr>
 		</table></td>
 	</tr>
 
 	<tr>
 		<!-- IF S_TOPIC_ICONS -->
-		<th colspan="3" height="28" align="center" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
+		<th colspan="3">&nbsp;{L_TOPICS}&nbsp;</th>
 		<!-- ELSE -->
-		<th colspan="2" height="28" align="center" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
+		<th colspan="2">&nbsp;{L_TOPICS}&nbsp;</th>
 		<!-- ENDIF -->
-		<th width="100" align="center" nowrap="nowrap">&nbsp;{L_AUTHOR}&nbsp;</th>
-		<th width="50" align="center" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
-		<th width="50" align="center" nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th>
-		<th align="center" nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
+		<th width="100">&nbsp;{L_AUTHOR}&nbsp;</th>
+		<th width="50">&nbsp;{L_REPLIES}&nbsp;</th>
+		<th width="50">&nbsp;{L_VIEWS}&nbsp;</th>
+		<th>&nbsp;{L_LAST_POST}&nbsp;</th>
 	</tr>
 
 	<!-- BEGIN topicrow -->
@@ -99,44 +109,44 @@
 	</tr>
 	<!-- END topicrow -->
 
-	<tr align="center"><form method="post" action="{S_TOPIC_ACTION}">
-		<!-- IF S_TOPIC_ICONS --><td class="cat" colspan="8" height="28"><!-- ELSE --><td class="cat" colspan="7"  height="28"><!-- ENDIF --><span class="gensmall">{L_DISPLAY_TOPICS}:</span>&nbsp;{S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
-	</form></tr>
+	<tr align="center">
+		<!-- IF S_TOPIC_ICONS --><td class="cat" colspan="8"><!-- ELSE --><td class="cat" colspan="7" ><!-- ENDIF --><span class="gensmall">{L_DISPLAY_TOPICS}:</span>&nbsp;{S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
+	</tr>
+</table></form>
+
+<table width="100%" cellspacing="1">
+	<tr>
+		<td align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td>
+		<td class="nav" nowrap="nowrap">&nbsp;{PAGE_NUMBER}</td>
+		<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]</td>
+		<td class="nav" width="100%" align="right" nowrap="nowrap">{PAGINATION}</td>
+	</tr>
 </table>
 
-<table width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td align="left" width="50" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td>
-		<td class="nav" width="100%" align="left" valign="middle">&nbsp; <a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
-		<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span></td>
-	</tr>
-	<tr>
-		<td colspan="3"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td class="nav" nowrap="nowrap">{PAGE_NUMBER}</td>
-				<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]</td>
-				<td class="nav" width="100%" align="right" valign="bottom" nowrap="nowrap">{PAGINATION}</td>
-			</tr>
-		</table></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 <br clear="all" />
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<td class="cat"><span class="cattitle">{L_WHO_IS_ONLINE}</span></td>
 	</tr>
-	<tr class="row1">
-		<td class="gensmall" align="left">{LOGGED_IN_USER_LIST}</td>
+	<tr>
+		<td class="row1"><span class="gensmall">{LOGGED_IN_USER_LIST}</span></td>
 	</tr>
 </table>
 <!-- ENDIF -->
 
 <br clear="all" />
 
-<table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
+<table width="100%" cellspacing="0">
 	<tr>
 		<td align="left" valign="top"><table cellspacing="3" cellpadding="0" border="0">
 			<tr>
@@ -171,11 +181,11 @@
 	</tr>
 </table>
 
-<br clear="all" />
-
 <!-- ENDIF -->
 
-<table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
+<br clear="all" />
+
+<table width="100%" cellspacing="0">
 	<tr>
 		<td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td>
 		<td align="right"><!-- INCLUDE jumpbox.html --></td>
diff --git a/phpBB/styles/subSilver/template/viewforum_subforum.html b/phpBB/styles/subSilver/template/viewforum_subforum.html
index d74c196ccd..dc3ce015bc 100644
--- a/phpBB/styles/subSilver/template/viewforum_subforum.html
+++ b/phpBB/styles/subSilver/template/viewforum_subforum.html
@@ -1,6 +1,7 @@
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<th colspan="2" height="28" nowrap="nowrap">&nbsp;{L_FORUM}&nbsp;</th>
+		<th colspan="2" nowrap="nowrap">&nbsp;{L_FORUM}&nbsp;</th>
 		<th width="50" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
 		<th width="50" nowrap="nowrap">&nbsp;{L_POSTS}&nbsp;</th>
 		<th nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
@@ -8,7 +9,7 @@
 	<!-- BEGIN forumrow -->
 	<!-- IF forumrow.S_IS_CAT -->
 	<tr>
-		<td class="cat" colspan="2" height="28"><a class="cattitle"  href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></td>
+		<td class="cat" colspan="2"><a class="cattitle" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></td>
 		<td class="catdiv" colspan="3" align="right">&nbsp;</td>
 	</tr>
 	<!-- ELSEIF forumrow.S_IS_LINK -->
diff --git a/phpBB/styles/subSilver/template/viewonline_body.html b/phpBB/styles/subSilver/template/viewonline_body.html
index 985c18f1de..c83efc6b34 100644
--- a/phpBB/styles/subSilver/template/viewonline_body.html
+++ b/phpBB/styles/subSilver/template/viewonline_body.html
@@ -1,12 +1,14 @@
 <!-- INCLUDE overall_header.html -->
- 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr> 
-		<td align="left"><span class="nav"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
+
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-<table class="tablebg" width="95%" cellpadding="2" cellspacing="1" border="0" align="center">
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
 		<th width="35%" height="28"><a class="th" href="{U_SORT_USERNAME}">{L_USERNAME}</a></th>
 		<th width="25%"><a class="th" href="{U_SORT_UPDATED}">{L_LAST_UPDATED}</a></th>
@@ -26,7 +28,7 @@
 		<td class="gen" width="40%">&nbsp;<a href="{reg_user_row.U_FORUM_LOCATION}">{reg_user_row.FORUM_LOCATION}</a>&nbsp;</td>
 	</tr>
 	<!-- END reg_user_row -->
-	<!-- IF LEGEND neq '' -->
+	<!-- IF LEGEND -->
 	<tr>
 		<td colspan="3" class="row1"><b class="gensmall">{L_LEGEND} :: {LEGEND}</b></td>
 	</tr>
@@ -47,19 +49,18 @@
 	<!-- END guest_user_row -->
 </table>
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr> 
-		<td align="left" valign="top"><span class="gensmall">{L_ONLINE_EXPLAIN}</span></td>
-		<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
+<div class="gensmall" align="right">{L_ONLINE_EXPLAIN}</div>
+
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
 <br clear="all" />
 
-<table width="95%" cellspacing="2" border="0" align="center">
-	<tr> 
-		<td valign="top" align="right"><!-- INCLUDE jumpbox.html --></td>
-	</tr>
-</table>
+<div align="right"><!-- INCLUDE jumpbox.html --></div>
 
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html
index 8952795365..e14546a263 100644
--- a/phpBB/styles/subSilver/template/viewtopic_body.html
+++ b/phpBB/styles/subSilver/template/viewtopic_body.html
@@ -1,32 +1,43 @@
-<!-- $Id$ -->
 <!-- INCLUDE overall_header.html -->
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
+<!-- $Id$ -->
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td align="left" valign="bottom"><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- IF MODERATORS --><br /><span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span><!-- ENDIF --></td>
-		<td class="gensmall" align="right" valign="bottom"><!-- IF U_MCP -->[ <a href="{U_MCP}">{L_MCP}</a> ]<!-- ENDIF --></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
+	<!-- IF RULES_LINK -->
 	<tr>
-		<td colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td class="nav" nowrap="nowrap">{PAGE_NUMBER}</td>
-				<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_POSTS} ]</td>
-				<td class="nav" width="100%" align="right" valign="bottom" nowrap="nowrap">{PAGINATION}</td>
-			</tr>
-		</table></td>
+		<td class="row2"><span class="nav">&bull; <a href="">Forum Rules</a></span></td>
 	</tr>
+	<!-- ELSEIF RULES_TEXT -->
+	<tr>
+	</tr>
+	<!-- ENDIF -->
 </table>
 
-<table width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<br clear="all" />
+
+<div><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></div>
+<div class="gensmall" style="float:left"><!-- IF MODERATORS --><b >{L_MODERATORS}: {MODERATORS}</b><!-- ENDIF --></div>
+<div class="gensmall" style="float:right"><!-- IF U_MCP -->[ <a href="{U_MCP}">{L_MCP}</a> ]<!-- ENDIF --></div>
+
+<br clear="all" /><br />
+
+<table width="100%" cellspacing="1">
 	<tr>
 		<td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a>&nbsp;<a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></td>
-		<td class="nav" width="100%" align="left" valign="middle">&nbsp; <a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
+		<!-- IF TOTAL_POSTS -->
+		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
+		<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_POSTS} ]&nbsp;</td>
+		<td class="gensmall" width="100%" align="right" nowrap="nowrap"><b>{PAGINATION}</b></td>
+		<!-- ENDIF -->
 	</tr>
 </table>
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="2" border="0" align="center">
-	<tr align="right">
-		<td class="cat" colspan="2" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="cat" colspan="2"><table width="100%" cellspacing="0">
 			<tr>
 				<td class="nav" nowrap="nowrap">&nbsp;
 				<!-- IF S_WATCH_TOPIC -->{S_WATCH_TOPIC}<!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
@@ -104,12 +115,9 @@
 		<td class="gensmall" colspan="2" height="25" align="center">{postrow.L_IGNORE_POST}</td>
 	<!-- ELSE -->
 		<td align="center" valign="middle"><a name="{postrow.U_POST_ID}"></a><b class="postauthor">{postrow.POSTER_NAME}</b></td>
-		<td width="100%" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+		<td width="100%" height="25"><table width="100%" cellspacing="0">
 			<tr>
-				<td>{postrow.POST_ICON_IMG}&nbsp;</td>
-				<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
-				<td class="gensmall" width="100%" valign="middle">{postrow.POST_SUBJECT}</td>
-				<td valign="top" nowrap="nowrap">&nbsp;<!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_DELETE --><a href="{postrow.U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_IP --><a href="{postrow.U_IP}">{IP_IMG}</a> <!-- ENDIF --></td>
+				<td class="gensmall"><div style="float:left">&nbsp;<b>{L_POST_SUBJECT}:</b> {postrow.POST_SUBJECT}</div><div style="float:right"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><b>{L_POSTED}:</b> {postrow.POST_DATE}&nbsp;</div></td>
 			</tr>
 		</table></td>
 	</tr>
@@ -121,79 +129,85 @@
 	<!-- ENDIF -->
 		<td valign="top">
 			
-			<table width="150" cellspacing="0" cellpadding="4" border="0" align="center">
+			<div align="center">
+			
+			<table cellspacing="4" align="center">
 				<tr>
-					<td align="center">{postrow.KARMA_IMG}</td>
+					<td>{postrow.KARMA_IMG}</td>
 				</tr>
 				<!-- IF postrow.ONLINE_IMG -->
 				<tr>
-					<td align="center">{postrow.ONLINE_IMG}</td>
+					<td>{postrow.ONLINE_IMG}</td>
 				</tr>
 				<!-- ENDIF -->
 				<!-- IF postrow.POSTER_RANK -->
 				<tr>
-					<td class="postdetails" align="center">{postrow.POSTER_RANK}</td>
+					<td class="postdetails">{postrow.POSTER_RANK}</td>
 				</tr>
 				<!-- ENDIF -->
 				<!-- IF postrow.RANK_IMAGE -->
 				<tr>
-					<td align="center">{postrow.RANK_IMAGE}</td>
+					<td>{postrow.RANK_IMAGE}</td>
 				</tr>
 				<!-- ENDIF -->
 				<!-- IF postrow.POSTER_AVATAR -->
 				<tr>
-					<td align="center">{postrow.POSTER_AVATAR}</td>
+					<td>{postrow.POSTER_AVATAR}</td>
 				</tr>
 				<!-- ENDIF -->
 			</table>
 
 			<span class="postdetails">
-			<!-- IF postrow.POSTER_POSTS --><br />{L_JOINED}: {postrow.POSTER_JOINED}<!-- ENDIF -->
-			<!-- IF postrow.POSTER_POSTS --><br />{L_POSTS}: {postrow.POSTER_POSTS}<!-- ENDIF -->
-			<!-- IF postrow.POSTER_FROM --><br />{L_LOCATION}: {postrow.POSTER_FROM}<!-- ENDIF -->
+			<!-- IF postrow.POSTER_POSTS --><br /><b>{L_JOINED}:</b> {postrow.POSTER_JOINED}<!-- ENDIF -->
+			<!-- IF postrow.POSTER_POSTS --><br /><b>{L_POSTS}:</b> {postrow.POSTER_POSTS}<!-- ENDIF -->
+			<!-- IF postrow.POSTER_FROM --><br /><b>{L_LOCATION}:</b> {postrow.POSTER_FROM}<!-- ENDIF -->
 			</span>
 
-			<br />
+			</div>
 		</td>
-		<td height="100%"><table height="100%" width="100%" cellspacing="5" cellpadding="0" border="0">
+		<td valign="top"><table width="100%" cellspacing="5">
 			<tr>
-				<td valign="top">
+				<td>
+
+					<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
+					<table width="100%" cellspacing="0">
+						<tr>
+							<td class="gensmall"><!-- IF postrow.S_POST_UNAPPROVED --><b style="color:green">&#187 <a style="color:green" href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></b> <!-- ENDIF --> <!-- IF postrow.S_POST_REPORTED --><b style="color:red">&#187 <a style="color:red" href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></b><!-- ENDIF --></td>
+						</tr>
+					</table>
+
+					<br clear="all" />
+					<!-- ENDIF -->
+
 					<span class="postbody">{postrow.MESSAGE}</span>
+
 					<!-- IF postrow.S_HAS_ATTACHMENTS -->
-					<!-- BEGIN attachment -->
-						<br /><br /><hr />{postrow.attachment.DISPLAY_ATTACHMENT}
-					<!-- END attachment -->
+					<br clear="all" /><br /><table class="tablebg" width="100%" cellspacing="1">
+						<tr>
+							<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
+						</tr>
+						<!-- BEGIN attachment -->
+						<tr>
+							<!-- IF postrow.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{postrow.attachment.DISPLAY_ATTACHMENT}</td>
+						</tr>
+						<!-- END attachment -->
+					</table>
 					<!-- ENDIF -->
 
 					<!-- IF postrow.S_DISPLAY_NOTICE --><span class="gensmall" style="color:red;"><br /><br />{L_DOWNLOAD_NOTICE}</span><!-- ENDIF -->
 					<!-- IF postrow.SIGNATURE --><span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span><!-- ENDIF -->
 					<!-- IF postrow.EDITED_MESSAGE --><span class="gensmall">{postrow.EDITED_MESSAGE}</span><!-- ENDIF -->
 					<!-- IF postrow.BUMPED_MESSAGE --><span class="gensmall">{postrow.BUMPED_MESSAGE}</span><!-- ENDIF -->
-				</td>
-			</tr>
-			<tr>
-				<td valign="bottom">
-					<table width="100%" cellspacing="0" cellpadding="0" border="0">
+
+					<!-- IF not postrow.S_HAS_ATTACHMENTS --><br clear="all" /><br /><!-- ENDIF -->
+
+					<table width="100%" cellspacing="0">
 						<tr valign="middle">
-							<!-- IF postrow.S_POST_UNAPPROVED -->
-							<td width="5">{UNAPPROVED_IMG}</td>
-							<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:green"  href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></b>&nbsp;</td>
-							<!-- ENDIF -->
-							<!-- IF postrow.S_POST_REPORTED -->
-							<td width="5">{REPORTED_IMG}</td>
-							<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:red" href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></b>&nbsp;</td>
-							<!-- ENDIF -->
-							<!-- IF postrow.S_CAN_RATE -->
-							<td nowrap="nowrap" class="gensmall"><b>{L_RATE}:</b> <a style="color:green" href="{postrow.U_RATE_GOOD}">{L_RATE_GOOD}</a> / <a style="color:red" href="{postrow.U_RATE_BAD}">{L_RATE_BAD}</a></td>
-							<!-- ENDIF -->
-							<td width="100%">&nbsp;</td>
-							<td width="10" nowrap="nowrap"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a></td>
-							<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td>
-							<!-- IF postrow.U_REPORT -->
-							<td>&nbsp;<a href="{postrow.U_REPORT}">{REPORT_IMG}</a></td>
-							<!-- ENDIF -->
+							<td class="gensmall"><!-- IF postrow.S_CAN_RATE --><b>{L_RATE}:</b> <a style="color:green" href="{postrow.U_RATE_GOOD}">{L_RATE_GOOD}</a> / <a style="color:red" href="{postrow.U_RATE_BAD}">{L_RATE_BAD}</a><!-- ENDIF --></td>
+							<td class="gensmall" align="right"><!-- IF postrow.U_REPORT --><a href="{postrow.U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_IP --><a href="{postrow.U_IP}">{IP_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_DELETE --><a href="{postrow.U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td>
 						</tr>
 					</table>
+
 				</td>
 			</tr>
 		</table></td>
@@ -204,22 +218,11 @@
 	<!-- ELSE -->
 	<tr class="row2">
 	<!-- ENDIF -->
-
-		<td class="nav" width="150" align="center" valign="middle"><a href="#{postrow.U_PREV_POST_ID}">Up</a> | <a href="#top">{L_BACK_TO_TOP}</a> | <a href="#{postrow.U_NEXT_POST_ID}">Down</a></td>
-		<td width="100%" height="28" valign="bottom" nowrap="nowrap"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td valign="middle" nowrap="nowrap"><!-- IF postrow.U_PROFILE --><a href="{postrow.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_WWW --><a href="{postrow.U_WWW}" target="_userwww">{WWW_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_AIM --><a href="{postrow.U_AIM}" onclick="im_popup('{postrow.U_AIM}', 550, 320); return false">{AIM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_YIM --><a href="{postrow.U_YIM}" onclick="im_popup('{postrow.U_YIM}', 780, 550); return false">{YIM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_MSN --><a href="{postrow.U_MSN}" onclick="im_popup('{postrow.U_MSN}', 550, 320); return false">{MSN_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_JABBER --><a href="{postrow.U_JABBER}" onclick="im_popup('{postrow.U_JABBER}', 550, 320); return false">{JABBER_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_ICQ --><script language="JavaScript" type="text/javascript"><!-- 
-
-	if (navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1)
-		document.write(' <a href="{postrow.U_ICQ}" onclick="im_popup(\'{postrow.U_ICQ}\', 550, 320); return false">{ICQ_IMG}</a>');
-	else
-		document.write('</td><td>&nbsp;</td><td width="100%" valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute"><a href="{postrow.U_ICQ}" onclick="im_popup(\'{postrow.U_ICQ}\', 550, 320); return false">{ICQ_IMG}</a></div><div style="position:absolute;left:3px;top:-1px"><a href="{postrow.U_ICQ}" onclick="im_popup(\'{postrow.U_ICQ}\', 550, 320); return false">{postrow.ICQ_STATUS_IMG}</a></div></div>');
-
-				//--></script><noscript><a href="{postrow.U_ICQ}">{ICQ_IMG}</a></noscript><!-- ENDIF --></td>
-			</tr>
-		</table></td>
-		<!-- ENDIF -->
+		<td></td>
+		<td><div class="gensmall" style="float:left">&nbsp;<!-- IF postrow.U_PROFILE --><a href="{postrow.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float:right"><!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF -->&nbsp;</div></td>
 	</tr>
+
+	<!-- ENDIF -->
 	<tr>
 		<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
 	</tr>
@@ -231,39 +234,50 @@
 	</form></tr>
 </table>
 
-<table width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table width="100%" cellspacing="1">
 	<tr>
 		<td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a>&nbsp;<a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></td>
-		<td class="nav" width="100%" align="left" valign="middle">&nbsp; <a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
-		<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span></td>
-	</tr>
-	<tr>
-		<td colspan="3"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td class="nav" nowrap="nowrap">{PAGE_NUMBER}</td>
-				<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_POSTS} ]</td>
-				<td class="nav" width="100%" align="right" valign="bottom" nowrap="nowrap">{PAGINATION}</td>
-			</tr>
-		</table></td>
+		<!-- IF TOTAL_POSTS -->
+		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
+		<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_POSTS} ]&nbsp;</td>
+		<td class="gensmall" width="100%" align="right" nowrap="nowrap"><b>{PAGINATION}</b></td>
+		<!-- ENDIF -->
 	</tr>
 </table>
 
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+	<!-- IF RULES_LINK -->
+	<tr>
+		<td class="row2"><span class="nav">&bull; <a href="">Forum Rules</a></span></td>
+	</tr>
+	<!-- ELSEIF RULES_TEXT -->
+	<tr>
+	</tr>
+	<!-- ENDIF -->
+</table>
+
+
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 <br clear="all" />
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<td class="cat"><span class="cattitle">{L_WHO_IS_ONLINE}</span></td>
 	</tr>
-	<tr class="row1">
-		<td class="gensmall" align="left">{LOGGED_IN_USER_LIST}</td>
+	<tr>
+		<td class="row1"><span class="gensmall">{LOGGED_IN_USER_LIST}</span></td>
 	</tr>
 </table>
 <!-- ENDIF -->
 
 <br clear="all" />
 
-<table width="95%" cellspacing="2" border="0" align="center">
+<table width="100%" cellspacing="1">
 	<tr>
 		<td width="40%" valign="top" nowrap="nowrap" align="left"><!-- IF S_TOPIC_MOD --><form method="post" action="{S_MOD_ACTION}"><span class="gensmall">{L_QUICK_MOD}:</span> {S_TOPIC_MOD} <input class="btnlite" type="submit" value="{L_GO}" /></form><!-- ENDIF --></td>
 		<td align="right" valign="top" nowrap="nowrap"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td>
@@ -272,7 +286,7 @@
 
 <br clear="all" />
 
-<table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
+<table width="100%" cellspacing="0">
 	<tr>
 		<td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td>
 		<td align="right"><!-- INCLUDE jumpbox.html --></td>