diff --git a/phpBB/templates/Default/login_body.tpl b/phpBB/templates/Default/login_body.tpl
index 8aa5568d7e..d987177de0 100644
--- a/phpBB/templates/Default/login_body.tpl
+++ b/phpBB/templates/Default/login_body.tpl
@@ -1,38 +1,36 @@
 <tr>
 	<td><br clear="all" /><br />
-
-<table border="0" align="center" width="95%" cellspacing="2">
-	<tr>
-		<td align="center"><table border="0" cellpadding="1" cellspacing="0" width="60%">
-			<tr><form action="{PHP_SELF}" method="post">
-				<td bgcolor="{T_TD_COLOR1}"><table border="0" cellpadding="4" cellspacing=1" width="100%">
+	
+<table border="0" align="center" width="60%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+    <tr><form action="{PHP_SELF}" method="post">
+	    <td><table border="0" width="100%" cellpadding="3" cellspacing="1">
+			<tr class="tableheader">
+				<td colspan="2" align="center"><b>Please enter your username and password to login</b></td>
+			</tr>
+			<tr bgcolor="#DDDDDD" class="tablebody">
+				<td width="45%" align="right">{L_USERNAME}:&nbsp;</td>
+				<td><input type="text" name="username" size="25" maxlength="40" value="{USERNAME}"></td>
+			</tr>
+			<tr bgcolor="#DDDDDD" class="tablebody">
+				<td align="right">{L_PASSWORD}:&nbsp;</td>
+				<td><input type="password" name="password" size="25" maxlength="25"></td>
+			</tr>
+			<tr bgcolor="#DDDDDD" class="tablebody">
+				<td colspan="2" align="center">{L_AUTO_LOGIN}:&nbsp;<input type="checkbox" name="autologin"></td>
+			</tr>
+			<tr bgcolor="#DDDDDD" class="tablebody">
+				<td colspan="2"><table width="100%" cellspacing="0" cellpadding="6" border="0">
 					<tr>
-						<th colspan="2" bgcolor="{T_TH_COLOR1}" align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><p><b>Please enter your username and password to login</b></p></font></th>
+						<td align="center"><input type="hidden" name="forward_page" value="{FORWARD_PAGE}"><input type="submit" name="submit" value="{L_LOGIN}"></td>
 					</tr>
 					<tr>
-						<td width="45%" bgcolor="{T_TD_COLOR3}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR2}">{L_USERNAME}:&nbsp;</font></td><td bgcolor="{T_TD_COLOR3}"><input type="text" name="username" size="25" maxlength="40" value="{USERNAME}"></td>
-					</tr>
-					<tr>
-						<td bgcolor="{T_TD_COLOR3}" align="right"><font face="{T_FONTFACE1}" size="2" color="{T_FONTCOLOR2}">{L_PASSWORD}:&nbsp;</font></td><td bgcolor="{T_TD_COLOR3}"><input type="password" name="password" size="25" maxlength="25"></td>
-					</tr>
-					<tr>
-						<td colspan="2" bgcolor="{T_TD_COLOR3}" align="center"><font face="{T_FONTFACE1}" size="2" color="{T_FONTCOLOR2}">{L_AUTO_LOGIN}</font>:&nbsp;<input type="checkbox" name="autologin"></td>
-					</tr>
-					<tr>
-						<td colspan="2" bgcolor="{T_TD_COLOR2}"><table width="100%" cellspacing="0" cellpadding="6" border="0">
-							<tr>
-								<td align="center"><input type="hidden" name="forward_page" value="{FORWARD_PAGE}"><input type="submit" name="submit" value="{L_LOGIN}"></td>
-							</tr>
-							<tr>
-								<td align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_SEND_PASSWORD}">{L_SEND_PASSWORD}</a></font></td>
-							</tr>
-						</table></td>
+						<td align="center"><a href="{U_SEND_PASSWORD}">{L_SEND_PASSWORD}</a></td>
 					</tr>
 				</table></td>
-			</form></tr>
+			</tr>
 		</table></td>
-	</tr>
-</table>
+	</form></tr>
+</table></td>
 
 	</td>
 </tr>
\ No newline at end of file
diff --git a/phpBB/templates/Default/login_footer.tpl b/phpBB/templates/Default/login_footer.tpl
new file mode 100644
index 0000000000..0628ebce12
--- /dev/null
+++ b/phpBB/templates/Default/login_footer.tpl
@@ -0,0 +1,5 @@
+<tr>
+	<td><div align="center"><table align="center" border="0" width="60%">
+		<td style="{font-size: 8pt;}" align="right" valign="top"><b>{S_TIMEZONE}</b></td>
+	</table></div></td>
+</tr>
\ No newline at end of file
diff --git a/phpBB/templates/Default/login_header.tpl b/phpBB/templates/Default/login_header.tpl
new file mode 100644
index 0000000000..7c9f5da50f
--- /dev/null
+++ b/phpBB/templates/Default/login_header.tpl
@@ -0,0 +1,7 @@
+<tr>
+	<td><div align="center"><table width="60%" cellspacing="0" cellpadding="4" border="0">
+		<tr>
+			<td align="left" style="{font-size: 8pt; height: 55px;}" nowrap><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+		</tr>
+	</table></div></td>
+</tr>
\ No newline at end of file