diff --git a/phpBB/templates/subSilver/admin/admin_config_body.tpl b/phpBB/templates/subSilver/admin/admin_config_body.tpl
index a0978180b3..c2dbaf44c6 100644
--- a/phpBB/templates/subSilver/admin/admin_config_body.tpl
+++ b/phpBB/templates/subSilver/admin/admin_config_body.tpl
@@ -1,168 +1,145 @@
-<br clear="all" />
-
 <h1>{L_CONFIGURATION_TITLE}</h1>
 
 <p>{L_CONFIGURATION_EXPLAIN}</p>
 
-<form action="{S_CONFIG_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center">
+<form action="{S_CONFIG_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline">
 	<tr>
-		<td class="cat" colspan="2"><span class="cattitle">{L_GENERAL_SETTINGS}</span></td>
+		
+	  <th class="thHead" colspan="2">{L_GENERAL_SETTINGS}</th>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">{L_SITE_NAME}:</span></td>
+		<td class="row1">{L_SITE_NAME}:</td>
 		<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">{L_ACCT_ACTIVATION}:</span></td>
+		<td class="row1">{L_ACCT_ACTIVATION}:</td>
 		<td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Flood Interval:</span><br /><span class="gensmall">Number of seconds a user must wait between posts</span></td>
+		<td class="row1">Flood Interval: <br /><span class="gensmall">Number of seconds a user must wait between posts</span></td>
 		<td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Topics Per Page:</span></td>
+		<td class="row1">Topics Per Page</td>
 		<td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Posts Per Page:</span></td>
+		<td class="row1">Posts Per Page</td>
 		<td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Hot Threshold:</span></td>
+		<td class="row1">Hot Threshold</td>
 		<td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Default Style:</span></td>
+		<td class="row1">Default Style:</td>
 		<td class="row2">{STYLE_SELECT}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Override user style:</span><br /><span class="gensmall">Replaces users style with the default</span></td>
+		<td class="row1">Override user style:<br /><span class="gensmall">Replaces users style with the default</span></td>
 		<td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Default Language:</span></td>
+		<td class="row1">Default Language:</td>
 		<td class="row2">{LANG_SELECT}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Date Format:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
+		<td class="row1">Date Format:<br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">System Timezone:</span></td>
+		<td class="row1">System Timezone:</td>
 		<td class="row2">{TIMEZONE_SELECT}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Enable GZip Compression:</span></td>
+		<td class="row1">Enable GZip Compression:</td>
 		<td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="gzip_compress" value="0" {GZIP_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Enable Forum Pruning:</span></td>
+		<td class="row1">Enable Forum Pruning:</td>
 		<td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="prune_enable" value="0" {PRUNE_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="2"><span class="cattitle">User/Forum Ability Settings</span></td>
+		<td class="catSides" colspan="2"><span class="cattitle">User/Forum Ability Settings</span></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Allow HTML:</span></td>
+		<td class="row1">Allow HTML</td>
 		<td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Allow BBCode:</span></td>
+		<td class="row1">Allow BBCode</td>
 		<td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Allow Smilies:</span></td>
+		<td class="row1">Allow Smilies</td>
 		<td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_smilies" value="0" {SMILE_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Smilies Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td>
+		<td class="row1">Smilies Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td>
 		<td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Allow Signatures:</span></td>
+		<td class="row1">Allow Signatures</td>
 		<td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_sig" value="0" {SIG_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Maximum signature length:</span><br /><span class="gensmall">Number of characters allowed</span></td>
+		<td class="row1">Maximum signature length<br /><span class="gensmall">Number of characters allowed</span></td>
 		<td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Allow Name Change:</span></td>
+		<td class="row1">Allow Name Change</td>
 		<td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Inbox limit:</span></td>
-		<td class="row2"><input type="text" size="5" maxlength="5" name="max_inbox_privmsgs" value="{INBOX_PRIVMSGS}"> messages</td>
+		<td class="catSides" colspan="2"><span class="cattitle">Avatar Settings</span></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Sentbox limit:</span></td>
-		<td class="row2"><input type="text" size="5" maxlength="5" name="max_sentbox_privmsgs" value="{SENTBOX_PRIVMSGS}"> messages</td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">Savebox limit:</span></td>
-		<td class="row2"><input type="text" size="5" maxlength="5" name="max_savebox_privmsgs" value="{SAVEBOX_PRIVMSGS}"> messages</td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2"><span class="cattitle">Avatar Settings</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">Allow local gallery avatars:</span></td>
+		<td class="row1">Allow local gallery avatars</td>
 		<td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Allow remote avatars:</span><br /><span class="gensmall">Avatars linked from another website</span></td>
+		<td class="row1">Allow remote avatars <br /><span class="gensmall">Avatars linked from another website</span></td>
 		<td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Allow avatar uploading:</span></td>
+		<td class="row1">Allow avatar uploading</td>
 		<td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO}> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Max. Avatar File Size:</span><br /><span class="gensmall">For uploaded avatar files</span></td>
+		<td class="row1">Max. Avatar File Size<br /><span class="gensmall">For uploaded avatar files</span></td>
 		<td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Max. Avatar Size:</span><br /><span class="gensmall">(height x width)</span>
+		<td class="row1">Max. Avatar Size <br />
+			<span class="gensmall">(height x width)</span>
 		</td>
 		<td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Avatar Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td>
-		<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}"></td>
+		<td class="row1">Avatar Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td>
+		<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}" /></td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="2"><span class="cattitle">Email Settings</span></td>
+		<td class="catSides" colspan="2"><span class="cattitle">Email Settings</span></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Admin Email Address:</span></td>
-		<td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}"></td>
+		<td class="row1">Admin Email Address</td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Email Signature:</span><br /><span class="gensmall">This text will be attached to all emails the board sends</span></td>
+		<td class="row1">Email Signature<br /><span class="gensmall">This text will be attached to all emails the board sends</span></td>
 		<td class="row2"><textarea name="board_email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">Use SMTP for delivery:</span><br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td>
-		<td class="row2"><input type="radio" name="smtp_delivery" value="1" {SMTP_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="smtp_delivery" value="0" {SMTP_NO}> {L_NO}</td>
+		<td class="row1">Use SMTP for delivery<br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td>
+		<td class="row2"><input type="radio" name="smtp_delivery" value="1" {SMTP_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="smtp_delivery" value="0" {SMTP_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">SMTP Server:</span></td>
-		<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50"></td>
+		<td class="row1">SMTP Server</td>
+		<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50" /></td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="2"><span class="cattitle">COPPA Settings</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">FAX Number:</span></td>
-		<td class="row2"><input type="text" name="coppa_fax" value="{COPPA_FAX}" size="25" maxlength="50"></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">Mailing Address:</span><br /><span class="gensmall">Signed COPPA agreements will be mailed here</span></td>
-		<td class="row2"><textarea name="coppa_mail" rows="5" cols="30">{COPPA_MAIL}</textarea></td>
-	</tr>	
-	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings">
+		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings" class="mainoption" />
 		</td>
 	</tr>
 </table></form>
diff --git a/phpBB/templates/subSilver/admin/admin_message_body.tpl b/phpBB/templates/subSilver/admin/admin_message_body.tpl
index d813a56f3f..788beb848d 100644
--- a/phpBB/templates/subSilver/admin/admin_message_body.tpl
+++ b/phpBB/templates/subSilver/admin/admin_message_body.tpl
@@ -1,17 +1,13 @@
 
-<br clear="all" /><br />
+<br /><br />
 
-<table width="85%" cellpadding="1" cellspacing="0" border="0" align="center">
-	<tr>
-		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
+<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
 			<tr>
-				<td class="cat" align="center"><span class="cattitle"><b>{MESSAGE_TITLE}</b></span></td>
+				<th class="thHead" align="center">{MESSAGE_TITLE}</th>
 			</tr>
 			<tr>
-				<td class="row2" width="100%" align="center"><span class="gen">{MESSAGE_TEXT}</span></td>
+				<td class="row1" width="100%" align="center"><span class="gen">{MESSAGE_TEXT}</span></td>
 			</tr>
-		</table></td>
-	</tr>
-</table>
+		</table>
 
-<br clear="all" />
+<br />
diff --git a/phpBB/templates/subSilver/admin/admin_upgrade.tpl b/phpBB/templates/subSilver/admin/admin_upgrade.tpl
index fe6d4ca457..42dc6bc377 100644
--- a/phpBB/templates/subSilver/admin/admin_upgrade.tpl
+++ b/phpBB/templates/subSilver/admin/admin_upgrade.tpl
@@ -1,5 +1,5 @@
 
-<br clear="all" />
+<br />
 
 <h1>Upgrade</h1>
 
@@ -19,36 +19,43 @@ function checkall(state)
 }
 </script>
 <form method="post" action="{S_UPGRADE_ACTION}" name="form">
-<table cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<td align="left" colspan="3"><input type="checkbox" name="backup" CHECKED><small>Backup files before upgrading</small></td>
-		<td align="right" colspan="2"><a href="javascript:document.form.submit()">Upgrade �</a></td>
+  <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <th class="thCornerL" colspan="2">Filename</th>
+	  <th class="thTop">Local</th>
+	  <th class="thTop">Remote</th>
+	  <th class="thCornerR">Status</th>
 	</tr>
-	<tr>
-		<th><a href="javascript:checkall(true)">all</a>/<a href="javascript:checkall(false)">none</a></th>
-		<th>Filename</th>
-		<th>Local</th>
-		<th>Remote</th>
-		<th>Status</th>
+	<tr> 
+	  <td class="row2"><a href="javascript:checkall(true)">all</a>/<a href="javascript:checkall(false)">none</a></td>
+	  <td colspan="2" class="row2"> 
+		<input type="checkbox" name="backup" CHECKED>
+		Backup files before upgrading</td>
+	  <td colspan="2" class="row2" align="right"><a href="javascript:document.form.submit()">Upgrade 
+		�</a></td>
 	</tr>
 	<!-- BEGIN dir -->
-	<tr>
-		<th colspan="5" align="left">DIR: <b>{dir.NAME}</b></th>
+	<tr> 
+	  <td colspan="5" class="catSides">DIR: <b>{dir.NAME}</b></td>
 	</tr>
 	<!-- BEGIN file -->
-	<tr align="center">
-		<td class="row2"><input type="checkbox" name="{dir.file.INPUTNAME}" value="{dir.file.INPUTVALUE}"><input type="hidden" name="version{dir.file.INPUTNAME}" value="{dir.file.REMOTE}"></td>
-		<td class="row1" align="left"><a href="{dir.file.LINK}">{dir.file.NAME}</a></td>
-		<td class="row2">{dir.file.LOCAL}</td>
-		<td class="row1">{dir.file.REMOTE}</td>
-		<td class="row2">{dir.file.STATUS}</td>
+	<tr align="center"> 
+	  <td class="row2"> 
+		<input type="checkbox" name="{dir.file.INPUTNAME}" value="{dir.file.INPUTVALUE}">
+		<input type="hidden" name="version{dir.file.INPUTNAME}" value="{dir.file.REMOTE}">
+	  </td>
+	  <td class="row1" align="left"><a href="{dir.file.LINK}">{dir.file.NAME}</a></td>
+	  <td class="row2">{dir.file.LOCAL}</td>
+	  <td class="row1">{dir.file.REMOTE}</td>
+	  <td class="row2">{dir.file.STATUS}</td>
 	</tr>
 	<!-- END file -->
 	<!-- END dir -->
-	<tr>
-		<td align="right" colspan="5"><a href="javascript:document.form.submit()">Upgrade �</a></td>
+	<tr> 
+	  <td align="right" colspan="5" class="row2"><a href="javascript:document.form.submit()">Upgrade 
+		�</a></td>
 	</tr>
-</table>
+  </table>
 <input type="hidden" name="mode" value="upgrade">
 <input type="hidden" name="maxfile" value="{S_UPGRADE_MAXFILE}">
 </form>
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/admin/admin_upgrade_results.tpl b/phpBB/templates/subSilver/admin/admin_upgrade_results.tpl
index b3f8accf52..f613e860e2 100644
--- a/phpBB/templates/subSilver/admin/admin_upgrade_results.tpl
+++ b/phpBB/templates/subSilver/admin/admin_upgrade_results.tpl
@@ -1,11 +1,11 @@
 
-<br clear="all" />
+<br />
 
 <h1>Upgrade</h1>
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<th>Filename</th>
-		<th>Status</th>
+		<th class="thCornerL">Filename</th>
+		<th class="thCornerR">Status</th>
 	</tr>
 	<!-- BEGIN files -->
 	<tr>
@@ -14,4 +14,4 @@
 	</tr>
 	<!-- END files -->
 </table>
-<br>
\ No newline at end of file
+<br />
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/admin/auth_forum_body.tpl b/phpBB/templates/subSilver/admin/auth_forum_body.tpl
index 4c2aefca85..36549ac63f 100644
--- a/phpBB/templates/subSilver/admin/auth_forum_body.tpl
+++ b/phpBB/templates/subSilver/admin/auth_forum_body.tpl
@@ -1,33 +1,33 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_AUTH_TITLE}</h1>
 
 <p>{L_AUTH_EXPLAIN}</p>
 
 <h2>{L_FORUM}: {FORUM_NAME}</h2>
-
-<table cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr><form method="post" action="{S_FORUMAUTH_ACTION}">
-		<!-- BEGIN forum_auth_titles -->
-		<th>{forum_auth_titles.CELL_TITLE}</th>
-		<!-- END forum_auth_titles -->
+<form method="post" action="{S_FORUMAUTH_ACTION}">
+  <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <!-- BEGIN forum_auth_titles -->
+	  <th class="thTop">{forum_auth_titles.CELL_TITLE}</th>
+	  <!-- END forum_auth_titles -->
+	</tr>
+	<tr> 
+	  <!-- BEGIN forum_auth_data -->
+	  <td class="row1" align="center">{forum_auth_data.S_AUTH_LEVELS_SELECT}</td>
+	  <!-- END forum_auth_data -->
+	</tr>
+	<tr> 
+	  <td colspan="{S_COLUMN_SPAN}" align="center" class="row1"> <span class="gensmall">{U_SWITCH_MODE}</span></td>
 	</tr>
 	<tr>
-		<!-- BEGIN forum_auth_data -->
-		<td class="row1" align="center">{forum_auth_data.S_AUTH_LEVELS_SELECT}</td>
-		<!-- END forum_auth_data -->
+	  <td colspan="{S_COLUMN_SPAN}" class="catBottom" align="center">{S_HIDDEN_FIELDS} 
+		<input type="submit" name="submit" value="{L_SUBMIT_CHANGES}" class="mainoption" />
+		&nbsp;&nbsp; 
+		<input type="reset" value="{L_RESET_CHANGES}" name="reset" class="liteoption" />
+	  </td>
 	</tr>
-	<tr>
-		<td colspan="{S_COLUMN_SPAN}"><table width="100%" cellspacing="0" cellpadding="4" border="0">
-			<tr>
-				<td align="center"><span class="gensmall">{U_SWITCH_MODE}</span></td>
-			</tr>
-			<tr>
-				<td align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT_CHANGES}">&nbsp;&nbsp;<input type="reset" value="{L_RESET_CHANGES}"></td>
-			</tr>
-		</table></td>
-	</form></tr>
-</table>
-
-<br clear="all" />
+  </table>
+</form>
+<br />
diff --git a/phpBB/templates/subSilver/admin/auth_select_body.tpl b/phpBB/templates/subSilver/admin/auth_select_body.tpl
index 5e173d687e..3bcabe3e71 100644
--- a/phpBB/templates/subSilver/admin/auth_select_body.tpl
+++ b/phpBB/templates/subSilver/admin/auth_select_body.tpl
@@ -1,17 +1,18 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_AUTH_TITLE}</h1>
 
 <p>{L_AUTH_EXPLAIN}</p>
 
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<td class="cat" align="center"><span class="cattitle"><b>{L_AUTH_SELECT}</b></span></td>
+		
+	<th class="thHead" align="center">{L_AUTH_SELECT}</th>
 	</tr>
 	<tr><form method="get" action="{S_AUTH_ACTION}">
