7 files changed, 147 insertions, 424 deletions
diff --git a/phpBB/templates/subSilver/index_body.html b/phpBB/templates/subSilver/index_body.html
index 82897c2faa..c659dd971b 100644
--- a/phpBB/templates/subSilver/index_body.html
+++ b/phpBB/templates/subSilver/index_body.html
@@ -5,7 +5,7 @@
 		<td width="100%" align="left" valign="bottom"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
 				<td align="left" valign="bottom"><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span><br /><br /><a class="nav"  href="{U_INDEX}">{L_INDEX}</a></td>
-				<td class="gensmall" align="right" valign="bottom"><!-- IF S_USER_LOGGED_IN --><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a><br /><!-- ENDIF --><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><br /><br /><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<br /><!-- ENDIF -->{CURRENT_TIME}</td>
+				<td class="gensmall" align="right" valign="top"><!-- IF S_USER_LOGGED_IN --><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a><br /><!-- ENDIF --><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a></td>
 			</tr>
 		</table></td>
 	</tr>
diff --git a/phpBB/templates/subSilver/login_body.html b/phpBB/templates/subSilver/login_body.html
index a74ee2cfcf..52c57f2c6f 100644
--- a/phpBB/templates/subSilver/login_body.html
+++ b/phpBB/templates/subSilver/login_body.html
@@ -1,302 +1,40 @@
+<!-- $Id$ -->
 <!-- INCLUDE overall_header.html -->
 
