diff --git a/phpBB/templates/Default/index_footer.tpl b/phpBB/templates/Default/index_footer.tpl
deleted file mode 100644
index 4070588c1b..0000000000
--- a/phpBB/templates/Default/index_footer.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-	<tr>
-		<td align="center"><table border="0" width="100%" cellpadding="0" cellspacing="1">
-			<tr>
-				<td style="{font-size: 8pt;}"><img src="images/folder.gif"> = {L_NEWPOSTS}</td>
-				<td style="{font-size: 8pt;}" align="right" valign="top"><b>{S_TIMEZONE}</b></td>
-			</tr>
-			<tr>
-				<td style="{font-size: 8pt;}"><img src="images/red_folder.gif"> = {L_NONEWPOSTS}</td>
-			</tr>
-		</table></td>
-	</tr>
\ No newline at end of file
diff --git a/phpBB/templates/Default/index_header.tpl b/phpBB/templates/Default/index_header.tpl
deleted file mode 100644
index a7e8ebae14..0000000000
--- a/phpBB/templates/Default/index_header.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<tr>
-<td>
-  <table border="0" align="right" width="30%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-  <tr>
-	  <td>
-	    <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-        <tr>
-	        <td align="right" style="{font-size: 8pt;}">{L_POSTEDTOTAL} -<b>{TOTAL_POSTS}</b>- {L_MESSAGES}.<br>
-	          {L_WEHAVE} <b>{TOTAL_USERS}</b> {L_REGUSERS}.<br>
-	          {L_NEWESTUSER} <b><a href="{U_NEWEST_USER_PROFILE}">{NEWEST_USER}</a></b><br>
-	          {L_ARECURRENTLY} <a href="{U_VIEWONLINE}"><b>{USERS_BROWSING}</b> {L_BROWSING}</a> {L_THEFORUMS}<br>
-	        </td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-	</table>
- </td>
-</tr>
diff --git a/phpBB/templates/Default/login_footer.tpl b/phpBB/templates/Default/login_footer.tpl
deleted file mode 100644
index 0628ebce12..0000000000
--- a/phpBB/templates/Default/login_footer.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644
index 7c9f5da50f..0000000000
--- a/phpBB/templates/Default/login_header.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
diff --git a/phpBB/templates/Default/newtopic_header.tpl b/phpBB/templates/Default/newtopic_header.tpl
deleted file mode 100644
index 903fad68e8..0000000000
--- a/phpBB/templates/Default/newtopic_header.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<tr>
-	<td>
-	  <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	  <tr>
-	    <td>
-	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	        <tr>
-                  <td align="center" style="{font-size: 8pt;}">
-                    {L_POSTNEWIN}<br>
-	            <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a>
-	          </td>
-	        </tr>
-	      </table>
-	    </td>
-	  </tr>
-	  </table>
-	 </td>
-	</tr>
diff --git a/phpBB/templates/Default/viewforum_footer.tpl b/phpBB/templates/Default/viewforum_footer.tpl
deleted file mode 100644
index a89b71de55..0000000000
--- a/phpBB/templates/Default/viewforum_footer.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<tr>
-	<td>
-	<table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-	<tr>
-	<td>
-	  <table border="0" align="left" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	  <tr>
-	    <td>
-	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	        <tr>
-	          <td align="left" style="{font-size: 8pt;}"><a href="{U_POST_NEW_TOPIC}"><img src="images/newpost.jpg" height="50" width="250" alt="Post New Topic" border="0"></a></td>
-	        </tr>
-	      </table>
-	    </td>
-	  </tr>
-	  </table>
-	 
-	   <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	    <tr>                           
-	      <td>                          
-	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	          <tr>
-	            <td align="right" style="{font-size: 8pt; height: 55px;}">{JUMPBOX}</td>    
-	          </tr>                               
-	        </table>                              
-	      </td>                                    
-	    </tr>
-	    </table>
-	  
-	 </td>
-	</tr>
-  </table>
- </td>
-</tr>
diff --git a/phpBB/templates/Default/viewforum_header.tpl b/phpBB/templates/Default/viewforum_header.tpl
deleted file mode 100644
index abdfebf3e5..0000000000
--- a/phpBB/templates/Default/viewforum_header.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<tr>
-	<td>
-	<table border="0" width="100%" cellpadding="0" cellspacing="0">
-	  <tr>
-	  <td>
-	   <table border="0" align="left" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	    <tr>                           
-	      <td>                         
-	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	          <tr>                                
-	            <td align="left" style="{font-size: 8pt; height: 55px;}" nowrap>
-							<div style="{font-size: 10pt; font-weight: bold}">{FORUM_NAME}</div>
-							Moderated by - {MODERATORS}<br>
-	            <a href="{U_INDEX}">{SITENAME} - Forum Index</a> >> {FORUM_NAME}
-	            </td>                             
-	          </tr>                               
-	        </table>                              
-	      </td>                                   
-	    </tr>                                      
-	    </table>
-	  <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	  <tr>
-	    <td>
-	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	        <tr>
-	          <td align="right" style="{font-size: 8pt;}">
-	            <a href="{U_POST_NEW_TOPIC}">
-	            <img src="images/newpost.jpg" height="50" width="250" alt="Post New Topic" border="0">
-	            </a>
-	          </td>
-	        </tr>
-	      </table>
-	    </td>
-	  </tr>
-	  </table>
-		</td>
-		</tr>
-		</table>
-	 </td>
-	</tr>
diff --git a/phpBB/templates/Default/viewonline_body_guests.tpl b/phpBB/templates/Default/viewonline_body_guests.tpl
deleted file mode 100644
index 6e7c62b150..0000000000
--- a/phpBB/templates/Default/viewonline_body_guests.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<tr>
-	<td><table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-		<tr>
-			<td><table border="0" width="100%" cellpadding="3" cellspacing="1">
-				<tr class="tableheader">
-					<td colspan="4" align="center"><b>{L_ANONYMOUS_ONLINE}</b></td>
-				</tr>
-				<tr class="catheader">
-					<td width="30%" align="center">&nbsp;{L_USERNAME}&nbsp;</td>
-					<td width="30%" align="center">&nbsp;{L_LASTUPDATE}&nbsp;</td>
-					<td width="40%" align="center">&nbsp;{L_LOCATION}&nbsp;</td>
-				</tr>
-				<!-- BEGIN userguestrow -->
-				<tr bgcolor="{userguestrow.ROW_COLOR}" class="tablebody">
-					<td width="30%">&nbsp;{userguestrow.USERNAME}&nbsp;</td>
-					<td width="30%" align="center">&nbsp;{userguestrow.LASTUPDATE}&nbsp;</td>
-					<td width="40%"><a href="{userguestrow.LOCATION_URL}">&nbsp;{userguestrow.LOCATION}&nbsp;</a></td>
-				</tr>
-				<!-- END userguestrow -->
-			</table></td>
-		</tr>
-	</table></td>
-</tr>
\ No newline at end of file
diff --git a/phpBB/templates/Default/viewonline_body_reg.tpl b/phpBB/templates/Default/viewonline_body_reg.tpl
deleted file mode 100644
index 85f83a10f2..0000000000
--- a/phpBB/templates/Default/viewonline_body_reg.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<tr>
-	<td><table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-		<tr>
-			<td><table border="0" width="100%" cellpadding="3" cellspacing="1">
-				<tr class="tableheader">
-					<td colspan="4" align="center"><b>{L_REGISTERED_ONLINE}</b></td>
-				</tr>
-				<tr class="catheader">
-					<td width="30%" align="center">&nbsp;{L_USERNAME}&nbsp;</td>
-					<td width="20%" align="center">&nbsp;{L_LASTUPDATE}&nbsp;</td>
-					<td width="10%" align="center">&nbsp;{L_LOGGED_ON}&nbsp;</td>
-					<td width="40%" align="center">&nbsp;{L_LOCATION}&nbsp;</td>
-				</tr>
-				<!-- BEGIN userregrow -->
-				<tr bgcolor="{userregrow.ROW_COLOR}" class="tablebody">
-					<td width="30%">&nbsp;<a href="profile.{PHPEX}?mode=view&{POST_USER_URL}={userregrow.USER_ID}">{userregrow.USERNAME}</a>&nbsp;</td>
-					<td width="20%" align="center">&nbsp;{userregrow.LASTUPDATE}&nbsp;</td>
-					<td width="10%" align="center">&nbsp;{userregrow.LOGGEDON}&nbsp;</td>
-					<td width="40%">&nbsp;<a href="{userregrow.LOCATION_URL}">{userregrow.LOCATION}</a>&nbsp;</td>
-				</tr>
-				<!-- END userregrow -->
-			</table></td>
-		</tr>
-	</table></td>
-</tr>
\ No newline at end of file
diff --git a/phpBB/templates/Default/viewonline_footer.tpl b/phpBB/templates/Default/viewonline_footer.tpl
deleted file mode 100644
index 93e69a36f5..0000000000
--- a/phpBB/templates/Default/viewonline_footer.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-	<tr>
-		<td align="center"><table border="0" width="100%" cellpadding="0" cellspacing="1">
-			<tr>
-				<td style="{font-size: 8pt;}" align="left" valign="top"><b>{S_TIMEZONE}</b></td>
-				<td style="{font-size: 8pt;}" align="right" ><table cellpadding="0" cellspacing="1" border="0" bgcolor="#000000">
-					<tr>
-						<td bgcolor="#CCCCCC"><table width="100%" cellpadding="1" cellspacing="1" border="0">
-							<tr>
-								<td style="{font-size:8pt; height:55px;}" align="right">{JUMPBOX}</td>
-							</tr>
-						</table></td>
-					</tr>
-				</table></td>
-			</tr>
-		</table></td>
-	</tr>
diff --git a/phpBB/templates/Default/viewonline_header.tpl b/phpBB/templates/Default/viewonline_header.tpl
deleted file mode 100644
index 0b2e6081c0..0000000000
--- a/phpBB/templates/Default/viewonline_header.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<tr>
-<td>
-  <table border="0" align="right" width="30%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-  <tr>
-	  <td>
-	    <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-        <tr>
-	        <td align="right" style="{font-size: 8pt;}">{L_POSTEDTOTAL} -<b>{TOTAL_POSTS}</b>- {L_MESSAGES}.<br>
-	          {L_WEHAVE} <b>{TOTAL_USERS}</b> {L_REGUSERS}.<br>
-	          {L_NEWESTUSER} <b><a href="{U_NEWEST_USER_PROFILE}">{NEWEST_USER}</a></b>
-	        </td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-	</table>
- </td>
-</tr>
\ No newline at end of file
diff --git a/phpBB/templates/Default/viewtopic_footer.tpl b/phpBB/templates/Default/viewtopic_footer.tpl
deleted file mode 100644
index 0b03860f44..0000000000
--- a/phpBB/templates/Default/viewtopic_footer.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<tr>
-	<td>
-	<table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-	<tr>
-	<td>
-	  <table border="0" align="left" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	  <tr>
-	    <td>
-	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	        <tr>
-	          <td align="left" style="{font-size: 8pt;}">
-	            <a href="{U_POST_NEW_TOPIC}">
-	            <img src="images/newpost.jpg" height="50" width="125" alt="Post New Topic" border="0"></a>&nbsp;
-                    <a href="{U_POST_REPLY_TOPIC}">
-                    <img src="images/reply.jpg" height="50" width="125" alt="Reply to this topic" border="0">
-	            </a>
-	          </td>
-	        </tr>
-	      </table>
-	    </td>
-	  </tr>
-	  </table>
-	 
-	   <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	    <tr>                           
-	      <td>                          
-	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	          <tr>
-	            <td align="right" style="{font-size: 8pt; height: 55px;}">{JUMPBOX}</td>                             
-	          </tr>                               
-	        </table>                              
-	      </td>                                    
-	    </tr>
-	    </table>
-	  
-	 </td>
-	</tr>
-  </table>
- </td>
-</tr>
diff --git a/phpBB/templates/Default/viewtopic_header.tpl b/phpBB/templates/Default/viewtopic_header.tpl
deleted file mode 100644
index 352af43c9f..0000000000
--- a/phpBB/templates/Default/viewtopic_header.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<tr>
-	<td>
-	<table border="0" width="100%" cellpadding="0" cellspacing="0">
-	  <tr>
-	  <td>
-	   <table border="0" align="left" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	    <tr>                           
-	      <td>                         
-	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	          <tr>                                
-	            <td align="left" valign="bottom" style="{font-size: 8pt; height: 55px;}" nowrap>
-	            <a href="{U_INDEX}">{SITENAME} - Forum Index</a> >> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a> >> {TOPIC_TITLE}
-	            </td>                             
-	          </tr>                               
-	        </table>                              
-	      </td>                                   
-	    </tr>                                      
-	    </table>
-	  <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
-	  <tr>
-	    <td>
-	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
-	        <tr>
-	          <td align="right" style="{font-size: 8pt;}">
-	            <a href="{U_POST_NEW_TOPIC}"><img src="images/newpost.jpg" height="50" width="125" alt="Post New Topic" border="0"></a>&nbsp;<a href="{U_POST_REPLY_TOPIC}"><img src="images/reply.jpg" height="50" width="125" alt="Reply to this topic" border="0"></a>
-	          </td>
-	        </tr>
-	      </table>
-	    </td>
-	  </tr>
-	  </table>
-		</td>
-		</tr>
-		</table>
-	 </td>
-	</tr>