-		<td class="row1" align="center">{S_AUTH_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}">&nbsp;</td>
+		<td class="row1" align="center">{S_AUTH_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}" class="mainoption" />&nbsp;</td>
 	</form></tr>
 </table>
 
-<br clear="all" />
+<br />
diff --git a/phpBB/templates/subSilver/admin/auth_ug_body.tpl b/phpBB/templates/subSilver/admin/auth_ug_body.tpl
index 5e1741f398..9c1753dcbd 100644
--- a/phpBB/templates/subSilver/admin/auth_ug_body.tpl
+++ b/phpBB/templates/subSilver/admin/auth_ug_body.tpl
@@ -1,5 +1,5 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_AUTH_TITLE}</h1>
 
@@ -13,31 +13,32 @@
 
 <p>{L_AUTH_EXPLAIN}</p>
 
-<table cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th width="30%">{L_FORUM}</th>
-		<!-- BEGIN acltype -->
-		<th>{acltype.L_UG_ACL_TYPE}</th>
-		<!-- END acltype -->
-		<th>{L_MODERATOR_STATUS}</th>
+  <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <th width="30%" class="thCornerL">{L_FORUM}</th>
+	  <!-- BEGIN acltype -->
+	  <th class="thTop">{acltype.L_UG_ACL_TYPE}</th>
+	  <!-- END acltype -->
+	  <th class="thCornerR">{L_MODERATOR_STATUS}</th>
 	</tr>
 	<!-- BEGIN forums -->
-	<tr>
-		<td class="{forums.ROW_CLASS}" align="center">{forums.FORUM_NAME}</td>
-		<!-- BEGIN aclvalues -->
-		<td class="{forums.ROW_CLASS}" align="center">{forums.aclvalues.S_ACL_SELECT}</td>
-		<!-- END aclvalues -->
-		<td class="{forums.ROW_CLASS}" align="center">{forums.S_MOD_SELECT}</td>
+	<tr> 
+	  <td class="{forums.ROW_CLASS}" align="center">{forums.FORUM_NAME}</td>
+	  <!-- BEGIN aclvalues -->
+	  <td class="{forums.ROW_CLASS}" align="center">{forums.aclvalues.S_ACL_SELECT}</td>
+	  <!-- END aclvalues -->
+	  <td class="{forums.ROW_CLASS}" align="center">{forums.S_MOD_SELECT}</td>
 	</tr>
 	<!-- END forums -->
-	<tr>
-		<td colspan="{S_COLUMN_SPAN}"><table width="100%" cellspacing="0" cellpadding="4" border="0">
-			<tr>
-				<td align="center"><span class="gensmall">{U_SWITCH_MODE}</span></td>
-			</tr>
-			<tr>
-				<td align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT_CHANGES}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET_CHANGES}" /></td>
-			</tr>
-		</table></td>
+	<tr> 
+	  <td colspan="{S_COLUMN_SPAN}" class="row1" align="center"> <span class="gensmall">{U_SWITCH_MODE}</span></td>
 	</tr>
-</table></form>
+	<tr>
+	  <td colspan="{S_COLUMN_SPAN}" class="catBottom" align="center">{S_HIDDEN_FIELDS} 
+		<input type="submit" name="submit" value="{L_SUBMIT_CHANGES}" class="mainoption" />
+		&nbsp;&nbsp; 
+		<input type="reset" value="{L_RESET_CHANGES}" class="liteoption" name="reset" />
+	  </td>
+	</tr>
+  </table>
+</form>
diff --git a/phpBB/templates/subSilver/admin/category_edit_body.tpl b/phpBB/templates/subSilver/admin/category_edit_body.tpl
index 512c3693f7..5ed799c590 100644
--- a/phpBB/templates/subSilver/admin/category_edit_body.tpl
+++ b/phpBB/templates/subSilver/admin/category_edit_body.tpl
@@ -1,32 +1,28 @@
-<br clear="all" />
+<br />
 
 <h1>Edit Category</h1>
 
 <p>Use this form to modify a category.</p>
 
 <form action="{S_FORUM_ACTION}" method="POST">
-
-<table width="99%" cellpadding="1" cellspacing="0" border="0" align="center">
-	<tr>
-		<td class="tablebg" width="100%"><table width="100%" cellpadding="4" cellspacing="1" border="0">
-			<tr>
-				<td class="cat" colspan="2"><span class="cattitle">Modify Category</span></td>
-			</tr>
-			<tr>
-				<td class="row1">Category Name:</td>
-				<td class="row2"><input type="text" size="25" name="cat_title" value="{CAT_TITLE}"></td>
-			</tr>
-			<tr>
-				<td class="row2" colspan="2" align="center">
-					<input type="hidden" name="mode" value="{S_NEWMODE}">
-					<input type="hidden" name="cat_id" value="{S_CATID}">
-					<input type="submit" name="submit" value="{BUTTONVALUE}">
-				</td>
-			</tr>
-		</table></td>
+  <table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
+	<tr> 
+	  <th class="thHead" colspan="2">Modify Category</th>
 	</tr>
-</table>
-
+	<tr> 
+	  <td class="row1">Category Name:</td>
+	  <td class="row2">
+		<input type="text" size="25" name="cat_title" value="{CAT_TITLE}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="catBottom" colspan="2" align="center"> 
+		<input type="hidden" name="mode" value="{S_NEWMODE}" />
+		<input type="hidden" name="cat_id" value="{S_CATID}" />
+		<input type="submit" name="submit" value="{BUTTONVALUE}" class="mainoption" />
+	  </td>
+	</tr>
+  </table>
 </form>
 		
 <br clear="all">
diff --git a/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl b/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl
index 69ce54ccd0..1be096cae6 100644
--- a/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl
+++ b/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl
@@ -1,17 +1,17 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_DATABASE_BACKUP}</h1>
 
 <P>{L_BACKUP_EXPLAIN}</p>
 
-<form method="post" action="{S_DBUTILS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="post" action="{S_DBUTILS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<th colspan="2">{L_BACKUP_OPTIONS}</th>
+		<th colspan="2" class="thHead">{L_BACKUP_OPTIONS}</th>
 	</tr>
 	<tr>
 		<td class="row2">{L_FULL_BACKUP}</td>
-		<td class="row2"><input type="radio" name="backup_type" value="full" checked="checked" /></td>
+		<td class="row2"><input type="radio" name="backup_type" value="full" checked /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_STRUCTURE_BACKUP}</td>
@@ -27,9 +27,9 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_GZIP_COMPRESS}</td>
-		<td class="row1">{L_NO} <input type="radio" name="gzipcompress" value="0" checked="checked" /> &nbsp;{L_YES} <input type="radio" name="gzipcompress" value="1" /></td>
+		<td class="row1">{L_NO} <input type="radio" name="gzipcompress" value="0" checked /> &nbsp;{L_YES} <input type="radio" name="gzipcompress" value="1" /></td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="backupstart" value="{L_START_BACKUP}" /></td>
+		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="backupstart" value="{L_START_BACKUP}" class="mainoption" /></td>
 	</tr>
 </table></form>
diff --git a/phpBB/templates/subSilver/admin/db_utils_restore_body.tpl b/phpBB/templates/subSilver/admin/db_utils_restore_body.tpl
index 23d8e6a3e6..dc08ff78ca 100644
--- a/phpBB/templates/subSilver/admin/db_utils_restore_body.tpl
+++ b/phpBB/templates/subSilver/admin/db_utils_restore_body.tpl
@@ -1,17 +1,16 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_DATABASE_RESTORE}</h1>
 
 <P>{L_RESTORE_EXPLAIN}</p>
 
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<th>{L_SELECT_FILE}</th>
+		<th class="thHead">{L_SELECT_FILE}</th>
 	</tr>
 	<tr><form enctype="multipart/form-data" method="post" action="{S_DBUTILS_ACTION}">
-		<td class="row1" align="center">&nbsp;<input type="file" name="backup_file">&nbsp;&nbsp;{S_HIDDEN_FIELDS}<input type="submit" name="restore_start" value="{L_START_RESTORE}">&nbsp;</td>
+		<td class="row1" align="center">&nbsp;<input type="file" name="backup_file">&nbsp;&nbsp;{S_HIDDEN_FIELDS}<input type="submit" name="restore_start" value="{L_START_RESTORE}" class="mainoption" />&nbsp;</td>
 	</form></tr>
-</table></div>
-
-<br clear="all" />
+</table>
+<br />
diff --git a/phpBB/templates/subSilver/admin/forum_delete_body.tpl b/phpBB/templates/subSilver/admin/forum_delete_body.tpl
index 159b1880fa..61cba18360 100644
--- a/phpBB/templates/subSilver/admin/forum_delete_body.tpl
+++ b/phpBB/templates/subSilver/admin/forum_delete_body.tpl
@@ -1,38 +1,30 @@
-<br clear="all" />
+<br />
 
 <h1>Delete</h1>
 
 <p>The form below will allow you to delete a forum/category and decide where you want to put all topics/forums inside that forum/category.</p>
 
 <form action="{S_FORUM_ACTION}" method="POST">
-
-<table width="99%" cellpadding="1" cellspacing="0" border="0" align="center">
-	<tr>
-		<td class="tablebg" width="100%"><table width="100%" cellpadding="4" cellspacing="1" border="0">
-			<tr>
-				<td class="cat" colspan="2"><span class="cattitle">Delete</span></td>
-			</tr>
-			<tr>
-				<td class="row1">Name:</td>
-				<td class="row2"><span class="row1">{NAME}</span></td>
-			</tr>
-			<tr>
-				<td class="row1">Move everything to:</td>
-				<td class="row2">
-					{S_SELECT_TO}
-				</td>
-			</tr>
-			<tr>
-				<td class="row2" colspan="2" align="center">
-					<input type="hidden" name="mode" value="{S_NEWMODE}">
-					<input type="hidden" name="from_id" value="{S_FROM_ID}">
-					<input type="submit" name="submit" value="{BUTTONVALUE}">
-				</td>
-			</tr>
-		</table></td>
+  <table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
+	<tr> 
+	  <th colspan="2" class="thHead">Delete</th>
+	  </tr>
+	<tr> 
+	  <td class="row1">Name:</td>
+	  <td class="row1"><span class="row1">{NAME}</span></td>
 	</tr>
-</table>
-
+	<tr> 
+	  <td class="row1">Move everything to:</td>
+	  <td class="row1"> {S_SELECT_TO} </td>
+	</tr>
+	<tr> 
+	  <td class="catBottom" colspan="2" align="center"> 
+		<input type="hidden" name="mode" value="{S_NEWMODE}" />
+		<input type="hidden" name="from_id" value="{S_FROM_ID}" />
+		<input type="submit" name="submit" value="{BUTTONVALUE}" class="mainoption" />
+	  </td>
+	</tr>
+  </table>
 </form>
 		
 <br clear="all">
diff --git a/phpBB/templates/subSilver/admin/forum_edit_body.tpl b/phpBB/templates/subSilver/admin/forum_edit_body.tpl
index dbe7241cbd..7d37096f99 100644
--- a/phpBB/templates/subSilver/admin/forum_edit_body.tpl
+++ b/phpBB/templates/subSilver/admin/forum_edit_body.tpl
@@ -1,71 +1,71 @@
-<br clear="all" />
+<br />
 
 <h1>Edit Forum</h1>
 
 <p>The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.</p>
 
 <form action="{S_FORUM_ACTION}" method="POST">
-
-<table width="99%" cellpadding="1" cellspacing="0" border="0" align="center">
-	<tr>
-		<td class="tablebg" width="100%"><table width="100%" cellpadding="4" cellspacing="1" border="0">
-			<tr>
-				<td class="cat" colspan="2"><span class="cattitle">General Forum Settings</span></td>
-			</tr>
-			<tr>
-				<td class="row1">Forum Name:</td>
-				<td class="row2"><input type="text" size="25" name="forumname" value="{FORUMNAME}"></td>
-			</tr>
-			<tr>
-				<td class="row1">Description:</td>
-				<td class="row2"><textarea ROWS="5" COLS="45" WRAP="VIRTUAL" name="forumdesc">{DESCRIPTION}</TEXTAREA></td>
-			</tr>
-			<tr>
-				<td class="row1">Category:</td>
-				<td class="row2">
-					<select name="cat_id">
-					{S_CATLIST}
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td class="row1">Forum Status:</td>
-				<td class="row2">
-					<select name="forumstatus">
-					{S_STATUSLIST}
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td class="row1">Auto Pruning:</td>
-				<td class="row2">
-				 	<table>
-						<tr>
-							<td align="right" valign="middle">{L_ENABLED}</td>
-							<td align="left" valign="middle"><input type="checkbox" name="prune_enable" value="1" {S_PRUNE_EN}></td>
-						</tr>
-						<tr>
-							<td align="right" valign="middle">{L_PRUNE_DAYS}</td>
-							<td align="left" valign="middle">&nbsp;<input type="text" name="prune_days" value="{S_PRUNE_DAYS}" size="5">&nbsp;{L_DAYS}</td>
-						</tr>
-						<tr>
-							<td align="right" valign="middle">{L_PRUNE_FREQ}</td>
-							<td align="left" valign="middle">&nbsp;<input type="text" name="prune_freq" value="{S_PRUNE_FREQ}" size="5">&nbsp;{L_DAYS}</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td class="row2" colspan="2" align="center">
-					<input type="hidden" name="mode" value="{S_NEWMODE}">
-					<input type="hidden" name="forum_id" value="{S_FORUMID}">
-					<input type="submit" name="submit" value="{BUTTONVALUE}">
-				</td>
-			</tr>
-		</table></td>
+  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
+	<tr> 
+	  <th class="thHead" colspan="2">General Forum Settings</th>
 	</tr>