-<script language="javascript" type="text/javascript">
-<!--
-/*
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
- * Digest Algorithm, as defined in RFC 1321.
- * Copyright (C) Paul Johnston 1999 - 2000.
- * Updated by Greg Holt 2000 - 2001.
- * See http://pajhome.org.uk/site/legal.html for details.
- */
-
-/*
- * Convert a 32-bit number to a hex string with ls-byte first
- */
-var hex_chr = "0123456789abcdef";
-function rhex(num)
-{
-  str = "";
-  for(j = 0; j <= 3; j++)
-    str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) +
-           hex_chr.charAt((num >> (j * 8)) & 0x0F);
-  return str;
-}
-
-/*
- * Convert a string to a sequence of 16-word blocks, stored as an array.
- * Append padding bits and the length, as described in the MD5 standard.
- */
-function str2blks_MD5(str)
-{
-  nblk = ((str.length + 8) >> 6) + 1;
-  blks = new Array(nblk * 16);
-  for(i = 0; i < nblk * 16; i++) blks[i] = 0;
-  for(i = 0; i < str.length; i++)
-    blks[i >> 2] |= str.charCodeAt(i) << ((i % 4) * 8);
-  blks[i >> 2] |= 0x80 << ((i % 4) * 8);
-  blks[nblk * 16 - 2] = str.length * 8;
-  return blks;
-}
-
-/*
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally 
- * to work around bugs in some JS interpreters.
- */
-function add(x, y)
-{
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-  return (msw << 16) | (lsw & 0xFFFF);
-}
-
-/*
- * Bitwise rotate a 32-bit number to the left
- */
-function rol(num, cnt)
-{
-  return (num << cnt) | (num >>> (32 - cnt));
-}
-
-/*
- * These functions implement the basic operation for each round of the
- * algorithm.
- */
-function cmn(q, a, b, x, s, t)
-{
-  return add(rol(add(add(a, q), add(x, t)), s), b);
-}
-function ff(a, b, c, d, x, s, t)
-{
-  return cmn((b & c) | ((~b) & d), a, b, x, s, t);
-}
-function gg(a, b, c, d, x, s, t)
-{
-  return cmn((b & d) | (c & (~d)), a, b, x, s, t);
-}
-function hh(a, b, c, d, x, s, t)
-{
-  return cmn(b ^ c ^ d, a, b, x, s, t);
-}
-function ii(a, b, c, d, x, s, t)
-{
-  return cmn(c ^ (b | (~d)), a, b, x, s, t);
-}
-
-/*
- * Take a string and return the hex representation of its MD5.
- */
-function MD5(str)
-{
-  x = str2blks_MD5(str);
-  var a =  1732584193;
-  var b = -271733879;
-  var c = -1732584194;
-  var d =  271733878;
- 
-  for(i = 0; i < x.length; i += 16)
-  {
-    var olda = a;
-    var oldb = b;
-    var oldc = c;
-    var oldd = d;
-
-    a = ff(a, b, c, d, x[i+ 0], 7 , -680876936);
-    d = ff(d, a, b, c, x[i+ 1], 12, -389564586);
-    c = ff(c, d, a, b, x[i+ 2], 17,  606105819);
-    b = ff(b, c, d, a, x[i+ 3], 22, -1044525330);
-    a = ff(a, b, c, d, x[i+ 4], 7 , -176418897);
-    d = ff(d, a, b, c, x[i+ 5], 12,  1200080426);
-    c = ff(c, d, a, b, x[i+ 6], 17, -1473231341);
-    b = ff(b, c, d, a, x[i+ 7], 22, -45705983);
-    a = ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
-    d = ff(d, a, b, c, x[i+ 9], 12, -1958414417);
-    c = ff(c, d, a, b, x[i+10], 17, -42063);
-    b = ff(b, c, d, a, x[i+11], 22, -1990404162);
-    a = ff(a, b, c, d, x[i+12], 7 ,  1804603682);
-    d = ff(d, a, b, c, x[i+13], 12, -40341101);
-    c = ff(c, d, a, b, x[i+14], 17, -1502002290);
-    b = ff(b, c, d, a, x[i+15], 22,  1236535329);    
-
-    a = gg(a, b, c, d, x[i+ 1], 5 , -165796510);
-    d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
-    c = gg(c, d, a, b, x[i+11], 14,  643717713);
-    b = gg(b, c, d, a, x[i+ 0], 20, -373897302);
-    a = gg(a, b, c, d, x[i+ 5], 5 , -701558691);
-    d = gg(d, a, b, c, x[i+10], 9 ,  38016083);
-    c = gg(c, d, a, b, x[i+15], 14, -660478335);
-    b = gg(b, c, d, a, x[i+ 4], 20, -405537848);
-    a = gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
-    d = gg(d, a, b, c, x[i+14], 9 , -1019803690);
-    c = gg(c, d, a, b, x[i+ 3], 14, -187363961);
-    b = gg(b, c, d, a, x[i+ 8], 20,  1163531501);
-    a = gg(a, b, c, d, x[i+13], 5 , -1444681467);
-    d = gg(d, a, b, c, x[i+ 2], 9 , -51403784);
-    c = gg(c, d, a, b, x[i+ 7], 14,  1735328473);
-    b = gg(b, c, d, a, x[i+12], 20, -1926607734);
-    
-    a = hh(a, b, c, d, x[i+ 5], 4 , -378558);
-    d = hh(d, a, b, c, x[i+ 8], 11, -2022574463);
-    c = hh(c, d, a, b, x[i+11], 16,  1839030562);
-    b = hh(b, c, d, a, x[i+14], 23, -35309556);
-    a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
-    d = hh(d, a, b, c, x[i+ 4], 11,  1272893353);
-    c = hh(c, d, a, b, x[i+ 7], 16, -155497632);
-    b = hh(b, c, d, a, x[i+10], 23, -1094730640);
-    a = hh(a, b, c, d, x[i+13], 4 ,  681279174);
-    d = hh(d, a, b, c, x[i+ 0], 11, -358537222);
-    c = hh(c, d, a, b, x[i+ 3], 16, -722521979);
-    b = hh(b, c, d, a, x[i+ 6], 23,  76029189);
-    a = hh(a, b, c, d, x[i+ 9], 4 , -640364487);
-    d = hh(d, a, b, c, x[i+12], 11, -421815835);
-    c = hh(c, d, a, b, x[i+15], 16,  530742520);
-    b = hh(b, c, d, a, x[i+ 2], 23, -995338651);
-
-    a = ii(a, b, c, d, x[i+ 0], 6 , -198630844);
-    d = ii(d, a, b, c, x[i+ 7], 10,  1126891415);
-    c = ii(c, d, a, b, x[i+14], 15, -1416354905);
-    b = ii(b, c, d, a, x[i+ 5], 21, -57434055);
-    a = ii(a, b, c, d, x[i+12], 6 ,  1700485571);
-    d = ii(d, a, b, c, x[i+ 3], 10, -1894986606);
-    c = ii(c, d, a, b, x[i+10], 15, -1051523);
-    b = ii(b, c, d, a, x[i+ 1], 21, -2054922799);
-    a = ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
-    d = ii(d, a, b, c, x[i+15], 10, -30611744);
-    c = ii(c, d, a, b, x[i+ 6], 15, -1560198380);
-    b = ii(b, c, d, a, x[i+13], 21,  1309151649);
-    a = ii(a, b, c, d, x[i+ 4], 6 , -145523070);
-    d = ii(d, a, b, c, x[i+11], 10, -1120210379);
-    c = ii(c, d, a, b, x[i+ 2], 15,  718787259);
-    b = ii(b, c, d, a, x[i+ 9], 21, -343485551);
-
-    a = add(a, olda);
-    b = add(b, oldb);
-    c = add(c, oldc);
-    d = add(d, oldd);
-  }
-  return rhex(a) + rhex(b) + rhex(c) + rhex(d);
-}
-
-function valid_js() {
-   // anything that claims NS 4 or higher functionality better work 
-   if (navigator.userAgent.indexOf("Mozilla/") == 0) {
-      return (parseInt(navigator.appVersion) >= 4);
-   }
-   return false;
-}
- 
-function hash(form,login_url) {
-    // this is Javascript enabled browser
-    //document.login_form[".js"].value=1;
-    // rudimentary check for a 4.x brower. should catch IE4+ and NS4.*
-    var url;
-
-    if (arguments.length > 1 && login_url != "") { // in case login_url is not passed in
-      url = login_url;
-    } else {
-      url = "http://login.yahoo.com/config/login";
-    }
-    url += "?";
-      
-    if (valid_js()) {
-      var passwd = form.passwd.value;
-      var hash1 = MD5(form.passwd.value);
-      var challenge = form[".challenge"].value;
-      var hash2 = MD5(form.passwd.value) + challenge;
-      var hash;
-      if(form.passwd.value){
-        hash=MD5(hash2);
-      } else {
-        hash="";
-      }
-      var js = 0;
-
-      for(i=0; i<form.elements.length; i++){
-        if(form.elements[i].name.length <=0) {
-          continue;
-        }
-        if(i > 0){
-          url += "&";
-        }
-        url += form.elements[i].name;
-        url += "=";
-        if(form.elements[i].name == "passwd"){
-          url += hash;
-        } else if (form.elements[i].type == "checkbox" && !form.elements[i].checked) {
-          url += "";
-        } else if (form.elements[i].type == "radio" && !form.elements[i].checked) {
-          url += "";
-        } else if (form.elements[i].name == ".save"){
-          url += "1"; // "Sign in" causes problem with the space
-        } else if (form.elements[i].name == ".js"){
-          js = 1;
-          url += "1"; 
-        } else {
-          url += escape(form.elements[i].value);
-        }
-      }
-      // indicate the password is hashed.
-      url += "&.hash=1";
-      if(js == 0){
-        url += "&.js=1";
-      }
-      url += "&.md5=1";
-      //alert("url=" + url);
-      location.href=url;
-      // prevent from running this again. Allow the server response to submit the form directly
-      form.onsubmit=null;
-
-      // abort normal form submission
-      return false;
-    }
-    // allow normal form submission
-    return true;
-}
-//-->
-</script>
-
-<form action="{S_LOGIN_ACTION}" method="post">
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-  <tr> 
-	<td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
-  </tr>
+<form action="{S_LOGIN_ACTION}" method="post"><table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+	<tr> 
+		<td align="left" class="nav"><a href="{U_INDEX}">{L_INDEX}</a></td>
+	</tr>
 </table>
 