-</table>
-
+	<tr> 
+	  <td class="row1">Forum Name:</td>
+	  <td class="row2">
+		<input type="text" size="25" name="forumname" value="{FORUMNAME}" class="post" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1">Description:</td>
+	  <td class="row2">
+		<textarea rows="5" cols="45" wrap="VIRTUAL" name="forumdesc" class="post">{DESCRIPTION}</textarea>
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1">Category:</td>
+	  <td class="row2"> 
+		<select name="cat_id">{S_CATLIST}</select>
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1">Forum Status:</td>
+	  <td class="row2"> 
+		<select name="forumstatus">{S_STATUSLIST}</select>
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1">Auto Pruning:</td>
+	  <td class="row2"> 
+		<table>
+		  <tr> 
+			<td align="right" valign="middle">{L_ENABLED}</td>
+			<td align="left" valign="middle">
+			  <input type="checkbox" name="prune_enable" value="1" {S_PRUNE_EN} />
+			</td>
+		  </tr>
+		  <tr> 
+			<td align="right" valign="middle">{L_PRUNE_DAYS}</td>
+			<td align="left" valign="middle">&nbsp;
+			  <input type="text" name="prune_days" value="{S_PRUNE_DAYS}" size="5" class="post" />
+			  &nbsp;{L_DAYS}</td>
+		  </tr>
+		  <tr> 
+			<td align="right" valign="middle">{L_PRUNE_FREQ}</td>
+			<td align="left" valign="middle">&nbsp;
+			  <input type="text" name="prune_freq" value="{S_PRUNE_FREQ}" size="5" class="post" />
+			  &nbsp;{L_DAYS}</td>
+		  </tr>
+		</table>
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="catBottom" colspan="2" align="center"> 
+		<input type="hidden" name="mode" value="{S_NEWMODE}" />
+		<input type="hidden" name="forum_id" value="{S_FORUMID}" />
+		<input type="submit" name="submit" value="{BUTTONVALUE}" class="mainoption" />
+	  </td>
+	</tr>
+  </table>
 </form>
 		
 <br clear="all">
diff --git a/phpBB/templates/subSilver/admin/forum_prune_body.tpl b/phpBB/templates/subSilver/admin/forum_prune_body.tpl
index b2287dc108..cd95e18372 100644
--- a/phpBB/templates/subSilver/admin/forum_prune_body.tpl
+++ b/phpBB/templates/subSilver/admin/forum_prune_body.tpl
@@ -1,5 +1,5 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_FORUM_PRUNE}</h1>
 
@@ -7,11 +7,18 @@
 
 <h2>{L_FORUM}: {FORUM_NAME}</h2>
 
-<form method="post"	action="{S_FORUMPRUNE_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<td class="row1"> {S_PRUNE_DATA} </td>
+<form method="post"	action="{S_FORUMPRUNE_ACTION}">
+  <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <th class="thHead">{L_FORUM_PRUNE}</th>
 	</tr>
 	<tr>
-		<td class="cat" align="center">{S_HIDDEN_VARS}<input type="submit" name="doprune" value="{L_DO_PRUNE}"></td>
+	  <td class="row1">{S_PRUNE_DATA}</td>
 	</tr>
-</table></form>
+	<tr> 
+	  <td class="catBottom" align="center">{S_HIDDEN_VARS}
+		<input type="submit" name="doprune" value="{L_DO_PRUNE}" class="mainoption">
+	  </td>
+	</tr>
+  </table>
+</form>
diff --git a/phpBB/templates/subSilver/admin/forum_prune_result_body.tpl b/phpBB/templates/subSilver/admin/forum_prune_result_body.tpl
index 4591f913cf..1cf543b540 100644
--- a/phpBB/templates/subSilver/admin/forum_prune_result_body.tpl
+++ b/phpBB/templates/subSilver/admin/forum_prune_result_body.tpl
@@ -1,15 +1,15 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_FORUM_PRUNE}</h1>
 
 <p>{L_PRUNE_RESULT}</p>
 
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<th>{L_FORUM}</th>
-		<th>{L_TOPICS_PRUNED}</th>
-		<th>{L_POSTS_PRUNED}</th>
+		<th class="thCornerL">{L_FORUM}</th>
+		<th class="thTop">{L_TOPICS_PRUNED}</th>
+		<th class="thCornerR">{L_POSTS_PRUNED}</th>
 	</tr>
 	<!-- BEGIN prune_results -->
 	<tr>
@@ -20,4 +20,4 @@
 	<!-- END prune_results -->
 </table>
 
-<br clear="all" />
+<br />
diff --git a/phpBB/templates/subSilver/admin/forum_prune_select_body.tpl b/phpBB/templates/subSilver/admin/forum_prune_select_body.tpl
index c46a96a4e3..c92b9dd4e7 100644
--- a/phpBB/templates/subSilver/admin/forum_prune_select_body.tpl
+++ b/phpBB/templates/subSilver/admin/forum_prune_select_body.tpl
@@ -1,15 +1,16 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_FORUM_PRUNE}</h1>
 
-<form method="get" action="{S_FORUMPRUNE_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="get" action="{S_FORUMPRUNE_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<td class="cat" align="center"><span class="cattitle"><b>{L_SELECT_FORUM}</td>
+		
+	  <th class="thHead" align="center">{L_SELECT_FORUM}</th>
 	</tr>
 	<tr>
-		<td class="row1" align="center">{S_FORUMS_SELECT} &nbsp;<input type="submit" name="pruneset" value="{L_LOOK_UP}">&nbsp;</td>
+		<td class="row1" align="center">{S_FORUMS_SELECT} &nbsp;<input type="submit" name="pruneset" value="{L_LOOK_UP}" class="mainoption">&nbsp;</td>
 	</tr>
 </table></form>
 
-<br clear="all" />
+<br />
diff --git a/phpBB/templates/subSilver/admin/forums_body.tpl b/phpBB/templates/subSilver/admin/forums_body.tpl
index 86fad48602..1957af9cc2 100644
--- a/phpBB/templates/subSilver/admin/forums_body.tpl
+++ b/phpBB/templates/subSilver/admin/forums_body.tpl
@@ -1,33 +1,37 @@
+<br />
+<h1>Bulletin Board Management</h1>
+
 <p>Use this page to manage your forums and categories</p>
 
 
 {S_FORMSTART}
-<div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
-	<tr>
-		<td class="tablebg"><table width="100%" cellpadding="3" cellspacing="1" border="0">
-			<!-- BEGIN catrow -->
-			<tr>
-				<td class="cat" colspan="4"><span class="cattitle"><b><a href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></b></span>{catrow.S_ADDCAT}</span></td>
-				<td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_EDIT}</span></td>
-				<td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_DELETE}</span></td>
-				<td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_UP} {catrow.CAT_DOWN}</span></td>
-				<td class="cat" align="center" valign="middle"><span class="gen">&nbsp</span></td>
-
-			</tr>{catrow.S_ADDCAT_ENDFORM}
-			<!-- BEGIN forumrow -->
-			<tr>
-				<td class="row1" align="center" valign="middle">{catrow.forumrow.FOLDER}</td>
-				<td class="row2"><span class="gen">{catrow.forumrow.S_ADDFORUM}{catrow.forumrow.S_NEWFORUM}<a href="{catrow.forumrow.U_VIEWFORUM}" target="_new">{catrow.forumrow.FORUM_NAME}</a></span><br><span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td>
-			{catrow.forumrow.S_ADDFORUM_ENDFORM}
-				<td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_TOPICS}</span></td>
-				<td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_POSTS}</span></td>
-				<td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_EDIT}</span></td>
-				<td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_DELETE}</span></td>
-				<td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_UP} {catrow.forumrow.FORUM_DOWN}</span></td>
-				<td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_SYNC}</span></td>
-			</tr>
-			<!-- END forumrow -->
-			<!-- END catrow -->
-		</table></td>
+<div align="center">
+  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
+	<!-- BEGIN catrow -->
+	<tr> 
+	  <td class="cat" colspan="4"><span class="cattitle"><b><a href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></b></span>{catrow.S_ADDCAT}</td>
+	  <td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_EDIT}</span></td>
+	  <td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_DELETE}</span></td>
+	  <td class="cat" align="center" valign="middle" nowrap="nowrap"><span class="gen">{catrow.CAT_UP} 
+		{catrow.CAT_DOWN}</span></td>
+	  <td class="cat" align="center" valign="middle"><span class="gen">&nbsp</span></td>
 	</tr>
-</table></div>
+	{catrow.S_ADDCAT_ENDFORM} 
+	<!-- BEGIN forumrow -->
+	<tr> 
+	  <td class="row1" align="center" valign="middle">{catrow.forumrow.FOLDER}</td>
+	  <td class="row2"><span class="gen">{catrow.forumrow.S_ADDFORUM}{catrow.forumrow.S_NEWFORUM}<a href="{catrow.forumrow.U_VIEWFORUM}" target="_new">{catrow.forumrow.FORUM_NAME}</a></span><br />
+		<span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td>
+	  {catrow.forumrow.S_ADDFORUM_ENDFORM} 
+	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_TOPICS}</span></td>
+	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_POSTS}</span></td>
+	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_EDIT}</span></td>
+	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_DELETE}</span></td>
+	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_UP} 
+		{catrow.forumrow.FORUM_DOWN}</span></td>
+	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_SYNC}</span></td>
+	</tr>
+	<!-- END forumrow -->
+	<!-- END catrow -->
+  </table>
+</div>
diff --git a/phpBB/templates/subSilver/admin/group_edit_body.tpl b/phpBB/templates/subSilver/admin/group_edit_body.tpl
index 5a12a47d24..046e6b4112 100644
--- a/phpBB/templates/subSilver/admin/group_edit_body.tpl
+++ b/phpBB/templates/subSilver/admin/group_edit_body.tpl
@@ -1,43 +1,51 @@
 
-<form action="{S_GROUP_ACTION}" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
-	<tr>
-		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
+<h1><br />
+  {L_GROUP_INFO} </h1>
+ <br />
+<form action="{S_GROUP_ACTION}" method="post">
+  <table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center">
+	<tr> 
+	  <th class="thHead" colspan="2">{L_GROUP_INFO}</th>
 	</tr>
-</table>
-
-<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr>
-		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
-			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b>{L_GROUP_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td>
-				<td class="row2"><input type="text" name="group_name" size="35" maxlength="40" value="{S_GROUP_NAME}" /></td>
-			</tr>
-			<tr>
-				<td class="row1"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td>
-				<td class="row2"><textarea name="group_description" rows=5 cols=51>{S_GROUP_DESCRIPTION}</textarea></td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
-				<td class="row2">{S_GROUP_MODERATOR}</td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
-				<td class="row2"><input type="radio" name="group_type" value="1" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="0" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED}</td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
-				<td class="row2"><input type="checkbox" name="deletegroup" value="1">{L_GROUP_DELETE_CHECK}</td>
-			</tr>
-			<tr>
-				<td class="cat" colspan="2" align="center"><span class="cattitle"><input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></span></td>
-			</tr>
-		</table></td>
+	  <td class="row1" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
 	</tr>
-
-<input type="hidden" name="mode" value="{S_GROUP_MODE}" />
-<input type="hidden" name="updategroup" value="update" />
-<input type="hidden" name="group_id" value="{GROUP_ID}" />
-</table></form>
\ No newline at end of file
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td>
+	  <td class="row2" width="62%"> 
+		<input type="text" name="group_name" size="35" maxlength="40" value="{S_GROUP_NAME}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td>
+	  <td class="row2" width="62%"> 
+		<textarea name="group_description" rows=5 cols=51>{S_GROUP_DESCRIPTION}</textarea>
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
+	  <td class="row2" width="62%">{S_GROUP_MODERATOR}</td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
+	  <td class="row2" width="62%"> 
+		<input type="radio" name="group_type" value="1" {S_GROUP_OPEN_CHECKED} />
+		{L_GROUP_OPEN} &nbsp;&nbsp; 
+		<input type="radio" name="group_type" value="0" {S_GROUP_CLOSED_CHECKED} />
+		{L_GROUP_CLOSED}</td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
+	  <td class="row2" width="62%"> 
+		<input type="checkbox" name="deletegroup" value="1">
+		{L_GROUP_DELETE_CHECK}</td>
+	</tr>
+	<tr> 
+	  <td class="catBottom" colspan="2" align="center"><span class="cattitle"> 
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
+		&nbsp;&nbsp; 
+		<input type="reset" value="{L_RESET}" name="reset" class="liteoption" />
+		</span></td>
+	</tr>
+  </table>
+</form>
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/admin/group_select_body.tpl b/phpBB/templates/subSilver/admin/group_select_body.tpl
index 321bdf624f..5683cc9721 100644
--- a/phpBB/templates/subSilver/admin/group_select_body.tpl
+++ b/phpBB/templates/subSilver/admin/group_select_body.tpl
@@ -1,20 +1,21 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_GROUP_TITLE}</h1>
 
 <p>{L_GROUP_EXPLAIN}</p>
 
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<td class="cat" align="center"><span class="cattitle"><b>{L_GROUP_SELECT}</b></span></td>
+		
+	<th class="thHead" align="center">{L_GROUP_SELECT}</th>
 	</tr>
 	<tr><form method="post" action="{S_GROUP_ACTION}"><input type="hidden" name="mode" value="editgroup">
-		<td class="row1" align="center">{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}">&nbsp;</td>
+		<td class="row1" align="center">{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}" class="mainoption" />&nbsp;</td>
 	</form></tr>
 	<tr>