-<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
-  <tr> 
-	<th height="25" class="thHead" nowrap="nowrap">{L_ENTER_PASSWORD}</th>
-  </tr>
-  <tr> 
-	<td class="row1"><table border="0" cellpadding="3" cellspacing="1" width="100%">
-		  <tr> 
-			<td colspan="2" align="center">&nbsp;</td>
-		  </tr>
-		  <tr> 
-			<td width="45%" align="right"><span class="gen">{L_USERNAME}:</span></td>
-			<td> 
-			  <input type="text" name="username" size="25" maxlength="40" value="{USERNAME}" />
-			</td>
-		  </tr>
-		  <tr> 
-			<td align="right"><span class="gen">{L_PASSWORD}:</span></td>
-			<td> 
-			  <input type="password" name="password" size="25" maxlength="25" />
-			</td>
-		  </tr>
-		  <tr align="center"> 
-			<td colspan="2"><span class="gen">{L_AUTO_LOGIN}: <input type="checkbox" name="autologin" /></span></td>
-		  </tr>
-		  <tr align="center"> 
-			<td colspan="2">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="mainoption" value="{L_LOGIN}" /></td>
-		  </tr>
-		  <tr align="center"> 
-			<td colspan="2"><span class="gensmall"><a href="{U_SEND_PASSWORD}" class="gensmall">{L_SEND_PASSWORD}</a></span></td>
-		  </tr>
+<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0" align="center">
+	<tr> 
+		<th height="25" nowrap="nowrap">{L_ENTER_PASSWORD}</th>
+	</tr>
+	<tr> 
+		<td class="row1"><table width="100%" cellspacing="1" cellpadding="2" border="0">
+			<tr> 
+				<td colspan="2" align="center">&nbsp;</td>
+			</tr>
+			<tr> 
+				<td width="45%" align="right"><span class="gen">{L_USERNAME}:</span></td>
+				<td><input type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /></td>
+			</tr>
+			<tr> 
+				<td class="gen" align="right">{L_PASSWORD}:</td>
+				<td><input class="text" type="password" name="password" size="25" maxlength="25" /></td>
+			</tr>
+			<tr align="center"> 
+				<td class="gen" colspan="2">{L_AUTO_LOGIN}: <input type="checkbox" name="autologin" /></td>
+			</tr>
+			<tr align="center"> 
+				<td colspan="2">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="mainoption" value="{L_LOGIN}" /></td>
+			</tr>
+			<tr align="center"> 
+				<td class="gensmall" colspan="2"><a href="{U_SEND_PASSWORD}">{L_SEND_PASSWORD}</a></td>
+			</tr>
 		</table></td>