-		<td class="row2" align="center"><a href="admin_groups.php?mode=newgroup">{L_GROUP_NEW}</a></td>
+		<td class="catBottom" align="center"><a href="admin_groups.php?mode=newgroup">{L_GROUP_NEW}</a></td>
 	</tr>
 </table>
 
-<br clear="all" />
+<br />
diff --git a/phpBB/templates/subSilver/admin/index_body.tpl b/phpBB/templates/subSilver/admin/index_body.tpl
index deefb52411..9b76383cf8 100644
--- a/phpBB/templates/subSilver/admin/index_body.tpl
+++ b/phpBB/templates/subSilver/admin/index_body.tpl
@@ -1,5 +1,5 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_WELCOME}</h1>
 
@@ -7,84 +7,60 @@
 
 <h1>{L_FORUM_STATS}</h1>
 
-<table width="99%" cellspacing="0" cellpadding="2" border="0">
+<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
   <tr> 
-	<td align="left" colspan="2" class="forumline"> 
-	  <table width="100%" border="0" cellspacing="0" cellpadding="1">
-		<tr> 
-		  <td class="innerline"> 
-			<table width="100%" cellpadding="4" cellspacing="1" border="0">
-			  <tr> 
-				<th width="25%" nowrap height="25">{L_STATISTIC}</th>
-				<th width="25%" height="25">{L_VALUE}</th>
-				<th width="25%" nowrap height="25">{L_STATISTIC}</th>
-				<th width="25%" height="25">{L_VALUE}</th>
-			  </tr>
-			  <tr> 
-				<td class="row1" nowrap>{L_NUMBER_POSTS}:</td>
-				<td class="row2"><b>{NUMBER_OF_POSTS}</b></td>
-				<td class="row1" nowrap>{L_POSTS_PER_DAY}:</td>
-				<td class="row2"><b>{POSTS_PER_DAY}</b></td>
-			  </tr>
-			  <tr> 
-				<td class="row1" nowrap>{L_NUMBER_TOPICS}:</td>
-				<td class="row2"><b>{NUMBER_OF_TOPICS}</b></td>
-				<td class="row1" nowrap>{L_TOPICS_PER_DAY}:</td>
-				<td class="row2"><b>{TOPICS_PER_DAY}</b></td>
-			  </tr>
-			  <tr> 
-				<td class="row1" nowrap>{L_NUMBER_USERS}:</td>
-				<td class="row2"><b>{NUMBER_OF_USERS}</b></td>
-				<td class="row1" nowrap>{L_USERS_PER_DAY}:</td>
-				<td class="row2"><b>{USERS_PER_DAY}</b></td>
-			  </tr>
-			  <tr> 
-				<td class="row1" nowrap>{L_BOARD_STARTED}:</td>
-				<td class="row2"><b>{START_DATE}</b></td>
-				<td class="row1" nowrap>{L_AVATAR_DIR_SIZE}:</td>
-				<td class="row2"><b>{AVATAR_DIR_SIZE}</b></td>
-			  </tr>
-			  <tr> 
-				<td class="row1" nowrap>{L_DB_SIZE}:</td>
-				<td class="row2"><b>{DB_SIZE}</b></td>
-				<td class="row1" nowrap>&nbsp;</td>
-				<td class="row2">&nbsp;</td>
-			  </tr>
-			</table>
-		  </td>
-		</tr>
-	  </table>
-	</td>
+	<th width="25%" nowrap="nowrap" height="25" class="thCornerL">{L_STATISTIC}</th>
+	<th width="25%" height="25" class="thTop">{L_VALUE}</th>
+	<th width="25%" nowrap="nowrap" height="25" class="thTop">{L_STATISTIC}</th>
+	<th width="25%" height="25" class="thCornerR">{L_VALUE}</th>
+  </tr>
+  <tr> 
+	<td class="row1" nowrap="nowrap">{L_NUMBER_POSTS}:</td>
+	<td class="row2"><b>{NUMBER_OF_POSTS}</b></td>
+	<td class="row1" nowrap="nowrap">{L_POSTS_PER_DAY}:</td>
+	<td class="row2"><b>{POSTS_PER_DAY}</b></td>
+  </tr>
+  <tr> 
+	<td class="row1" nowrap="nowrap">{L_NUMBER_TOPICS}:</td>
+	<td class="row2"><b>{NUMBER_OF_TOPICS}</b></td>
+	<td class="row1" nowrap="nowrap">{L_TOPICS_PER_DAY}:</td>
+	<td class="row2"><b>{TOPICS_PER_DAY}</b></td>
+  </tr>
+  <tr> 
+	<td class="row1" nowrap="nowrap">{L_NUMBER_USERS}:</td>
+	<td class="row2"><b>{NUMBER_OF_USERS}</b></td>
+	<td class="row1" nowrap="nowrap">{L_USERS_PER_DAY}:</td>
+	<td class="row2"><b>{USERS_PER_DAY}</b></td>
+  </tr>
+  <tr> 
+	<td class="row1" nowrap="nowrap">{L_BOARD_STARTED}:</td>
+	<td class="row2"><b>{START_DATE}</b></td>
+	<td class="row1" nowrap="nowrap">{L_AVATAR_DIR_SIZE}:</td>
+	<td class="row2"><b>{AVATAR_DIR_SIZE}</b></td>
+  </tr>
+  <tr> 
+	<td class="row1" nowrap="nowrap">{L_DB_SIZE}:</td>
+	<td class="row2"><b>{DB_SIZE}</b></td>
+	<td class="row1" nowrap="nowrap">&nbsp;</td>
+	<td class="row2">&nbsp;</td>
   </tr>
 </table>
 <h1>{L_WHO_IS_ONLINE}</h1>
 
-<table width="99%" cellspacing="0" cellpadding="2" border="0">
+<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
   <tr> 
-	<td align="left" colspan="2" class="forumline"> 
-	  <table width="100%" border="0" cellspacing="0" cellpadding="1">
-		<tr> 
-		  <td class="innerline"> 
-			<table width="100%" cellpadding="4" cellspacing="1" border="0">
-			  <tr> 
-				<th width="25%" height="25">&nbsp;{L_USERNAME}&nbsp;</th>
-				<th width="25%" height="25">&nbsp;{L_LAST_UPDATE}&nbsp;</th>
-				<th width="25%" height="25">&nbsp;{L_LOCATION}&nbsp;</th>
-				<th width="25%" height="25">&nbsp;{L_IP_ADDRESS}&nbsp;</th>
-			  </tr>
-			  <!-- BEGIN userrow -->
-			  <tr> 
-				<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen"><a href="{userrow.U_USER_PROFILE}">{userrow.USERNAME}</a></span>&nbsp;</td>
-				<td width="25%" align="center" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.LASTUPDATE}</span>&nbsp;</td>
-				<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.LOCATION}</span>&nbsp;</td>
-				<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.IP_ADDRESS}</span>&nbsp;</td>
-			  </tr>
-			  <!-- END userrow -->
-			</table>
-		  </td>
-		</tr>
-	  </table>
-	</td>
+	<th width="25%" height="25" class="thCornerL">&nbsp;{L_USERNAME}&nbsp;</th>
+	<th width="25%" height="25" class="thTop">&nbsp;{L_LAST_UPDATE}&nbsp;</th>
+	<th width="25%" height="25" class="thTop">&nbsp;{L_LOCATION}&nbsp;</th>
+	<th width="25%" height="25" class="thCornerR">&nbsp;{L_IP_ADDRESS}&nbsp;</th>
   </tr>
+  <!-- BEGIN userrow -->
+  <tr> 
+	<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen"><a href="{userrow.U_USER_PROFILE}">{userrow.USERNAME}</a></span>&nbsp;</td>
+	<td width="25%" align="center" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.LASTUPDATE}</span>&nbsp;</td>
+	<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.LOCATION}</span>&nbsp;</td>
+	<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.IP_ADDRESS}</span>&nbsp;</td>
+  </tr>
+  <!-- END userrow -->
 </table>
-<br clear="all" />
+<br />
diff --git a/phpBB/templates/subSilver/admin/index_navigate.tpl b/phpBB/templates/subSilver/admin/index_navigate.tpl
index 3b08748951..b2b66ec68f 100644
--- a/phpBB/templates/subSilver/admin/index_navigate.tpl
+++ b/phpBB/templates/subSilver/admin/index_navigate.tpl
@@ -5,42 +5,32 @@
   </tr>
   <tr> 
 	<td align="center" > 
-	  <table width="99%" cellspacing="0" cellpadding="2" border="0">
+	  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
 		<tr> 
-		  <td align="left" colspan="2" class="forumline"> 
-			<table width="100%" border="0" cellspacing="0" cellpadding="1">
-			  <tr> 
-				<td class="innerline"> 
-				  <table width="100%" cellpadding="4" cellspacing="1" border="0">
-					<tr> 
-					  <th height="25" class="secondary"><b>Forum Configuration</b></th>
-					</tr>
-					<tr> 
-					  <td class="row1"><span class="genmed"><a href="{U_ADMIN_INDEX}" target="main" class="genmed">{L_ADMIN_INDEX}</a></span></td>
-					</tr>
-					<tr> 
-					  <td class="row1"><span class="genmed"><a href="{U_BOARD_INDEX}" target="_top" class="genmed">Forum Home</a></span></td>
-					</tr>
-					<tr> 
-					  <td class="row1"><span class="genmed"><a href="{U_BOARD_INDEX}" target="main" class="genmed">Preview Forum</a></span></td>
-					</tr>
-					<!-- BEGIN catrow -->
-					<tr> 
-					  <td height="28" class="cat"><span class="cattitle">{catrow.CATNAME}</span></td>
-					</tr>
-					<!-- BEGIN actionrow -->
-					<tr> 
-					  <td class="row1"><span class="genmed"><a href="{catrow.actionrow.FILE}"  target="main" class="genmed">{catrow.actionrow.ACTIONNAME}</a></span> 
-					  </td>
-					</tr>
-					<!-- END actionrow -->
-					<!-- END catrow -->
-				  </table>
-				</td>
-			  </tr>
-			</table>
+		  <th height="25" class="thHead"><b>Forum Configuration</b></th>
+		</tr>
+		<tr> 
+		  <td class="row1"><span class="genmed"><a href="{U_ADMIN_INDEX}" target="main" class="genmed">{L_ADMIN_INDEX}</a></span></td>
+		</tr>
+		<tr> 
+		  <td class="row1"><span class="genmed"><a href="{U_BOARD_INDEX}" target="_top" class="genmed">Forum 
+			Home</a></span></td>
+		</tr>
+		<tr> 
+		  <td class="row1"><span class="genmed"><a href="{U_BOARD_INDEX}" target="main" class="genmed">Preview 
+			Forum</a></span></td>
+		</tr>
+		<!-- BEGIN catrow -->
+		<tr> 
+		  <td height="28" class="catSides"><span class="cattitle">{catrow.CATNAME}</span></td>
+		</tr>
+		<!-- BEGIN actionrow -->
+		<tr> 
+		  <td class="row1"><span class="genmed"><a href="{catrow.actionrow.FILE}"  target="main" class="genmed">{catrow.actionrow.ACTIONNAME}</a></span> 
 		  </td>
 		</tr>
+		<!-- END actionrow -->
+		<!-- END catrow -->
 	  </table>
 	</td>
   </tr>
diff --git a/phpBB/templates/subSilver/admin/page_footer.tpl b/phpBB/templates/subSilver/admin/page_footer.tpl
index 157c661150..f0ed8d51f4 100644
--- a/phpBB/templates/subSilver/admin/page_footer.tpl
+++ b/phpBB/templates/subSilver/admin/page_footer.tpl
@@ -16,10 +16,10 @@
 
 //-->
 <div align="center">
-<span class="gensmall">Powered By <a href="http://www.phpbb.com/" target="_phpbb">phpBB {PHPBB_VERSION}</a> &copy; 2001 phpBB Group</span>
+<span class="copyright">Powered By <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB {PHPBB_VERSION}</a> &copy; 2001 phpBB Group</span>
 </div>
 
-<br clear="all" />
+<br />
 
 </body>
 </html>
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/admin/page_header.tpl b/phpBB/templates/subSilver/admin/page_header.tpl
index 0435b9de0e..65468115f5 100644
--- a/phpBB/templates/subSilver/admin/page_header.tpl
+++ b/phpBB/templates/subSilver/admin/page_header.tpl
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
+<head>
 <meta name="MSSmartTagsPreventParsing" content="TRUE">
+{META}
 <link rel="stylesheet" href="../templates/subSilver/admin_styles.css" type="text/css">
 
-{META}
-<head>
 <title>phpBB - {SITENAME}</title>
 
 </head>
diff --git a/phpBB/templates/subSilver/admin/smile_action.tpl b/phpBB/templates/subSilver/admin/smile_action.tpl
index 2d01b17eb8..a7a8a0b44b 100644
--- a/phpBB/templates/subSilver/admin/smile_action.tpl
+++ b/phpBB/templates/subSilver/admin/smile_action.tpl
@@ -1,19 +1,12 @@
 
-<br clear="all" /><br />
-
-<table width="85%" cellpadding="1" cellspacing="0" border="0" align="center">
-	<tr>
-		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
-			<tr>
-				<td class="cat" align="center"><span class="cattitle"><b>{L_SMILEY_TITLE}</b></span></td>
-			</tr>
-			<tr>
-				<td class="row2" width="100%" align="center"><span class="gen">{L_SMILEY_ACTION}</span><br>
-				<a href='{S_SMILEY_URL}'>{L_SMILEY_TEXT}</a>
-				</td>
-			</tr>
-		</table></td>
-	</tr>
+<br /><br />
+<table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
+  <tr> 
+	<th class="thHead">{L_SMILEY_TITLE}</th>
+  </tr>
+  <tr> 
+	<td class="row1" width="100%" align="center"><span class="gen">{L_SMILEY_ACTION}</span><br />
+	  <a href='{S_SMILEY_URL}'>{L_SMILEY_TEXT}</a> </td>
+  </tr>
 </table>
-
-<br clear="all" />
+<br />
diff --git a/phpBB/templates/subSilver/admin/smile_edit.tpl b/phpBB/templates/subSilver/admin/smile_edit.tpl
index 0b15de9de2..25e542982c 100644
--- a/phpBB/templates/subSilver/admin/smile_edit.tpl
+++ b/phpBB/templates/subSilver/admin/smile_edit.tpl
@@ -1,5 +1,5 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_SMILEY_TITLE}</h1>
 