-  </tr>
-</table>
-
-</form>
+	</tr>
+</table></form>
 
 <!-- INCLUDE overall_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_forum.html b/phpBB/templates/subSilver/mcp_forum.html
index 9d63c8cac1..6e76dd42cc 100644
--- a/phpBB/templates/subSilver/mcp_forum.html
+++ b/phpBB/templates/subSilver/mcp_forum.html
@@ -1,68 +1,64 @@
+<form method="post" action="{S_MCP_ACTION}">
+
 <!-- INCLUDE mcp_header.html -->
 
-<table width="100%" cellspacing="0" cellpadding="0" border="0" align="center"><form method="post" action="{S_MCP_ACTION}">
+<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
+	<tr> 
+		<th width="4%" nowrap="nowrap">&nbsp;</th>
+		<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
+		<th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
+		<th width="17%" nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
+		<th width="5%" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
+	</tr>
+	<!-- BEGIN topicrow -->
+	<tr> 
+		<td class="row1" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
+		<td class="row1"><span class="topictitle"><!-- IF topicrow.S_MERGE_SELECT -->[ {topicrow.S_MERGE_SELECT} ] <!-- ENDIF -->{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span></td>
+		<td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
+		<td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST_TIME}</span></td>
+		<td class="row2" align="center" valign="middle"><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" /></td>
+	</tr>
+	<!-- BEGINELSE -->
 	<tr>
-		<td colspan="2">
-			<table width="100%" class="forumline" cellspacing="1" cellpadding="4" border="0">
-				<tr> 
-				  <th width="4%" class="thLeft" nowrap="nowrap">&nbsp;</th>
-				  <th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
-				  <th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
-				  <th width="17%" nowrap="nowrap">&nbsp;{L_LASTPOST}&nbsp;</th>
-				  <th width="5%" class="thRight" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
-				</tr>
-				<!-- BEGIN topicrow -->
-				<tr> 
-				  <td class="row1" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-				  <td class="row1">&nbsp;<span class="topictitle"><!-- IF topicrow.S_MERGE_SELECT -->[ {topicrow.S_MERGE_SELECT} ] <!-- ENDIF -->{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td>
-				  <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
-				  <td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST_TIME}</span></td>
-				  <td class="row2" align="center" valign="middle"> 
-					<input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" />
-				  </td>
-				</tr>
-				<!-- BEGINELSE -->
-				<tr>
-					<td class="row1" colspan="8" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td>
-				</tr>
-				<!-- END topicrow -->
-				<tr align="right"> 
-				  <td class="catBottom" colspan="5" height="29"> {S_HIDDEN_FIELDS}
-					<!-- IF S_CAN_DELETE -->
-					<input type="submit" name="delete" class="liteoption" value="{L_DELETE}" />
-					&nbsp;
-					<!-- ENDIF -->
-					<!-- IF S_CAN_MOVE -->
-					<input type="submit" name="move" class="liteoption" value="{L_MOVE}" />
-					&nbsp; 
-					<!-- ENDIF -->
-					<!-- IF S_CAN_LOCK -->
-					<input type="submit" name="lock" class="liteoption" value="{L_LOCK}" />
-					&nbsp; 
-					<!-- ENDIF -->
-					<!-- IF S_CAN_UNLOCK -->
-					<input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" />
-					&nbsp; 
-					<!-- ENDIF -->
-					<!-- IF S_CAN_RESYNC -->
-					<input type="submit" name="resync" class="liteoption" value="{L_RESYNC}" />
-					<!-- ENDIF -->
-				  </td>
-				</tr>
-			  </table>
-			  <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
-			  <tr> 
-				<td align="left" valign="middle"><span class="nav">{PAGE_NUMBER}</b></span></td>
-				<td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td>
-			  </tr>
-			</table>
-			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-			  <tr> 
-				<td align="right">{JUMPBOX}</td>
-			  </tr>
-			</table>
+		<td class="row1" colspan="8" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td>
+	</tr>
+	<!-- END topicrow -->
+	<tr align="right"> 
+		<td class="cat" colspan="5" height="28">{S_HIDDEN_FIELDS}
+			<!-- IF S_CAN_DELETE -->
+			<input type="submit" name="delete" class="liteoption" value="{L_DELETE}" />
+			&nbsp;
+			<!-- ENDIF -->
+			<!-- IF S_CAN_MOVE -->
+			<input type="submit" name="move" class="liteoption" value="{L_MOVE}" />
+			&nbsp; 
+			<!-- ENDIF -->
+			<!-- IF S_CAN_LOCK -->
+			<input type="submit" name="lock" class="liteoption" value="{L_LOCK}" />
+			&nbsp; 
+			<!-- ENDIF -->
+			<!-- IF S_CAN_UNLOCK -->
+			<input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" />
+			&nbsp; 
+			<!-- ENDIF -->
+			<!-- IF S_CAN_RESYNC -->
+			<input type="submit" name="resync" class="liteoption" value="{L_RESYNC}" />
+			<!-- ENDIF -->
 		</td>
 	</tr>
-</form></table>
+</table>
+
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+	<tr> 
+		<td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td>
+		<td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td>
+	</tr>
+</table></form>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr>
+		<td align="right"><!-- INCLUDE jumpbox.html --></td>
+	</tr>
+</table>
 
 <!-- INCLUDE overall_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_header.html b/phpBB/templates/subSilver/mcp_header.html
index bbcf28de9e..930a261342 100644
--- a/phpBB/templates/subSilver/mcp_header.html
+++ b/phpBB/templates/subSilver/mcp_header.html
@@ -1,50 +1,27 @@
 <!-- INCLUDE overall_header.html -->
-<table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
+
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<!-- IF FORUM_NAME -->
 	<tr>
-		<td align="left" valign="bottom"><a class="maintitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></td>
+		<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- IF PAGINATION -->
 	<tr>
-		<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><b>{PAGINATION}</b></span></td>
+		<td valign="bottom" class="gensmall">{MODERATORS}</td>
+		<td align="right" valign="bottom" nowrap="nowrap"><b class="gensmall">{PAGINATION}</b></td>
 	</tr>
 	<!-- ENDIF -->
 	<tr>
-		<td>&nbsp;</td>
+		<td class="nav" colspan="2" align="left" valign="middle"><!-- IF S_FORUM_NAV --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --><!-- ENDIF --></td>
 	</tr>
+</table>
+
+<table class="tablebg" cellspacing="1" cellpadding="4" border="0" align="left">
 	<tr>
-		<td class="nav" width="100%" align="left" valign="middle">
-		<!-- IF S_FORUM_NAV -->
-			<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a class="nav" href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></span>
-		<!-- ENDIF -->
-		</td>
+		<!-- BEGIN tab --><!-- IF tab.S_IS_SELECTED --><td class="row1" nowrap="nowrap">&nbsp;<span class="gen"><b>{tab.NAME}</b><!-- ELSE --><td class="row2" nowrap="nowrap">&nbsp;<a class="nav" href="{tab.U_LINK}">{tab.NAME}</a><!-- ENDIF -->&nbsp;</td>
+		<!-- END tab -->
 	</tr>