@@ -15,9 +15,9 @@ function update_smiley(newimage)
 <form method="post" action="{S_SMILEY_ACTION}">
 <input type="hidden" name="mode" value="{S_HIDDEN_VAR}">
 <input type="hidden" name="id" value="{SMILEY_ID_VAL}">
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<th colspan="2">{L_SMILEY_CONFIG}</th>
+		<th colspan="2" class="thHead">{L_SMILEY_CONFIG}</th>
 	</tr>
 	<tr>
 		<td class="row2">{L_SMILEY_CODE_LBL}</td>
@@ -37,6 +37,6 @@ function update_smiley(newimage)
 		<td class="row2"><input type="text" name="emotion" value="{SMILEY_EMOTION}" /></td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" value="{L_SUBMIT}" /></td>
+		<td class="catBottom" colspan="2" align="center"><input type="submit" value="{L_SUBMIT}" class="mainoption" /></td>
 	</tr>
 </table></form>
diff --git a/phpBB/templates/subSilver/admin/smile_list_body.tpl b/phpBB/templates/subSilver/admin/smile_list_body.tpl
index f2a5ed4b95..5a9f3aafc1 100644
--- a/phpBB/templates/subSilver/admin/smile_list_body.tpl
+++ b/phpBB/templates/subSilver/admin/smile_list_body.tpl
@@ -1,27 +1,27 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_SMILEY_TITLE}</h1>
 
 <P>{L_SMILEY_TEXT}</p>
 
-<form method="GET" action="{S_SMILEY_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="get" action="{S_SMILEY_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<th>{L_CODE}</th>
-		<th>{L_SMILE}</th>
-		<th>{L_EMOT}</th>
-		<th colspan="2">{L_ACTION}</th>
+		<th class="thCornerL">{L_CODE}</th>
+		<th class="thTop">{L_SMILE}</th>
+		<th class="thTop">{L_EMOT}</th>
+		<th colspan="2" class="thCornerR">{L_ACTION}</th>
 	</tr>
 	<!-- BEGIN smiles -->
 	<tr>
-		<td class="row2">{smiles.CODE}</td>
-		<td class="row2"><img src="{smiles.SMILEY_IMG}" alt="{smiles.CODE}" /></td>
-		<td class="row2">{smiles.EMOT}</td>
-		<td class="row2"><a href="{smiles.U_SMILEY_EDIT}">{L_EDIT}</a></td>
-		<td class="row2"><a href="{smiles.U_SMILEY_DELETE}">{L_DELETE}</a></td>
+		<td class="{smiles.ROW_CLASS}">{smiles.CODE}</td>
+		<td class="{smiles.ROW_CLASS}"><img src="{smiles.SMILEY_IMG}" alt="{smiles.CODE}" /></td>
+		<td class="{smiles.ROW_CLASS}">{smiles.EMOT}</td>
+		<td class="{smiles.ROW_CLASS}"><a href="{smiles.U_SMILEY_EDIT}">{L_EDIT}</a></td>
+		<td class="{smiles.ROW_CLASS}"><a href="{smiles.U_SMILEY_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END smiles -->
 	<tr>
-		<td class="cat" colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SMILEY_ADD}" /></td>
+		<td class="catBottom" colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SMILEY_ADD}" class="mainoption" /></td>
 	</tr>
 </table></form>
diff --git a/phpBB/templates/subSilver/admin/smile_result_body.tpl b/phpBB/templates/subSilver/admin/smile_result_body.tpl
index a0c9b5bfc0..a3f878530d 100644
--- a/phpBB/templates/subSilver/admin/smile_result_body.tpl
+++ b/phpBB/templates/subSilver/admin/smile_result_body.tpl
@@ -1,17 +1,12 @@
 
-<br clear="all" /><br />
-
-<table width="85%" cellpadding="1" cellspacing="0" border="0" align="center">
-	<tr>
-		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
-			<tr>
-				<td class="cat" align="center"><span class="cattitle"><b>{L_SMILEY_TITLE}</b></span></td>
-			</tr>
-			<tr>
-				<td class="row2" width="100%" align="center"><span class="gen">{L_SMILEY_ACTION}</span><br /><a href="{U_SMILEY_ADMIN}">{L_SMILEY_TEXT}</a></td>
-			</tr>
-		</table></td>
-	</tr>
+<br /><br />
+<table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
+  <tr> 
+	<th class="thHead">{L_SMILEY_TITLE}</th>
+  </tr>
+  <tr> 
+	<td class="row1" width="100%" align="center"><span class="gen">{L_SMILEY_ACTION}</span><br />
+	  <a href="{U_SMILEY_ADMIN}">{L_SMILEY_TEXT}</a></td>
+  </tr>
 </table>
-
-<br clear="all" />
+<br />
diff --git a/phpBB/templates/subSilver/admin/user_ban_body.tpl b/phpBB/templates/subSilver/admin/user_ban_body.tpl
index fa90dd7fe4..589bf0c6ee 100644
--- a/phpBB/templates/subSilver/admin/user_ban_body.tpl
+++ b/phpBB/templates/subSilver/admin/user_ban_body.tpl
@@ -1,37 +1,44 @@
-
-<br clear="all" />
-
+ <br />
 <h1>{L_BAN_TITLE}</h1>
-
 <p>{L_BAN_EXPLAIN}</p>
-
-<form method="post" action="{S_BAN_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<td class="cat" colspan="2" align="center">{L_BAN_USER}</td>
+<form method="post" action="{S_BAN_ACTION}">
+  <table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <th class="thHead" colspan="2">{L_BAN_USER}</th>
 	</tr>
-	<tr>
-		<td class="row1">{L_USERNAME}:&nbsp;<br /><span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
-		<td class="row2">{S_USERLIST_SELECT}</td>
+	<tr> 
+	  <td class="row1">{L_USERNAME}:&nbsp;<br />
+		<span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
+	  <td class="row2">{S_USERLIST_SELECT}</td>
 	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center">{L_BAN_IP}</td>
+	<tr> 
+	  <td class="catSides" colspan="2" align="center"><span class="cattitle">{L_BAN_IP}</span></td>
 	</tr>
-	<tr>
-		<td class="row1">{L_IP_OR_HOSTNAME}:&nbsp;<br /><span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" name="ip" size="35" /></td>
+	<tr> 
+	  <td class="row1">{L_IP_OR_HOSTNAME}:&nbsp;<br />
+		<span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
+	  <td class="row2">
+		<input type="text" name="ip" size="35" />
+	  </td>
 	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center">{L_BAN_EMAIL}</td>
+	<tr> 
+	  <td class="catSides" colspan="2" align="center"><span class="cattitle">{L_BAN_EMAIL}</span></td>
 	</tr>
-	<tr>
-		<td class="row1">{L_EMAIL_ADDRESS}:&nbsp;<br /><span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" name="email" size="35" /></td>
+	<tr> 
+	  <td class="row1">{L_EMAIL_ADDRESS}:&nbsp;<br />
+		<span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
+	  <td class="row2">
+		<input type="text" name="email" size="35" />
+	  </td>
 	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></td>
+	<tr> 
+	  <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
+		&nbsp;&nbsp;
+		<input type="reset" value="{L_RESET}" class="liteoption" />
+	  </td>
 	</tr>
-</table></form>
-
+  </table>
+</form>
 <p>{L_BAN_EXPLAIN_WARN}</p>
-
 <br	clear="all" />
diff --git a/phpBB/templates/subSilver/admin/user_edit_body.tpl b/phpBB/templates/subSilver/admin/user_edit_body.tpl
index 3871b0d5f3..32826d5aa6 100644
--- a/phpBB/templates/subSilver/admin/user_edit_body.tpl
+++ b/phpBB/templates/subSilver/admin/user_edit_body.tpl
@@ -1,146 +1,253 @@
-<br clear="all" />
-
+<br />
 <h1>{L_USER_TITLE}</h1>
-
 <p>{L_USER_EXPLAIN}</p>
-
-<form action="{S_PROFILE_ACTION}" method="post"><table width="98%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
+<form action="{S_PROFILE_ACTION}" method="post">
+  <table width="98%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <th class="thHead" colspan="2">{L_REGISTRATION_INFO}</th>
+	</tr>
+	<tr> 
+	  <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td>
+	  <td class="row2"> 
+		<input type="text" name="username" size="35" maxlength="40" value="{USERNAME}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td>
+	  <td class="row2"> 
+		<input type="text" name="email" size="35" maxlength="255" value="{EMAIL}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_PASSWORD}: *</span><br />
+		<span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
+	  <td class="row2"> 
+		<input type="password" name="password" size="35" maxlength="100" value="{PASSWORD}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_CONFIRM} {L_PASSWORD}: * </span><br />
+		<span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td>
+	  <td class="row2"> 
+		<input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="catsides" colspan="2">&nbsp;</td>
+	</tr>
+	<tr> 
+	  <th class="thSides" colspan="2">{L_PROFILE_INFO}</th>
+	</tr>
+	<tr> 
+	  <td class="row2" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td>
+	  <td class="row2"> 
+		<input type="text" name="icq" size="10" maxlength="15" value="{ICQ}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_AIM}:</span></td>
+	  <td class="row2"> 
+		<input type="text" name="aim" size="20" maxlength="255" value="{AIM}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_MESSENGER}:</span></td>
+	  <td class="row2"> 
+		<input type="text" name="msn" size="20" maxlength="255" value="{MSN}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_YAHOO}:</span></td>
+	  <td class="row2"> 
+		<input type="text" name="yim" size="20" maxlength="255" value="{YIM}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_WEBSITE}:</span></td>
+	  <td class="row2"> 
+		<input type="text" name="website" size="35" maxlength="255" value="{WEBSITE}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_LOCATION}:</span></td>
+	  <td class="row2"> 
+		<input type="text" name="location" size="35" maxlength="100" value="{LOCATION}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_OCCUPATION}:</span></td>
+	  <td class="row2"> 
+		<input type="text" name="occupation" size="35" maxlength="100" value="{OCCUPATION}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_INTERESTS}:</span></td>
+	  <td class="row2"> 
+		<input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br />
+		<span class="gensmall">{L_SIGNATURE_EXPLAIN}<br />
+		<br />
+		{L_HTML_IS} <u>{HTML_STATUS}</u><br />
+		{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />
+		{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
+	  <td class="row2"> 
+		<textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea>
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="catsides" colspan="2"><span class="cattitle">&nbsp;</span></td>
+	</tr>
+	<tr> 
+	  <th class="thSides" colspan="2">{L_PREFERENCES}</th>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO} />
+		<span class="gen">{L_NO}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_HIDE_USER}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="hideonline" value="1" {HIDE_USER_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="hideonline" value="0" {HIDE_USER_NO} />
+		<span class="gen">{L_NO}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} />
+		<span class="gen">{L_NO}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} />
+		<span class="gen">{L_NO}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_BBCODE}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO} />
+		<span class="gen">{L_NO}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_HTML}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO} />
+		<span class="gen">{L_NO}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_SMILIES}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO} />
+		<span class="gen">{L_NO}</span></td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_BOARD_LANGUAGE}:</span></td>
+	  <td class="row2">{LANGUAGE_SELECT}</td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_BOARD_STYLE}:</span></td>
+	  <td class="row2">{STYLE_SELECT}</td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_TIMEZONE}:</span></td>
+	  <td class="row2">{TIMEZONE_SELECT}</td>
+	</tr>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br />
+		<span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
+	  <td class="row2"> 
+		<input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="catSides" colspan="2"><span class="cattitle">&nbsp;</span></td>
+	</tr>
+	<tr> 
+	  <th class="thSides" colspan="2">{L_AVATAR_PANEL}</th>
+	</tr>
+	<tr> 
+	  <td class="row1" colspan="2" align="center"> 
+		<table width="70%" cellspacing="2" cellpadding="0" border="0">
+		  <tr> 
+			<td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
+			<td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />
+			  {AVATAR}<br />
+			  <input type="checkbox" name="avatardel" />
+			  &nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
+		  </tr>
+		</table>
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="catSides" colspan="2">&nbsp;</td>
 	</tr>
 	<tr>
-		<td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td>
-		<td class="row2"><input type="text" name="username" size="35" maxlength="40" value="{USERNAME}" /></td>
+	  <th class="thSides" colspan="2">{L_SPECIAL}</th>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td>
-		<td class="row2"><input type="text" name="email" size="35" maxlength="255" value="{EMAIL}" /></td>
+	  <td class="row1" colspan="2"><span class="gensmall">{L_SPECIAL_EXPLAIN}</span></td>
 	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_PASSWORD}: *</span><br /><span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
-		<td class="row2"><input type="password" name="password" size="35" maxlength="100" value="{PASSWORD}" /></td>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_USER_ACTIVE}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="user_status" value="1" {USER_ACTIVE_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="user_status" value="0" {USER_ACTIVE_NO} />
+		<span class="gen">{L_NO}</span></td>
 	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_CONFIRM} {L_PASSWORD}: * </span><br /><span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td>
-		<td class="row2"><input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_ALLOW_PM}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="user_allowpm" value="1" {ALLOW_PM_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="user_allowpm" value="0" {ALLOW_PM_NO} />
+		<span class="gen">{L_NO}</span></td>
 	</tr>
-	<tr>
-		<td class="cat" colspan="2"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_ALLOW_AVATAR}:</span></td>
+	  <td class="row2"> 
+		<input type="radio" name="user_allowavatar" value="1" {ALLOW_AVATAR_YES} />
+		<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+		<input type="radio" name="user_allowavatar" value="0" {ALLOW_AVATAR_NO} />
+		<span class="gen">{L_NO}</span></td>
 	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td>
-		<td class="row2"><input type="text" name="icq" size="10" maxlength="15" value="{ICQ}" /></td>
+	<tr> 
+	  <td class="row1"><span class="gen">{L_DELETE_USER}?</span></td>
+	  <td class="row2"> 
+		<input type="checkbox" name="deleteuser">
+		{L_DELETE_USER_EXPLAIN}</td>
 	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_AIM}:</span></td>
-		<td class="row2"><input type="text" name="aim" size="20" maxlength="255" value="{AIM}" /></td>
+	<tr> 
+	  <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS} 
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
+		&nbsp;&nbsp; 
+		<input type="reset" value="{L_RESET}" class="liteoption" />
+	  </td>
 	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_MESSENGER}:</span></td>
-		<td class="row2"><input type="text" name="msn" size="20" maxlength="255" value="{MSN}" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_YAHOO}:</span></td>
-		<td class="row2"><input type="text" name="yim" size="20" maxlength="255" value="{YIM}" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_WEBSITE}:</span></td>
-		<td class="row2"><input type="text" name="website" size="35" maxlength="255" value="{WEBSITE}" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_LOCATION}:</span></td>
-		<td class="row2"><input type="text" name="location" size="35" maxlength="100" value="{LOCATION}" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_OCCUPATION}:</span></td>
-		<td class="row2"><input type="text" name="occupation" size="35" maxlength="100" value="{OCCUPATION}" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_INTERESTS}:</span></td>
-		<td class="row2"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /><br />{L_HTML_IS} <u>{HTML_STATUS}</u><br />{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
-		<td class="row2"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td>
-		<td class="row2"><input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_HIDE_USER}:</span></td>
-		<td class="row2"><input type="radio" name="hideonline" value="1" {HIDE_USER_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="hideonline" value="0" {HIDE_USER_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td>
-		<td class="row2"><input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td>
-		<td class="row2"><input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_ALWAYS_ALLOW_BBCODE}:</span></td>
-		<td class="row2"><input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_ALWAYS_ALLOW_HTML}:</span></td>
-		<td class="row2"><input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_ALWAYS_ALLOW_SMILIES}:</span></td>
-		<td class="row2"><input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_BOARD_LANGUAGE}:</span></td>
-		<td class="row2">{LANGUAGE_SELECT}</td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_BOARD_STYLE}:</span></td>
-		<td class="row2">{STYLE_SELECT}</td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_TIMEZONE}:</span></td>
-		<td class="row2">{TIMEZONE_SELECT}</td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td>
-	</tr>
-	<tr>
-		<td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0">
-	<tr>
-		<td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
-		<td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />{AVATAR}<br /><input type="checkbox" name="avatardel" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
-	</tr>
-</table></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2"><span class="cattitle"><B>{L_SPECIAL}</b></span><br /><span class="gensmall">{L_SPECIAL_EXPLAIN}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_USER_ACTIVE}:</span></td>
-		<td class="row2"><input type="radio" name="user_status" value="1" {USER_ACTIVE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="user_status" value="0" {USER_ACTIVE_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_ALLOW_PM}:</span></td>
-		<td class="row2"><input type="radio" name="user_allowpm" value="1" {ALLOW_PM_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="user_allowpm" value="0" {ALLOW_PM_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_ALLOW_AVATAR}:</span></td>
-		<td class="row2"><input type="radio" name="user_allowavatar" value="1" {ALLOW_AVATAR_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="user_allowavatar" value="0" {ALLOW_AVATAR_NO} /> <span class="gen">{L_NO}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><span class="gen">{L_DELETE_USER}?</span></td>
-		<td class="row2"><input type="checkbox" name="deleteuser">{L_DELETE_USER_EXPLAIN}</td>
-	</tr>
-	<tr>
-	   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></td>
-	</tr>
-</table></form>
+  </table>
+</form>
diff --git a/phpBB/templates/subSilver/admin/user_email.tpl b/phpBB/templates/subSilver/admin/user_email.tpl
index 63605aedb9..a801214f0b 100644
--- a/phpBB/templates/subSilver/admin/user_email.tpl
+++ b/phpBB/templates/subSilver/admin/user_email.tpl
@@ -1,34 +1,36 @@
-<br clear="all" />
+<br />
 <b>{L_NOTICE}</b>
-<br clear="all" />
+<br />
 
 <h1>{L_EMAIL_TITLE}</h1>
 
 <p>{L_EMAIL_EXPLAIN}</p>
-
-<table cellspacing="1" cellpadding="4" border="0" align="center">
-        <tr>
-                <td class="cat" align="center"><span class="cattitle"><b>{L_COMPOSE}</b></span></td>
-        </tr>
-        <tr>
-		<form method="post" action="{S_USER_ACTION}">
-                <td class="row1" align="center">{L_GROUP_SELECT}&nbsp;&nbsp;&nbsp;{S_GROUP_SELECT}</td>
+<form method="post" action="{S_USER_ACTION}">
+  <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <th class="thHead" colspan="2">{L_COMPOSE}</th>
 	</tr>
-	<tr>
-		<td class="row2" align="center">{L_EMAIL_SUBJECT}&nbsp;&nbsp;&nbsp;<input type="text" name="{S_EMAIL_SUBJECT}">&nbsp;</td>
+	<tr> 
+	  <td class="row1" align="right"><b>{L_GROUP_SELECT}</b></td>
+	  <td class="row2" align="left">{S_GROUP_SELECT}</td>
 	</tr>
-	<tr>
-		<td class="row3" align="center">{L_EMAIL_MSG}</td>
+	<tr> 
+	  <td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
+	  <td class="row2"><span class="gen"> 
+		<input type="text" name="{S_EMAIL_SUBJECT}{S_EMAIL_SUBJECT}" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" />
+		</span></td>
 	</tr>
-	<tr>
-		<td class="row4" align="center">
-		<textarea name="{S_EMAIL_MSG}" ROWS = 15 COLS = 40></textarea>
+	<tr> 
+	  <td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span> 
+	  <td class="row2"><span class="gen"> 
+		<textarea name="{S_EMAIL_MSG}" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post"></textarea>
+		</span> 
 	</tr>
-	<tr>
-		<td class="row5" align="center"><input type="submit" value="{L_EMAIL}" name="submit">&nbsp;</td>
-        </tr>	
-		</form>
+	<tr> 
+	  <td class="catBottom" align="center" colspan="2"> 
+		<input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" />
+		&nbsp;</td>
 	</tr>
-</table>
-
-<br clear="all" />
+  </table>
+</form>
+<br />
diff --git a/phpBB/templates/subSilver/admin/user_select_body.tpl b/phpBB/templates/subSilver/admin/user_select_body.tpl
index b799938d8f..4a68f364b0 100644
--- a/phpBB/templates/subSilver/admin/user_select_body.tpl
+++ b/phpBB/templates/subSilver/admin/user_select_body.tpl
@@ -1,17 +1,18 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_USER_TITLE}</h1>
 
 <p>{L_USER_EXPLAIN}</p>
-
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="get" action="{S_USER_ACTION}">
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<td class="cat" align="center"><span class="cattitle"><b>{L_USER_SELECT}</b></span></td>
+		
+	<th class="thHead" align="center">{L_USER_SELECT}</th>
+	</tr>
+	<tr>
+		<td class="row1" align="center">{S_USER_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}" name="submit" class="mainoption" />&nbsp;</td>
 	</tr>
-	<tr><form method="get" action="{S_USER_ACTION}">
-		<td class="row1" align="center">{S_USER_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}" name="submit">&nbsp;</td>
-	</form></tr>
 </table>
-
-<br clear="all" />
+</form>
+<br />
diff --git a/phpBB/templates/subSilver/admin/user_unban_body.tpl b/phpBB/templates/subSilver/admin/user_unban_body.tpl
index 1534b68d25..e95554c323 100644
--- a/phpBB/templates/subSilver/admin/user_unban_body.tpl
+++ b/phpBB/templates/subSilver/admin/user_unban_body.tpl
@@ -1,35 +1,39 @@
-
-<br clear="all" />
-
+ <br />
 <h1>{L_BAN_TITLE}</h1>
-
 <p>{L_BAN_EXPLAIN}</p>
-
-<form method="post" action="{S_BAN_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<td class="cat" colspan="2" align="center">{L_BAN_USER}</td>
+<form method="post" action="{S_BAN_ACTION}">
+  <table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <th class="thHead" colspan="2">{L_BAN_USER}</th>
 	</tr>
-	<tr>
-		<td class="row1">{L_USERNAME}:&nbsp;<br /><span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
-		<td class="row2">{S_USERLIST_SELECT}</td>
+	<tr> 
+	  <td class="row1">{L_USERNAME}:&nbsp;<br />
+		<span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
+	  <td class="row2">{S_USERLIST_SELECT}</td>
 	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center">{L_BAN_IP}</td>
+	<tr> 
+	  <td class="catSides" colspan="2" align="center"><span class="cattitle">{L_BAN_IP}</span></td>
 	</tr>
-	<tr>
-		<td class="row1">{L_IP_OR_HOSTNAME}:&nbsp;<br /><span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
-		<td class="row2">{S_IPLIST_SELECT}</td>
+	<tr> 
+	  <td class="row1">{L_IP_OR_HOSTNAME}:&nbsp;<br />
+		<span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
+	  <td class="row2">{S_IPLIST_SELECT}</td>
 	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center">{L_BAN_EMAIL}</td>
+	<tr> 
+	  <td class="catSides" colspan="2" align="center"><span class="cattitle">{L_BAN_EMAIL}</span></td>
 	</tr>
-	<tr>
-		<td class="row1">{L_EMAIL_ADDRESS}:&nbsp;<br /><span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
-		<td class="row2">{S_EMAILLIST_SELECT}</td>
+	<tr> 
+	  <td class="row1">{L_EMAIL_ADDRESS}:&nbsp;<br />
+		<span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
+	  <td class="row2">{S_EMAILLIST_SELECT}</td>
 	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></td>
+	<tr> 
+	  <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
+		&nbsp;&nbsp;
+		<input type="reset" value="{L_RESET}" class="liteoption" />
+	  </td>
 	</tr>
-</table></form>
-
+  </table>
+</form>
 <br	clear="all" />
diff --git a/phpBB/templates/subSilver/admin/words_edit_body.tpl b/phpBB/templates/subSilver/admin/words_edit_body.tpl
index b3312a9198..579548cece 100644
--- a/phpBB/templates/subSilver/admin/words_edit_body.tpl
+++ b/phpBB/templates/subSilver/admin/words_edit_body.tpl
@@ -1,23 +1,23 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_WORDS_TITLE}</h1>
 
 <p>{L_WORDS_TEXT}</p>
 
-<form method="post" action="{S_WORDS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="post" action="{S_WORDS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<th colspan="2">{L_WORD_CENSOR}</th>
+		<th colspan="2" class="thHead">{L_WORD_CENSOR}</th>
 	</tr>
 	<tr>
-		<td class="row2">{L_WORD}</td>
+		<td class="row1">{L_WORD}</td>
 		<td class="row2"><input type="text" name="word" value="{WORD}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_REPLACEMENT}</td>
-		<td class="row1"><input type="text" name="replacement" value="{REPLACEMENT}" /></td>
+		<td class="row2"><input type="text" name="replacement" value="{REPLACEMENT}" /></td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="save" value="{L_SUBMIT}" /></td>
+		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="save" value="{L_SUBMIT}" class="mainoption" /></td>
 	</tr>
 </table></form>
diff --git a/phpBB/templates/subSilver/admin/words_list_body.tpl b/phpBB/templates/subSilver/admin/words_list_body.tpl
index 1e39edb767..48235d7614 100644
--- a/phpBB/templates/subSilver/admin/words_list_body.tpl
+++ b/phpBB/templates/subSilver/admin/words_list_body.tpl
@@ -1,25 +1,25 @@
 
-<br clear="all" />
+<br />
 
 <h1>{L_WORDS_TITLE}</h1>
 
 <P>{L_WORDS_TEXT}</p>
 
-<form method="POST" action="{S_WORDS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="POST" action="{S_WORDS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<th>{L_WORD}</th>
-		<th>{L_REPLACEMENT}</th>
-		<th colspan="2">{L_ACTION}</th>
+		<th class="thCornerL">{L_WORD}</th>
+		<th class="thTop">{L_REPLACEMENT}</th>
+		<th colspan="2" class="thCornerR">{L_ACTION}</th>
 	</tr>
 	<!-- BEGIN words -->
 	<tr>
-		<td class="row2" align="center">{words.WORD}</td>
-		<td class="row2" align="center">{words.REPLACEMENT}</td>
-		<td class="row2"><a href="{words.U_WORD_EDIT}">{L_EDIT}</a></td>
-		<td class="row2"><a href="{words.U_WORD_DELETE}">{L_DELETE}</a></td>
+		<td class="{words.ROW_CLASS}" align="center">{words.WORD}</td>
+		<td class="{words.ROW_CLASS}" align="center">{words.REPLACEMENT}</td>
+		<td class="{words.ROW_CLASS}"><a href="{words.U_WORD_EDIT}">{L_EDIT}</a></td>
+		<td class="{words.ROW_CLASS}"><a href="{words.U_WORD_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END words -->
 	<tr>
-		<td colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_ADD_WORD}" /></td>
+		<td colspan="5" align="center" class="catBottom">{S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_ADD_WORD}" class="mainoption" /></td>
 	</tr>
 </table></form>
diff --git a/phpBB/templates/subSilver/admin_styles.css b/phpBB/templates/subSilver/admin_styles.css
index 4a721493e0..286185f136 100644
--- a/phpBB/templates/subSilver/admin_styles.css
+++ b/phpBB/templates/subSilver/admin_styles.css
@@ -1,120 +1,149 @@
 /* subSilver Theme for phpBB2
- * Created by Tom @ subBlue design
+ * Created by subBlue design
  * http://www.subBlue.com
  */
 
-body { background-color:#E5E5E5;
+body { 	background-color:#E5E5E5;
 		scrollbar-face-color: #C8D1D7; scrollbar-highlight-color: #EAF0F7;
 		scrollbar-shadow-color: #95AFC4; scrollbar-3dlight-color: #D6DDE2;
 		scrollbar-arrow-color:  #006699; scrollbar-track-color: #EFEFEF;
 		scrollbar-darkshadow-color: #7294AF;
 }
 
-font	{ font-family: Verdana, Arial, Helvetica, sans-serif; }
-td		{ font-family: Verdana, Arial, Helvetica, sans-serif; font-size : 12px;}
-th		{ font-family: Verdana, Arial, Helvetica, sans-serif; }
-P		{ font-family: Verdana, Arial, Helvetica, sans-serif; font-size:12px }
-hr		{ height:1px;color:;}
+font	{ font-family: Verdana, Arial, Helvetica, sans-serif }
+td		{ font-family: Verdana, Arial, Helvetica, sans-serif }
+th		{ font-family: Verdana, Arial, Helvetica, sans-serif }
+P		{ font-family: Verdana, Arial, Helvetica, sans-serif }
+hr		{ height: 1px; color:#c2cdd6 }
 
 
 /* Forum colours */
-.bodyline	{ background-color:#AEBDC4 }
-.forumline	{ background-color:#006699 }
-.innerline	{ background-color:#FFFFFF }
-.innerarea	{ background-color:#FFFFFF }
+.bodyline	{ background-color:#FFFFFF; border: #AEBDC4; border-style: solid; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px }
+.forumline	{ background-color:#FFFFFF; border: 2px #006699 solid }
 
-/* Table cell colours and backgrounds */
-TH	{background-color:#1B7CAD;font-size:11px;font-weight:bold; color:#FFB163; background-image: url(images/cellpic3.gif)}
-TH.secondary	{font-size:12px}
-TD.tablebg	{background-color:#000000}
-TD.cat	{background-color:#CBD3D9;background-image: url(images/cellpic1.gif)}
-TD.row1	{background-color:#EFEFEF}
-TD.row2	{background-color:#DEE3E7}
-TD.row3	{background-color:#c2cdd6}
-TD.rowpic	{background-color:#DEE3E7;background-image: url(images/cellpic2.jpg)}
-td.icqback	{background-image: url(images/icon_icq_add.gif)}
+
+/* Main table cell colours and backgrounds */
+TH			{ background-color: #1B7CAD; height: 25px; font-size: 11px; line-height : 100%; font-weight: bold; color: #FFB163; background-image: url(images/cellpic3.gif) }
+TD.tablebg	{ background-color: #000000 }
+TD.cat		{ background-color: #CBD3D9; height: 28px; background-image: url(images/cellpic1.gif) }
+TD.row1		{ background-color: #EFEFEF }
+TD.row2		{ background-color: #DEE3E7 }
+TD.row3		{ background-color: #c2cdd6 }
+TD.spaceRow { background-color: #c2cdd6; border: #FFFFFF; border-style: solid; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
+TD.rowpic	{ background-color: #FFFFFF; background-image: url(images/cellpic2.jpg); background-repeat: repeat-y }
+td.icqback	{ background-image: url(images/icon_icq_add.gif); background-repeat: no-repeat }
+
+
+/* Setting additional nice borders for the main table cells */
+TD.catHead,TD.catSides,TD.catLeft,TD.catRight,TD.catBottom { background-color:#CBD3D9; height: 28px; background-image: url(images/cellpic1.gif); border: #FFFFFF; border-style: solid; }
+
+TD.catHead	 { height: 29px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }
+TD.catSides  { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
+TD.catLeft	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px }
+TD.catRight	 { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
+TD.catBottom { height: 29px; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px }
+
+TH.thHead,TH.thSides,TH.thTop,TH.thLeft,TH.thRight,TH.thBottom,TH.thCornerL,TH.thCornerR { border: #FFFFFF; border-style: solid; }
+
+TH.thHead	 { font-weight : bold; font-size: 12px; height: 25px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }
+TH.thSides	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
+TH.thTop	 { border-left-width: 0px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px }
+TH.thLeft	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px }
+TH.thRight	 { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
+TH.thBottom  { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px }
+TH.thCornerL { border-left-width: 1px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px }
+TH.thCornerR { border-left-width: 0px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }
+
+TD.row3Right	 { background-color: #c2cdd6; border: #FFFFFF; border-style: solid;  border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
 
 /* The largest text used in the index page title and toptic title etc. */
-h1, .titlemedium	{ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000}
+.maintitle, h1,h2	{ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000;}
 
 
 /* General normal text */
-.gen		{ font-size : 12px; color : #000000 }
-a.gen		{ color: #006699; text-decoration: none }
-a:hover.gen	{ color: #C23030; text-decoration: underline }
+.gen, p, td		{ font-size : 12px; color : #000000; }
+a.gen		{ color: #006699; text-decoration: none; }
+a:hover.gen{ color: #C23030; text-decoration: underline; }
 
 /* General medium text */
-.genmed		{ font-size : 11px; color : #000000 }
-a.genmed		{ text-decoration: none; color : #006699 }
-a:hover.genmed	{ text-decoration: underline; color : #C23030 }
+.genmed		{ font-size : 11px; color : #000000; }
+a.genmed		{ text-decoration: none; color : #006699; }
+a:hover.genmed	{ text-decoration: underline; color : #C23030; }
 
 
 /* General small */
-.gensmall		{ font-size : 10px; color : #000000 }
-a.gensmall		{ color: #006699; text-decoration: none }
-a:hover.gensmall	{ color: #C23030; text-decoration: underline }
+.gensmall		{ font-size : 10px; color : #000000; }
+a.gensmall		{ color: #006699; text-decoration: none; }
+a:hover.gensmall	{ color: #C23030; text-decoration: underline; }
 
 
 /* The register, login, search etc links at the top of the page */
 .mainmenu			{ font-size : 11px; text-decoration : none; color : #000000 }
-a.mainmenu			{ text-decoration: none; color : #006699  }
-a:hover.mainmenu	{ text-decoration: underline; color : #C23030}
+a.mainmenu			{ text-decoration: none; color : #006699;  }
+a:hover.mainmenu	{ text-decoration: underline; color : #C23030; }
 
 
 /* Forum categories */
-.cattitle			{ font-size : 12px; letter-spacing: 1px; font-weight : bold; text-decoration : none; color : #004c75 }
-a.cattitle			{ text-decoration: none; color : #004c75 }
-a:hover.cattitle	{ text-decoration: underline }
+.cattitle			{ font-size : 12px; line-height : 100%; letter-spacing: 1px; font-weight : bold; text-decoration : none; color : #004c75 }
+a.cattitle			{ text-decoration: none; color : #004c75; }
+a:hover.cattitle	{ text-decoration: underline; }
 
 
 /* Forum title: Text and link to the forums used in: index.php */
-.forumlink			{ font-size : 12px; font-weight : bold; text-decoration : none; color : #136C99 }
-a.forumlink			{ text-decoration: none; color : #136C99 }
-a:hover.forumlink	{ text-decoration: underline; color : #D68000 }
+.forumlink			{ font-size : 12px; font-weight : bold; text-decoration : none; color : #136C99; }
+a.forumlink			{ text-decoration: none; color : #136C99; }
+a:hover.forumlink	{ text-decoration: underline; color : #D68000; }
 
 
 /* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */
-.nav			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000}
-a.nav			{ text-decoration: none; color : #006699 }
-a:hover.nav		{ text-decoration: underline }
+.nav			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000;}
+a.nav			{ text-decoration: none; color : #006699; }
+a:hover.nav		{ text-decoration: underline; }
 
 
 /* titles for the topics: can specify viewed link colour too */
-.topictitle			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000 }
-a.topictitle		{ text-decoration: none; color : #006699 }
-a:hover.topictitle	{ text-decoration: underline; color : #D68000 }
-a:visited.topictitle	{ text-decoration: none; color : #5584AA }
+.topictitle			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000; }
+a.topictitle		{ text-decoration: none; color : #006699; }
+a:hover.topictitle	{ text-decoration: underline; color : #D68000; }
+a:visited.topictitle	{ text-decoration: none; color : #5584AA; }
 
 
 /* Name of poster in viewmsg.php and viewtopic.php and other places */
-.name			{ font-size : 11px; text-decoration : none; color : #000000}
-a.name			{ color: #006699; text-decoration: none}
-a.name:hover	{ color: #C23030; text-decoration: underline}
+.name			{ font-size : 11px; text-decoration : none; color : #000000;}
+a.name			{ color: #006699; text-decoration: none;}
+a.name:hover	{ color: #C23030; text-decoration: underline;}
 
 
 /* Location, number of posts, post date etc */
-.postdetails		{ font-size : 10px; color : #000000 }
-a.postdetails		{ color: #006699; text-decoration: none }
-a:hover.postdetails	{ color: #C23030; text-decoration: underline }
+.postdetails		{ font-size : 10px; color : #000000; }
+a.postdetails		{ color: #006699; text-decoration: none; }
+a:hover.postdetails	{ color: #C23030; text-decoration: underline; }
 
 
 /* The content of the posts (body of text) */
-.postbody			{ font-size : 12px; line-height : 150%; color : #000000 }
-a.postbody			{ text-decoration: none; color : #0176BC }
-a:hover.postbody	{ text-decoration: underline; color : #C23030 }
+.postbody { font-size : 12px; line-height: 150%}
+
+a.postlink	{ text-decoration: none; color : #006699 }
+a:hover.postlink { text-decoration: underline; color : #C23030 }
 
 
 /* Quote Code (currently not used) */
-.code		{ font-family:Courier, Courier New; font-size:11px; color: #006600; line-height: 150% }
-.quot		{ font-family:Verdana, Arial; font-size:11px; color: #444444; line-height: 150% }
-.signature	{ font-size : 11px; font-weight : plain; text-decoration : none; line-height : 150%; color : #333366 }
-.editedby	{ font-size : 10px; line-height : 100%; color : #333333 }
+.code	{ font-family: Courier, Courier New; font-size: 11px; color: #006600;
+		  background-color: #FAFAFA; border: #c2cdd6; border-style: solid;
+		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
+		}
+.quote	{ font-family: Verdana, Arial; font-size: 11px; color: #444444; line-height: 125%;
+		  background-color: #FAFAFA; border: #c2cdd6; border-style: solid;
+		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
+		}
+.signature	{ font-size : 11px; text-decoration : none; line-height : 150%; color : #333366; }
+.editedby	{ font-size : 10px; line-height : 100%; color : #333333; }
 
 
 /* Form elements */
 input,textarea, select {
 color : #000000;
-font-family : Verdana, Arial, Helvetica, sans-serif;;
+font-family : Verdana, Arial, Helvetica, sans-serif;
 font-size : 11px;
 font-weight : normal;
 border-color : #000000;
@@ -138,22 +167,23 @@ font-size : 11px;
 
 /* The main submit button option */
 input.mainoption {
-background-color : #EFEFEF;
+background-color : #FAFAFA;
 font-weight : bold;
 }
 
 /* None bold submit button */
 input.liteoption {
-background-color : #EFEFEF;
+background-color : #FAFAFA;
 font-weight : normal;
 }
 
 /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */
-@import url("../formIE.css");
+@import url("formIE.css");
+
 .helpline { background-color: #DEE3E7; border-style: none; }
 
 
 /* Copyright and bottom info */
-.copyright		{ font-family: Verdana, Arial, Helvetica, sans-serif; color: #555555; font-size: 10px; letter-spacing: -1px}
-a.copyright		{ color: #333333; text-decoration: none}
-a.copyright:hover { color: #000000; text-decoration: underline}
\ No newline at end of file
+.copyright		{ font-family: Verdana, Arial, Helvetica, sans-serif; color: #555555; font-size: 10px; letter-spacing: -1px;}
+a.copyright		{ color: #333333; text-decoration: none;}
+a.copyright:hover { color: #000000; text-decoration: underline;}
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/index_body.tpl b/phpBB/templates/subSilver/index_body.tpl
index e63e628487..10390de22f 100644
--- a/phpBB/templates/subSilver/index_body.tpl
+++ b/phpBB/templates/subSilver/index_body.tpl
@@ -56,7 +56,6 @@
   </tr>
 </table>
 <!-- BEGIN loginbox -->
-<br />&nbsp;
 <form method="post" action="{S_LOGIN_ACTION}">
   <table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
 	<tr> 
@@ -77,7 +76,7 @@
 </form>
 
 		<!-- END loginbox -->
-&nbsp; <br clear="all" />
+<br />&nbsp;
 <table cellspacing="3" border="0" align="center" cellpadding="0">
   <tr> 
 	<td width="20" align="center"><img src="templates/subSilver/images/folder_new.gif" alt="{L_NEWPOSTS}"/></td>
diff --git a/phpBB/templates/subSilver/install.tpl b/phpBB/templates/subSilver/install.tpl
new file mode 100644
index 0000000000..90391f84d4
--- /dev/null
+++ b/phpBB/templates/subSilver/install.tpl
@@ -0,0 +1,42 @@
+<HTML>
+<HEAD>
+<TITLE>phpBB Version 2.0 Installation</TITLE>
+</HEAD>
+<body bgcolor="#E5E5E5" text="#03699C" link="#993300" vlink="#FF9900">
+<FORM action='{S_FORM_ACTION}' method="post" >
+  <!-- BEGIN hidden_fields -->
+  <input type="hidden" name='{hidden_fields.NAME}' value='{hidden_fields.VALUE}'>
+  <!-- END hidden_fields -->
+  <table>
+	<!-- BEGIN selects -->
+	<tr> 
+	  <td colspan="2"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">{L_INSTRUCT}</font></td>
+	</tr>
+	<tr> 
+	  <td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">{selects.L_LABEL}</font></td>
+	  <td> 
+		<select name="{selects.NAME}">
+		  <!-- BEGIN options -->
+		  <option value="{selects.options.VALUE}" {selects.options.DEFAULT}>{selects.options.LABEL}</option>
+		  <!-- END options -->
+		</select>
+	  </td>
+	</tr>
+	<!-- END selects -->
+	<!-- BEGIN inputs -->
+	<tr> 
+	  <td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">{inputs.L_LABEL}</font></td>
+	  <td> 
+		<input type="{inputs.TYPE}" name="{inputs.NAME}" value="{inputs.VALUE}">
+	  </td>
+	</tr>
+	<!-- END inputs -->
+	<tr> 
+	  <td align="center" colspan="2"> 
+		<input type="submit" value="{L_SUBMIT}">
+	  </td>
+	</tr>
+  </table>
+</FORM>
+</BODY>
+</HTML>
diff --git a/phpBB/templates/subSilver/install_error.tpl b/phpBB/templates/subSilver/install_error.tpl
new file mode 100644
index 0000000000..4ad4fa6b21
--- /dev/null
+++ b/phpBB/templates/subSilver/install_error.tpl
@@ -0,0 +1,29 @@
+<html>
+<head>
+ <title>phpBB Version 2.0 Installer</title>
+</head>
+<body bgcolor="#E5E5E5" text="#03699C" link="#993300" vlink="#FF9900">
+<table align="center">
+  <tr>
+    <td> 
+	  <h2><font face="Verdana, Arial, Helvetica, sans-serif">{L_TITLE}</font></h2>
+ </td>
+</tr>
+<tr>
+  <td>
+  <table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+    <tr>
+	    <td>
+	      <table border="0" width="100%" cellpadding="0" bgcolor="#FFFFFF" cellspacing="1">
+	        <tr>
+	            <td width="100%" align="center"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="2">{L_ERROR}</font></b></td>
+	        </tr>
+	       </table>
+	      </td>
+	    </tr>
+	</table>
+	</td>
+</tr>
+</table>
+</body>
+</html>
diff --git a/phpBB/templates/subSilver/overall_header.tpl b/phpBB/templates/subSilver/overall_header.tpl
index 2353000a7e..e4a2535d75 100644
--- a/phpBB/templates/subSilver/overall_header.tpl
+++ b/phpBB/templates/subSilver/overall_header.tpl
@@ -223,20 +223,17 @@ a.copyright:hover { color: #000000; text-decoration: underline;}
 			  
 			
 		<td align="center" width="100%" valign="middle"><span class="maintitle">{SITENAME}</span><br />
-		  <span class="gen">Home to phpBB2<br />
+		  <span class="gen">The development pad for subBlue design<br />
 			  &nbsp; </span> 
-			  <table cellspacing="0" cellpadding="2" border="0">
-				<tr> 
-				  <td valign="top" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_FAQ}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" align="top" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a></span><span class="mainmenu">&nbsp;&nbsp;</span></td>
-				  <td valign="top" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_SEARCH}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" align="top" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a></span><span class="mainmenu">&nbsp;&nbsp;&nbsp;<a href="{U_MEMBERLIST}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" align="top" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a></span><span class="mainmenu">&nbsp;&nbsp;&nbsp;<a href="{U_GROUP_CP}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" align="top" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a>&nbsp;</span></td>
-				  <td valign="top" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_REGISTER}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" align="top" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a></span></td>
-				</tr>
-				<tr> 
-				  <td nowrap="nowrap" valign="top" height="25"><span class="mainmenu">&nbsp;<a href="{U_PROFILE}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" align="top" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a></span></td>
-				  <td valign="top" height="25" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_PRIVATEMSGS}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_message.gif" width="12" height="13" border="0" align="top" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a></span></td>
-				  <td nowrap="nowrap" valign="top" height="25"><span class="mainmenu">&nbsp;<a href="{U_LOGIN_LOGOUT}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" align="top" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a></span></td>
-				</tr>
-			  </table>
+			  
+		  <table cellspacing="0" cellpadding="2" border="0">
+			<tr> 
+			  <td valign="top" nowrap="nowrap" align="center"><span class="mainmenu">&nbsp;<a href="{U_FAQ}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" align="top" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a></span><span class="mainmenu">&nbsp;&nbsp;&nbsp;<a href="{U_SEARCH}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" align="top" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a>&nbsp;&nbsp;&nbsp;<a href="{U_MEMBERLIST}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" align="top" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a>&nbsp;&nbsp;&nbsp;<a href="{U_GROUP_CP}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" align="top" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a>&nbsp;&nbsp;&nbsp;<a href="{U_REGISTER}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" align="top" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a></span></td>
+			</tr>
+			<tr> 
+			  <td nowrap="nowrap" valign="top" height="25" align="center"><span class="mainmenu">&nbsp;<a href="{U_PROFILE}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" align="top" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a>&nbsp;&nbsp;&nbsp;<a href="{U_PRIVATEMSGS}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_message.gif" width="12" height="13" border="0" align="top" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a>&nbsp;&nbsp;&nbsp;<a href="{U_LOGIN_LOGOUT}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" align="top" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a></span></td>
+			</tr>
+		  </table>
 			</td>
 			</tr>
 		  </table>
diff --git a/phpBB/templates/subSilver/posting_poll_body.tpl b/phpBB/templates/subSilver/posting_poll_body.tpl
index 7491f56b2f..f6493f3303 100644
--- a/phpBB/templates/subSilver/posting_poll_body.tpl
+++ b/phpBB/templates/subSilver/posting_poll_body.tpl
@@ -1,28 +1,31 @@
 
 			<tr>
-				<td class="row2" colspan="2"><span class="cattitle"><b>{L_ADD_A_POLL}</b></span><br /><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td>
+				<th class="thHead" colspan="2">{L_ADD_A_POLL}</th>
+	        </tr>
+			<tr>
+				<td class="row1" colspan="2"><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td>
 	        </tr>
             <tr>
 				<td class="row1"><span class="gen"><b>{L_POLL_QUESTION}</b></span></td>
-				<td class="row2"><span class="courier"><input type="text" name="poll_title" size="50" maxlength="255" class="post" value="{POLL_TITLE}" /></span></td>
+				<td class="row2"><span class="genmed"><input type="text" name="poll_title" size="50" maxlength="255" class="post" value="{POLL_TITLE}" /></span></td>
 			</tr>
 			<!-- BEGIN poll_option_rows -->
             <tr>
 				<td class="row1"><span class="gen"><b>{L_POLL_OPTION}</b></span></td>
-				<td class="row2"><span class="courier"><input type="text" name="poll_option_text[{poll_option_rows.S_POLL_OPTION_NUM}]" size="50" class="post" maxlength="255" value="{poll_option_rows.POLL_OPTION}" /></span> &nbsp;<input type="submit" name="edit_poll_option[{poll_option_rows.S_POLL_OPTION_NUM}]" value="{L_UPDATE_OPTION}" class="liteoption" /> 
+				<td class="row2"><span class="genmed"><input type="text" name="poll_option_text[{poll_option_rows.S_POLL_OPTION_NUM}]" size="50" class="post" maxlength="255" value="{poll_option_rows.POLL_OPTION}" /></span> &nbsp;<input type="submit" name="edit_poll_option[{poll_option_rows.S_POLL_OPTION_NUM}]" value="{L_UPDATE_OPTION}" class="liteoption" /> 
 	<input type="submit" name="del_poll_option[{poll_option_rows.S_POLL_OPTION_NUM}]" value="{L_DELETE_OPTION}" class="liteoption" />
   </td>
 			</tr>
 			<!-- END poll_option_rows -->
             <tr>
 				<td class="row1"><span class="gen"><b>{L_POLL_OPTION}</b></span></td>
-				<td class="row2"><span class="courier"><input type="text" name="add_poll_option_text" size="50" maxlength="255" class="post" value="{ADD_POLL_OPTION}" /></span> &nbsp;
+				<td class="row2"><span class="genmed"><input type="text" name="add_poll_option_text" size="50" maxlength="255" class="post" value="{ADD_POLL_OPTION}" /></span> &nbsp;
 	<input type="submit" name="add_poll_option" value="{L_ADD_OPTION}" class="liteoption" />
   </td>
 			</tr>
             <tr>
 				<td class="row1"><span class="gen"><b>{L_POLL_LENGTH}</b></span></td>
-				<td class="row2"><span class="courier"><input type="text" name="poll_length" size="3" maxlength="3" class="post" value="{POLL_LENGTH}" /></span>&nbsp;<span class="gen"><b>{L_DAYS}</b></span> &nbsp; <span class="gensmall">{L_POLL_LENGTH_EXPLAIN}</span></td>
+				<td class="row2"><span class="genmed"><input type="text" name="poll_length" size="3" maxlength="3" class="post" value="{POLL_LENGTH}" /></span>&nbsp;<span class="gen"><b>{L_DAYS}</b></span> &nbsp; <span class="gensmall">{L_POLL_LENGTH_EXPLAIN}</span></td>
 			</tr>
 			<!-- BEGIN poll_delete_toggle -->
             <tr>
diff --git a/phpBB/templates/subSilver/profile_add_body.tpl b/phpBB/templates/subSilver/profile_add_body.tpl
index bfe7744670..9c2ec4bc20 100644
--- a/phpBB/templates/subSilver/profile_add_body.tpl
+++ b/phpBB/templates/subSilver/profile_add_body.tpl
@@ -6,8 +6,8 @@
   </tr>
 </table>
   <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
-	<tr valign="middle"> 
-	  <th class="thHead" colspan="2" height="25">{L_REGISTRATION_INFO}</th>
+	<tr> 
+	  <th class="thHead" colspan="2" height="25" valign="middle">{L_REGISTRATION_INFO}</th>
 	</tr>
 	<tr> 
 	  <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
@@ -41,8 +41,8 @@
 	<tr> 
 	  <td class="catSides" colspan="2" height="28">&nbsp;</td>
 	</tr>
-	<tr valign="middle"> 
-	  <th class="thSides" colspan="2" height="25">{L_PROFILE_INFO}</th>
+	<tr> 
+	  <th class="thSides" colspan="2" height="25" valign="middle">{L_PROFILE_INFO}</th>
 	</tr>
 	<tr> 
 	  <td class="row2" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
@@ -109,8 +109,8 @@
 	<tr> 
 	  <td class="catSides" colspan="2" height="28">&nbsp;</td>
 	</tr>
-	<tr valign="middle"> 
-	  <th class="thSides" colspan="2" height="25">{L_PREFERENCES}</th>
+	<tr> 
+	  <th class="thSides" colspan="2" height="25" valign="middle">{L_PREFERENCES}</th>
 	</tr>
 	<tr> 
 	  <td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td>
@@ -200,16 +200,21 @@
 	  <td class="catSides" colspan="2" height="28">&nbsp;</td>
 	</tr>
 	<!-- BEGIN avatarblock -->
-	<tr valign="middle"> 
-	  <th class="thSides" colspan="2" height="25">{L_AVATAR_PANEL}</th>
-	</tr>
 	<tr> 
-	  <td class="row1" valign="top"> <span class="gensmall">{L_AVATAR_EXPLAIN}</span> 
+	  <th class="thSides" colspan="2" height="12" valign="middle">{L_AVATAR_PANEL}</th>
+	</tr>
+	<tr align="center"> 
+	  <td class="row1" colspan="2"> 
+		<table width="70%" cellspacing="2" cellpadding="0" border="0">
+		  <tr> 
+			<td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
+			<td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />
+			  {AVATAR}<br />
+			  <input type="checkbox" name="avatardel" />
+			  &nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
+		  </tr>
+		</table>
 	  </td>
-	  <td class="row2" align="left"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />
-		{AVATAR}<br />
-		<input type="checkbox" name="avatardel" />
-		&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
 	</tr>
 	<!-- BEGIN avatarupload -->
 	<tr> 
diff --git a/phpBB/templates/subSilver/profile_view_body.tpl b/phpBB/templates/subSilver/profile_view_body.tpl
index 1b6c7ecf65..62d952d412 100644
--- a/phpBB/templates/subSilver/profile_view_body.tpl
+++ b/phpBB/templates/subSilver/profile_view_body.tpl
@@ -13,15 +13,15 @@
 	<td class="catRight" width="60%"><b><span class="gen">All about {USERNAME}</span></b></td>
   </tr>
   <tr> 
-	<td class="row1" height="6" valign="top" align="center">{AVATAR_IMG}</td>
+	<td class="row1" height="6" valign="top" align="center">{AVATAR_IMG}<br /><span class="postdetails">{POSTER_RANK}</span></td>
 	<td class="row1" valign="top" rowspan="3"> 
 	  <table width="100%" border="0" cellspacing="1" cellpadding="3">
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_JOINED}:&nbsp;</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_JOINED}:&nbsp;</span></td>
 		  <td width="100%"><b><span class="gen">{JOINED}</span></b></td>
 		</tr>
 		<tr> 
-		  <td valign="top"><span class="gen">{L_POSTS}:&nbsp;</span></td>
+		  <td valign="top" align="right"><span class="gen">{L_POSTS}:&nbsp;</span></td>
 		  <td valign="top"><b><span class="gen">{POSTS}</span></b><br />
 			<span class="genmed">[{PERCENTAGE} {L_OF_TOTAL} / {POSTS_PER_DAY} 
 			{L_PER_DAY}]</span> <br />
@@ -29,19 +29,19 @@
 			all posts by {USERNAME}</a></span></td>
 		</tr>
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_LOCATION}:&nbsp;</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_LOCATION}:&nbsp;</span></td>
 		  <td><b><span class="gen">{LOCATION}</span></b></td>
 		</tr>
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_WEBSITE}:&nbsp;</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_WEBSITE}:&nbsp;</span></td>
 		  <td><span class="gen"><b><a href="{WEBSITE}" class="gen" target="_blank">{WEBSITE}</a></b></span></td>
 		</tr>
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_OCCUPATION}:&nbsp;</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_OCCUPATION}:&nbsp;</span></td>
 		  <td><b><span class="gen">{OCCUPATION}</span></b></td>
 		</tr>
 		<tr> 
-		  <td valign="top"><span class="gen">{L_INTERESTS}:</span></td>
+		  <td valign="top" align="right"><span class="gen">{L_INTERESTS}:</span></td>
 		  <td> <b><span class="gen">{INTERESTS}</span></b></td>
 		</tr>
 	  </table>
@@ -55,27 +55,27 @@
 	<td class="row1" valign="top"> 
 	  <table width="100%" border="0" cellspacing="1" cellpadding="3">
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_EMAIL_ADDRESS}:</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_EMAIL_ADDRESS}:</span></td>
 		  <td class="row1" valign="middle" width="100%"><b><span class="gen">{EMAIL}</span></b></td>
 		</tr>
 		<tr> 
-		  <td valign="middle" nowrap="nowrap"><span class="gen">{L_PM}:</span></td>
+		  <td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_PM}:</span></td>
 		  <td class="row1" valign="middle"><b><span class="gen">{PM_IMG}</span></b></td>
 		</tr>
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_MESSENGER}:</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_MESSENGER}:</span></td>
 		  <td class="row1" valign="middle"><span class="gen">{MSN_IMG}</span></td>
 		</tr>
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_YAHOO}:</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_YAHOO}:</span></td>
 		  <td class="row1" valign="middle"><span class="gen">{YIM_IMG}</span></td>
 		</tr>
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_AIM}:</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_AIM}:</span></td>
 		  <td class="row1" valign="middle"><span class="gen">{AIM_IMG}</span></td>
 		</tr>
 		<tr> 
-		  <td valign="middle"><span class="gen">{L_ICQ_NUMBER}:</span></td>
+		  <td valign="middle" align="right"><span class="gen">{L_ICQ_NUMBER}:</span></td>
 		  <td class="row1" valign="middle"><span class="gen">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</span></td>
 		</tr>
 	  </table>
diff --git a/phpBB/templates/subSilver/subSilver.cfg b/phpBB/templates/subSilver/subSilver.cfg
index f7dcc522be..0c080f0d03 100644
--- a/phpBB/templates/subSilver/subSilver.cfg
+++ b/phpBB/templates/subSilver/subSilver.cfg
@@ -55,7 +55,7 @@ $images['folder_announce_new'] = "templates/subSilver/images/folder_announce_new
 
 
 $images['post_new'] = "templates/subSilver/images/post.gif";
-$images['post_locked'] = "templates/subSilver/images/post-locked.gif";
+$images['post_locked'] = "templates/subSilver/images/reply-locked.gif";
 $images['reply_new'] = "templates/subSilver/images/reply.gif";
 $images['reply_locked'] = "templates/subSilver/images/reply-locked.gif";