-	<tr>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td valign="top">
-			<table cellspacing="1" cellpadding="4" border="0" bgcolor="#006699" align="left">
-				<tr>
-					<!-- BEGIN tab -->
-					<td class="cat">&nbsp;<span class="nav">
-						<!-- IF tab.S_IS_SELECTED -->
-							<a href="{tab.U_LINK}"><i>{tab.NAME}</i></a>
-						<!-- ELSE -->
-							<a href="{tab.U_LINK}">{tab.NAME}</a>
-						<!-- ENDIF -->
-						</span>&nbsp;</td>
-					<!-- END tab -->
-				</tr>
-			</table>
-		</td>
-		<td align="right" valign="bottom">
-			<table cellspacing="1" cellpadding="4" border="0">
-				<tr>
-					<td><!-- INCLUDE jumpbox.html --></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-\ No newline at end of file
+</table>
+
+<br clear="all" />
+\ No newline at end of file
diff --git a/phpBB/templates/subSilver/memberlist_body.html b/phpBB/templates/subSilver/memberlist_body.html
index a2eb1eceda..c09b8ef76b 100644
--- a/phpBB/templates/subSilver/memberlist_body.html
+++ b/phpBB/templates/subSilver/memberlist_body.html
@@ -32,54 +32,58 @@ function marklist(status)
 </script>
 
 <form method="post" action="{S_MODE_ACTION}" name="search"><table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
-	<tr class="gen">
+	<tr>
 		<th colspan="2" height="25">{L_SEARCH_USERNAME}</th>
 	</tr>
 	<tr>
-		<td class="row2" colspan="2"><span class="gensmall">{L_SEARCH_EXPLAIN}</span></td>
+		<td class="row3" colspan="2"><span class="gensmall">{L_SEARCH_EXPLAIN}</span></td>
 	</tr>
-	<tr class="gen">
-		<td class="row1">{L_USERNAME}: </span></td>
-		<td class="row1"><input class="post" type="text" name="username" value="{USERNAME}" /></td>
+	<tr>
+		<td class="row1"><span class="gen">{L_USERNAME}:</span></span></td>
+		<td class="row2"><input class="post" type="text" name="username" value="{USERNAME}" /></td>
 	</tr>
-	<tr class="gen">
-		<td class="row2">{L_EMAIL}: </td>
+	<tr>
+		<td class="row1"><span class="gen">{L_EMAIL}:</span></td>
 		<td class="row2"><input class="post" type="text" name="email" value="{EMAIL}" /></td>
 	</tr>
-	<tr class="gen">
-		<td class="row1">{L_ICQ_NUMBER}: </td>
-		<td class="row1"><input class="post" type="text" name="icq" value="{ICQ}" /></td>
+	<tr>
+		<td class="row1"><span class="gen">{L_ICQ}:</span></td>
+		<td class="row2"><input class="post" type="text" name="icq" value="{ICQ}" /></td>
 	</tr>
-	<tr class="gen">
-		<td class="row2">{L_AIM}: </td>
+	<tr>
+		<td class="row1"><span class="gen">{L_AIM}:</span></td>
 		<td class="row2"><input class="post" type="text" name="aim" value="{AIM}" /></td>
 	</tr>
-	<tr class="gen">
-		<td class="row1">{L_YAHOO}: </td>
-		<td class="row1"><input class="post" type="text" name="yahoo" value="{YAHOO}" /></td>
+	<tr>
+		<td class="row1"><span class="gen">{L_YIM}:</span></td>
+		<td class="row2"><input class="post" type="text" name="yahoo" value="{YAHOO}" /></td>
 	</tr>
-	<tr class="gen">
-		<td class="row2">{L_MESSENGER}: </td>
+	<tr>
+		<td class="row1"><span class="gen">{L_MSNM}:</span></td>
 		<td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td>
 	</tr>
-	<tr class="gen">
-		<td class="row1">{L_JOINED}: </td>
-		<td class="row1"><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="post" type="text" name="joined" value="{JOINED}" /></td>
+	<tr>
+		<td class="row1"><span class="gen">{L_JOINED}:</span></td>
+		<td class="row2"><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="post" type="text" name="joined" value="{JOINED}" /></td>
 	</tr>
-	<tr class="gen">
-		<td class="row2">{L_ACTIVE}: </td>
+	<tr>
+		<td class="row1"><span class="gen">{L_ACTIVE}:</span></td>
 		<td class="row2"><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="post" type="text" name="active" value="{ACTIVE}" /></td>
 	</tr>
-	<tr class="gen">
-		<td class="row1"><span>{L_POSTS}: </td>
-		<td class="row1"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="text" name="count" value="{COUNT}" /></td>
+	<tr>
+		<td class="row1"><span class="gen">{L_POSTS}:</span></td>
+		<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="text" name="count" value="{COUNT}" /></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">{L_POST_IP}:</span></td>
+		<td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td>
 	</tr>
 	<tr>
-		<td class="row2">{L_SORT_BY}:&nbsp;</td>
-		<td class="row2" valign="middle" nowrap="nowrap"><span class="genmed">{S_SORT_OPTIONS} {S_ORDER_SELECT}</span>&nbsp;</td>
+		<td class="row1"><span class="gen">{L_SORT_BY}:&nbsp;</td>
+		<td class="row2" valign="middle" nowrap="nowrap">{S_SORT_OPTIONS} {S_ORDER_SELECT}&nbsp;</td>
 	</tr>
 	<tr>
-		<td class="catBottom" colspan="2" align="center"><input class="liteoption" type="submit" name="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="liteoption" type="reset" value="{L_RESET}" /></td>
+		<td class="cat" colspan="2" align="center"><input class="liteoption" type="submit" name="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="liteoption" type="reset" value="{L_RESET}" /></td>
 	</tr>
 </table></form>
 <!-- ENDIF -->
diff --git a/phpBB/templates/subSilver/overall_header.html b/phpBB/templates/subSilver/overall_header.html
index 6e75997b0e..ce964f3b33 100644
--- a/phpBB/templates/subSilver/overall_header.html
+++ b/phpBB/templates/subSilver/overall_header.html
@@ -35,7 +35,7 @@
 	<tr>
 		<td><table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
-				<td><a href="{U_INDEX}"><img src="templates/subSilver/images/logo_phpBB.gif" border="0" alt="" title="" /></a></td>
+				<td height="90"><a href="{U_INDEX}"><img src="templates/subSilver/images/logo_phpBB.gif" border="0" alt="" title="" /></a></td>
 				<td align="center"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}<br />&nbsp; </span></td>
 			</tr>
 			<tr>
@@ -46,6 +46,13 @@
 
 				<td height="25" align="right" valign="middle" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_FAQ}"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a>&nbsp; &nbsp;<a href="{U_SEARCH}"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a>&nbsp; &nbsp;<a href="{U_MEMBERLIST}"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a>&nbsp; &nbsp;<a href="{U_GROUP_CP}"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a><!-- IF S_USER_LOGGED_IN -->&nbsp; &nbsp;<a href="{U_PROFILE}"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a><!-- ENDIF --></span>&nbsp;</td>
 			</tr>
+			<tr>
+				<td><img src="images/spacer.gif" height="8" alt="" /></td>
+			</tr>
+			<tr>
+				<td class="gensmall">&nbsp;<!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ENDIF --></td>
+				<td class="gensmall" align="right">{CURRENT_TIME}&nbsp;</td>
+			</tr>
 		</table></td>
 	</tr>
 </table>
diff --git a/phpBB/templates/subSilver/subSilver.css b/phpBB/templates/subSilver/subSilver.css
index 8e91414951..28a94302bc 100644
--- a/phpBB/templates/subSilver/subSilver.css
+++ b/phpBB/templates/subSilver/subSilver.css
@@ -30,6 +30,7 @@ body {
 	scrollbar-darkshadow-color: #98AAB1;
 	background: white url('templates/subSilver/images/background.png') repeat-x;
 	font-family: Verdana, Helvetica, sans-serif;
+	margin: 15px;
 }
 
 h1 {
@@ -234,7 +235,7 @@ span.hilit {
 /* titles for the topics: could specify viewed link colour too */
 .topictitle	{
 	color: black;
-	font-size:	70%;
+	font-size:	65%;
 	font-weight:bold;
 }