diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
deleted file mode 100644
index 633acf66e0..0000000000
--- a/phpBB/styles/subsilver2/style.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# phpBB Style Configuration File
-#
-# This file is part of the phpBB Forum Software package.
-#
-# @copyright (c) phpBB Limited <https://www.phpbb.com>
-# @license GNU General Public License, version 2 (GPL-2.0)
-#
-# For full copyright and license information, please see
-# the docs/CREDITS.txt file.
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes.
-# Single and double quotes do not need to be escaped.
-#
-#
-
-# General Information about this style
-name = subsilver2
-copyright = © 2005 phpBB Limited
-style_version = 3.1.0-RC2
-phpbb_version = 3.1.0-RC2
-
-# Defining a different template bitfield
-# template_bitfield = lNg=
-
-# Parent style
-# Set value to empty or to this style's name if this style does not have a parent style
-parent = subsilver2
diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html
deleted file mode 100644
index baad7c6cfc..0000000000
--- a/phpBB/styles/subsilver2/template/attachment.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-<!-- BEGIN _file -->
-
-	<!-- IF _file.S_DENIED -->
-		<span class="genmed">[{_file.DENIED_MESSAGE}]</span><br />
-	<!-- ELSE -->
-
-		<!-- IF _file.COMMENT -->
-			<span class="gensmall"><b>{L_FILE_COMMENT}{L_COLON}</b> {_file.COMMENT}</span><br />
-		<!-- ENDIF -->
-
-		<!-- IF _file.S_THUMBNAIL -->
-			<a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{_file.DOWNLOAD_NAME}" /></a><br />
-			<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
-		<!-- ENDIF -->
-
-		<!-- IF _file.S_IMAGE -->
-			<img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" /><br />
-			<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
-		<!-- ENDIF -->
-
-		<!-- IF _file.S_FILE -->
-			<span class="genmed">
-				<!-- IF _file.UPLOAD_ICON -->{_file.UPLOAD_ICON} <!-- ENDIF -->
-				<a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [{_file.FILESIZE} {_file.SIZE_LANG}]
-			</span><br />
-			<span class="gensmall">{_file.L_DOWNLOAD_COUNT}</span>
-		<!-- ENDIF -->
-
-		<!-- IF _file.S_WM_FILE -->
-			<!-- method used here from http://alistapart.com/articles/byebyeembed / autosizing seems to not work always, this will not fix -->
-			<object width="320" height="285" classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" id="wmstream_{_file.ATTACH_ID}">
-				<param name="url" value="{_file.U_DOWNLOAD_LINK}" />
-				<param name="showcontrols" value="1" />
-				<param name="showdisplay" value="0" />
-				<param name="showstatusbar" value="0" />
-				<param name="autosize" value="1" />
-				<param name="autostart" value="0" />
-				<param name="visible" value="1" />
-				<param name="animationstart" value="0" />
-				<param name="loop" value="0" />
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-				<!--[if !IE]>-->
-					<object width="320" height="285" type="video/x-ms-wmv" data="{_file.U_DOWNLOAD_LINK}">
-						<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-						<param name="controller" value="1" />
-						<param name="showcontrols" value="1" />
-						<param name="showdisplay" value="0" />
-						<param name="showstatusbar" value="0" />
-						<param name="autosize" value="1" />
-						<param name="autostart" value="0" />
-						<param name="visible" value="1" />
-						<param name="animationstart" value="0" />
-						<param name="loop" value="0" />
-					</object>
-				<!--<![endif]-->
-			</object>
-
-		<!-- ELSEIF _file.S_FLASH_FILE -->
-			<object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{_file.WIDTH}" height="{_file.HEIGHT}">
-				<param name="movie" value="{_file.U_VIEW_LINK}" />
-				<param name="play" value="true" />
-				<param name="loop" value="true" />
-				<param name="quality" value="high" />
-				<param name="allowScriptAccess" value="never" />
-				<param name="allowNetworking" value="internal" />
-				<embed src="{_file.U_VIEW_LINK}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{_file.WIDTH}" height="{_file.HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never" allownetworking="internal"></embed>
-			</object>
-		<!-- ELSEIF _file.S_QUICKTIME_FILE -->
-			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="320" height="285">
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}">
-				<param name="controller" value="true">
-				<param name="autoplay" value="false" />
-				<param name="type" value="video/quicktime">
-				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"></embed>
-			</object>
-		<!-- ELSEIF _file.S_RM_FILE -->
-			<object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50">
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}">
-				<param name="autostart" value="false">
-				<param name="controls" value="ImageWindow">
-				<param name="console" value="ctrls_{_file.ATTACH_ID}">
-				<param name="prefetch" value="false">
-				<embed name="rmstream_{_file.ATTACH_ID}" type="audio/x-pn-realaudio-plugin" src="{_file.U_DOWNLOAD_LINK}" width="0" height="0" autostart="false" controls="ImageWindow" console="ctrls_{_file.ATTACH_ID}" prefetch="false"></embed>
-			</object>
-			<br />
-			<object id="ctrls_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="0" height="36">
-				<param name="controls" value="ControlPanel">
-				<param name="console" value="ctrls_{_file.ATTACH_ID}">
-				<embed name="ctrls_{_file.ATTACH_ID}" type="audio/x-pn-realaudio-plugin" width="200" height="36" controls="ControlPanel" console="ctrls_{_file.ATTACH_ID}"></embed>
-			</object>
-
-			<script type="text/javascript">
-			// <![CDATA[
-				if (document.rmstream_{_file.ATTACH_ID}.GetClipWidth)
-				{
-					while (!document.rmstream_{_file.ATTACH_ID}.GetClipWidth())
-					{
-					}
-
-					var width = document.rmstream_{_file.ATTACH_ID}.GetClipWidth();
-					var height = document.rmstream_{_file.ATTACH_ID}.GetClipHeight();
-
-					document.rmstream_{_file.ATTACH_ID}.width = width;
-					document.rmstream_{_file.ATTACH_ID}.height = height;
-					document.ctrls_{_file.ATTACH_ID}.width = width;
-				}
-			// ]]>
-			</script>
-		<!-- ENDIF -->
-
-		<!-- IF _file.S_WM_FILE or _file.S_RM_FILE or _file.S_FLASH_FILE or _file.S_QUICKTIME_FILE -->
-			<br />
-			<!-- IF _file.S_QUICKTIME_FILE --><a href="#" onclick="play_qt_file(document.qtstream_{_file.ATTACH_ID}); return false;">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
-			<span class="gensmall"><a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
-		<!-- ENDIF -->
-
-		<br />
-	<!-- ENDIF -->
-
-<!-- END _file -->
diff --git a/phpBB/styles/subsilver2/template/bbcode.html b/phpBB/styles/subsilver2/template/bbcode.html
deleted file mode 100644
index 9ee5acec34..0000000000
--- a/phpBB/styles/subsilver2/template/bbcode.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- BEGIN ulist_open --><ul style="list-style-type: {LIST_TYPE}"><!-- END ulist_open -->
-<!-- BEGIN ulist_open_default --><ul><!-- END ulist_open_default -->
-<!-- BEGIN ulist_close --></ul><!-- END ulist_close -->
-
-<!-- BEGIN olist_open --><ol style="list-style-type: {LIST_TYPE}"><!-- END olist_open -->
-<!-- BEGIN olist_close --></ol><!-- END olist_close -->
-
-<!-- BEGIN listitem --><li><!-- END listitem -->
-<!-- BEGIN listitem_close --></li><!-- END listitem_close -->
-
-<!-- BEGIN quote_username_open -->
-<div class="quotetitle">{USERNAME} {L_WROTE}{L_COLON}</div><div class="quotecontent">
-<!-- END quote_username_open -->
-
-<!-- BEGIN quote_open -->
-<div class="quotetitle"><b>{L_QUOTE}{L_COLON}</b></div><div class="quotecontent">
-<!-- END quote_open -->
-
-<!-- BEGIN quote_close -->
-</div>
-<!-- END quote_close -->
-
-<!-- BEGIN code_open -->
-<div class="codetitle"><b>{L_CODE}{L_COLON}</b></div><pre class="codecontent">
-<!-- END code_open -->
-
-<!-- BEGIN code_close -->
-</pre>
-<!-- END code_close -->
-
-<!-- BEGIN inline_attachment_open -->
-<div class="attachtitle">{L_ATTACHMENT}{L_COLON}</div><div class="attachcontent">
-<!-- END inline_attachment_open -->
-
-<!-- BEGIN inline_attachment_close -->
-</div>
-<!-- END inline_attachment_close -->
-
-
-<!-- BEGIN b_open --><strong><!-- END b_open -->
-<!-- BEGIN b_close --></strong><!-- END b_close -->
-
-<!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
-<!-- BEGIN u_close --></span><!-- END u_close -->
-
-<!-- BEGIN i_open --><em><!-- END i_open -->
-<!-- BEGIN i_close --></em><!-- END i_close -->
-
-<!-- BEGIN color --><span style="color: {COLOR}">{TEXT}</span><!-- END color -->
-
-<!-- BEGIN size --><span style="font-size: {SIZE}%; line-height: normal">{TEXT}</span><!-- END size -->
-
-<!-- BEGIN img --><img src="{URL}" class="postimage" alt="{L_IMAGE}" /><!-- END img -->
-
-<!-- BEGIN url --><a href="{URL}" class="postlink">{DESCRIPTION}</a><!-- END url -->
-
-<!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email -->
-
-<!-- BEGIN flash -->
-	<object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}">
-		<param name="movie" value="{URL}" />
-		<param name="play" value="false" />
-		<param name="loop" value="false" />
-		<param name="quality" value="high" />
-		<param name="allowScriptAccess" value="never" />
-		<param name="allowNetworking" value="internal" />
-		<embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed>
-	</object>
-<!-- END flash -->
diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
deleted file mode 100644
index 25387da832..0000000000
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ /dev/null
@@ -1,14 +0,0 @@
-	<!-- IF $S_MICRODATA --><!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' --><!-- ELSE --><!-- DEFINE $MICRODATA = '' --><!-- ENDIF -->
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
-	<tr>
-		<td class="row1">
-			<!-- EVENT overall_header_breadcrumbs_before -->
-			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><!-- IF $OVERALL_HEADER_BREADCRUMBS --><!-- EVENT overall_header_breadcrumb_prepend --><!-- ELSE --><!-- EVENT overall_footer_breadcrumb_prepend --><!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a><!-- BEGIN navlinks --><!-- EVENT overall_header_navlink_prepend --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a><!-- EVENT overall_header_navlink_append --><!-- END navlinks -->
-			<!-- IF $OVERALL_HEADER_BREADCRUMBS --><!-- EVENT overall_header_breadcrumb_append --><!-- ELSE --><!-- EVENT overall_footer_breadcrumb_append --><!-- ENDIF --></p>
-			<!-- EVENT overall_header_breadcrumbs_after -->
-			<!-- EVENT overall_footer_timezone_before -->
-			<p class="datetime">{S_TIMEZONE}</p>
-			<!-- EVENT overall_footer_timezone_after -->
-		</td>
-	</tr>
-	</table>
diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html
deleted file mode 100644
index 1be25403ce..0000000000
--- a/phpBB/styles/subsilver2/template/captcha_default.html
+++ /dev/null
@@ -1,17 +0,0 @@
-	<tr>
-		<th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>
-	</tr>
-	<!-- IF S_TYPE == 1 -->
-	<tr>
-		<td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_EXPLAIN}</span></td>
-	</tr>
-	<!-- ENDIF -->	
-	<tr>
-		<td class="row1" colspan="2" align="center"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" />
-		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}{L_COLON}</b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> />
-		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="btnlite" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>
-	</tr>
diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html
deleted file mode 100644
index 90a6492400..0000000000
--- a/phpBB/styles/subsilver2/template/captcha_qa.html
+++ /dev/null
@@ -1,8 +0,0 @@
-	<tr>
-		<th colspan="2" valign="middle">{L_CONFIRM_QUESTION}</th>
-	</tr>
-	<tr>
-		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}{L_COLON}</b><br /><span class="gensmall">{L_CONFIRM_QUESTION_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="qa_answer" size="80"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> />
-		<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>
-	</tr>
diff --git a/phpBB/styles/subsilver2/template/captcha_recaptcha.html b/phpBB/styles/subsilver2/template/captcha_recaptcha.html
deleted file mode 100644
index 0d116b361f..0000000000
--- a/phpBB/styles/subsilver2/template/captcha_recaptcha.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- IF S_RECAPTCHA_AVAILABLE -->
-	<tr>
-		<th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>
-	</tr>
-	<tr>
-		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}{L_COLON}</b><br /><span class="gensmall">{L_RECAPTCHA_EXPLAIN}</span></td>
-		<td class="row2">
-		<script type="text/javascript">
-		// <![CDATA[
-		var RecaptchaOptions = {
-			lang : '{LA_RECAPTCHA_LANG}',
-			theme : 'clean',
-			tabindex : <!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->
-		};
-		// ]]>
-		</script>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" ></script>
-		<script type="text/javascript">
-		// <![CDATA[
-		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-			document.getElementById('recaptcha_table').style.direction = 'ltr';
-		<!-- ENDIF -->
-		// ]]>
-		</script>
-
-			<noscript>
-				<iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br />
-				<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-				<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
-			</noscript>
-		</td>
-	</tr>
-
-<!-- ELSE -->
-{L_RECAPTCHA_NOT_AVAILABLE}
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/confirm_body.html b/phpBB/styles/subsilver2/template/confirm_body.html
deleted file mode 100644
index 1712017c38..0000000000
--- a/phpBB/styles/subsilver2/template/confirm_body.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="pagecontent">
-
-	<form name="confirm" action="{S_CONFIRM_ACTION}" method="post">
-	
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{MESSAGE_TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnlite" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td>
-	</tr>
-	</table>
-	
-	</form>
-	
-</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/confirm_delete_body.html b/phpBB/styles/subsilver2/template/confirm_delete_body.html
deleted file mode 100644
index 18df397fc3..0000000000
--- a/phpBB/styles/subsilver2/template/confirm_delete_body.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="pagecontent">
-
-	<form name="confirm" action="{S_CONFIRM_ACTION}" method="post">
-	
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{MESSAGE_TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center">
-			<br />
-			<p class="gen">{MESSAGE_TEXT}</p>
-			<br />
-
-			<table border="0" width="90%" cellspacing="2" cellpadding="1">
-			<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-				<tr>
-					<td class="row1" width="22%"><b class="gen">{L_DELETE_PERMANENTLY}{L_COLON}</b></td>
-					<td class="row1" width="78%">
-						<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
-						<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
-					</td>
-				</tr>
-			<!-- ENDIF -->
-				<tr>
-					<td class="row1" valign="top"><span class="gen"><b>{L_DELETE_REASON}{L_COLON}</b></span><br /><span class="gensmall">{L_DELETE_REASON_EXPLAIN}</span></td>
-					<td class="row1"><input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></td>
-				</tr>
-			</table>
-			<br />
-
-			{S_HIDDEN_FIELDS}
-			<input type="submit" name="confirm" value="{L_YES}" class="btnmain" />&nbsp;&nbsp;
-			<input type="submit" name="cancel" value="{L_NO}" class="btnlite" />
-		</td>
-	</tr>
-	</table>
-	
-	</form>
-	
-</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/faq_body.html b/phpBB/styles/subsilver2/template/faq_body.html
deleted file mode 100644
index b3c41e932a..0000000000
--- a/phpBB/styles/subsilver2/template/faq_body.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="faqtop" class="anchor"></a>
-
-<div id="pagecontent">
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{L_FAQ_TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1">
-		<!-- BEGIN faq_block -->
-			<span class="gen"><b>{faq_block.BLOCK_TITLE}</b></span><br />
-			<!-- BEGIN faq_row -->
-				<span class="gen"><a href="#f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}">{faq_block.faq_row.FAQ_QUESTION}</a></span><br />
-			<!-- END faq_row -->
-			<br />
-		<!-- END faq_block -->
-		</td>
-	</tr>
-	<tr>
-		<td class="cat">&nbsp;</td>
-	</tr>
-	</table>
-
-	<br clear="all" />
-
-	<!-- BEGIN faq_block -->
-		<table class="tablebg" width="100%" cellspacing="1">
-		<tr> 
-			<td class="cat" align="center"><h4>{faq_block.BLOCK_TITLE}</h4></td>
-		</tr>
-		<!-- BEGIN faq_row --> 
-		<tr>
-			<!-- IF faq_block.faq_row.S_ROW_COUNT is even -->
-				<td class="row1" valign="top">
-			<!-- ELSE -->
-				<td class="row2" valign="top">
-			<!-- ENDIF -->
-				<div class="postbody"><a name="f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}" class="anchor"></a><b>&#187; {faq_block.faq_row.FAQ_QUESTION}</b></div>
-				<div class="postbody">{faq_block.faq_row.FAQ_ANSWER}</div>
-				<p class="gensmall"><a href="#faqtop">{L_BACK_TO_TOP}</a></p>
-			</td>
-		</tr>
-		<tr>
-			<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-		</tr>
-		<!-- END faq_row -->
-		</table>
-
-		<br clear="all" />
-	<!-- END faq_block -->
-
-</div>
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
deleted file mode 100644
index 0d522a6959..0000000000
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<table class="tablebg" cellspacing="1" width="100%">
-<tr>
-	<td class="cat" colspan="5" align="{S_CONTENT_FLOW_END}"><!-- IF not S_IS_BOT and U_MARK_FORUMS --><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a><!-- ENDIF -->&nbsp;</td>
-</tr>
-<tr>
-	<th colspan="2">&nbsp;{L_FORUM}&nbsp;</th>
-	<th width="50">&nbsp;{L_TOPICS}&nbsp;</th>
-	<th width="50">&nbsp;{L_POSTS}&nbsp;</th>
-	<th>&nbsp;{L_LAST_POST}&nbsp;</th>
-</tr>
-<!-- BEGIN forumrow -->
-	<!-- EVENT forumlist_body_category_header_before -->
-	<!-- IF forumrow.S_IS_CAT -->
-		<tr>
-			<td class="cat" colspan="2"><h4><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></h4></td>
-			<td class="catdiv" colspan="3">&nbsp;</td>
-		</tr>
-	<!-- EVENT forumlist_body_category_header_after -->
-	<!-- ELSEIF forumrow.S_IS_LINK -->
-		<tr>
-			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>
-			<td class="row1">
-				<!-- IF forumrow.FORUM_IMAGE -->
-					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}{L_COLON} 5px;">{forumrow.FORUM_IMAGE}</div>
-				<!-- ENDIF -->
-				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>
-				<p class="forumdesc">{forumrow.FORUM_DESC}</p>
-			</td>
-			<!-- IF forumrow.CLICKS -->
-				<td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}{L_COLON} {forumrow.CLICKS}</span></td>
-			<!-- ELSE -->
-				<td class="row2" colspan="3" align="center">&nbsp;</td>
-			<!-- ENDIF -->
-		</tr>
-	<!-- ELSE -->
-		<!-- IF forumrow.S_NO_CAT -->
-			<tr>
-				<td class="cat" colspan="2"><h4>{L_FORUM}</h4></td>
-				<td class="catdiv" colspan="3">&nbsp;</td>
-			</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>
-			<td class="row1" width="100%">
-				<!-- IF forumrow.FORUM_IMAGE -->
-					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}{L_COLON} 5px;">{forumrow.FORUM_IMAGE}</div>
-				<!-- ENDIF -->
-				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>
-				<p class="forumdesc">{forumrow.FORUM_DESC}</p>
-				<!-- IF forumrow.MODERATORS -->
-					<p class="forumdesc"><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}</p>
-				<!-- ENDIF -->
-				<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS -->
-					<!-- EVENT forumlist_body_subforums_before -->
-					<p class="forumdesc"><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong>
-					<!-- BEGIN subforum -->
-						<a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF -->
-					<!-- END subforum -->
-					</p>
-					<!-- EVENT forumlist_body_subforums_after -->
-				<!-- ENDIF -->
-			</td>
-			<td class="row2" align="center"><p class="topicdetails">{forumrow.TOPICS}</p></td>
-			<td class="row2" align="center"><p class="topicdetails">{forumrow.POSTS}</p></td>
-			<td class="row2" align="center" nowrap="nowrap">
-				<!-- IF forumrow.LAST_POST_TIME -->
-					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
-						<!-- EVENT forumlist_body_last_post_title_prepend -->
-						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
-					<!-- ENDIF -->
-					<p class="topicdetails">
-						<!-- IF forumrow.U_UNAPPROVED_TOPICS -->
-							<a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;
-						<!-- ELSEIF forumrow.U_UNAPPROVED_POSTS -->
-							<a href="{forumrow.U_UNAPPROVED_POSTS}" class="imageset">{UNAPPROVED_POST_IMG}</a>&nbsp;
-						<!-- ENDIF -->
-						{forumrow.LAST_POST_TIME}
-					</p>
-					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
-						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-					</p>
-				<!-- ELSE -->
-					<p class="topicdetails">{L_NO_POSTS}</p>
-				<!-- ENDIF -->
-			</td>
-		</tr>
-	<!-- ENDIF -->
-	<!-- EVENT forumlist_body_last_row_after -->
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="5" align="center"><p class="gensmall">{L_NO_FORUMS}</p></td>
-	</tr>
-<!-- END forumrow -->
-</table>
diff --git a/phpBB/styles/subsilver2/template/index.htm b/phpBB/styles/subsilver2/template/index.htm
deleted file mode 100644
index 4763c05f0e..0000000000
--- a/phpBB/styles/subsilver2/template/index.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<title>subSilver created by subBlue Design</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<table width="100%" height="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr>
-		<td align="center" valign="middle"><a href="http://www.subblue.com/" target="_new"><img src="images/created_by.jpg" width="400" height="300" alt="Created by subBlue Design" /></a></td>
-	</tr>
-</table>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
deleted file mode 100644
index 1a2786015f..0000000000
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<!-- EVENT index_body_markforums_before -->
-
-<!-- IF U_MCP or U_ACP -->
-	<div id="pageheader">
-		<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
-	</div>
-
-	<br clear="all" /><br />
-<!-- ENDIF -->
-
-<!-- EVENT index_body_markforums_after -->
-
-<!-- INCLUDE forumlist_body.html -->
-
-<!-- IF not S_IS_BOT or U_TEAM -->
-<span class="gensmall">
-	<!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a><!-- ENDIF -->
-	<!-- IF not S_IS_BOT and U_TEAM --> | <!-- ENDIF -->
-	<!-- EVENT overall_footer_teamlink_before -->
-	<!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF -->
-	<!-- IF U_CONTACT_US -->
-		<!-- IF U_TEAM --> | <!-- ENDIF -->
-		<a href="{U_CONTACT_US}">{L_CONTACT_US}</a>
-	<!-- ENDIF -->
-	<!-- EVENT overall_footer_teamlink_after -->
-</span>
-<!-- ENDIF -->
-<br />
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<!-- EVENT index_body_stat_blocks_before -->
-
-<!-- IF S_DISPLAY_ONLINE_LIST -->
-	<br clear="all" />
-
-	<table class="tablebg stat-block online-list" width="100%" cellspacing="1">
-	<tr>
-		<td class="cat" colspan="2"><!-- IF U_VIEWONLINE --><h4><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h4><!-- ELSE --><h4>{L_WHO_IS_ONLINE}</h4><!-- ENDIF --></td>
-	</tr>
-	<tr>
-	<!-- IF LEGEND -->
-		<td class="row1" rowspan="2" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
-	<!-- ELSE -->
-		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
-	<!-- ENDIF -->
-		<td class="row1" width="100%">
-			<span class="genmed">
-				<!-- EVENT index_body_block_online_prepend -->
-				{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}
-				<!-- EVENT index_body_block_online_append -->
-			</span>
-		</td>
-	</tr>
-	<!-- IF LEGEND -->
-		<tr>
-			<td class="row1"><b class="gensmall">{L_LEGEND} :: {LEGEND}</b></td>
-		</tr>
-	<!-- ENDIF -->
-	</table>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_BIRTHDAY_LIST -->
-	<br clear="all" />
-
-	<table class="tablebg stat-block birthday-list" width="100%" cellspacing="1">
-	<tr>
-		<td class="cat" colspan="2"><h4>{L_BIRTHDAYS}</h4></td>
-	</tr>
-	<tr>
-		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_BIRTHDAYS}" /></td>
-		<td class="row1" width="100%">
-			<p class="genmed">
-				<!-- EVENT index_body_block_birthday_prepend -->
-				<!-- IF .birthdays -->{L_CONGRATULATIONS}{L_COLON} <b><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF -->
-				<!-- EVENT index_body_block_birthday_append -->
-			</p>
-		</td>
-	</tr>
-	</table>
-<!-- ENDIF -->
-
-<br clear="all" />
-
-<table class="tablebg stat-block statistics" width="100%" cellspacing="1">
-<tr>
-	<td class="cat" colspan="2"><h4>{L_STATISTICS}</h4></td>
-</tr>
-<tr>
-	<td class="row1"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_STATISTICS}" /></td>
-	<td class="row1" width="100%" valign="middle">
-		<p class="genmed">
-			<!-- EVENT index_body_block_stats_prepend -->
-			{TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}
-			<!-- EVENT index_body_block_stats_append -->
-		</p>
-	</td>
-</tr>
-</table>
-
-<!-- EVENT index_body_stat_blocks_after -->
-
-<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
-	<br clear="all" />
-
-	<form method="post" action="{S_LOGIN_ACTION}">
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><span class="genmed">{L_USERNAME}{L_COLON}</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="genmed">{L_PASSWORD}{L_COLON}</span> <input class="post" type="password" name="password" size="10" />&nbsp; <!-- IF U_SEND_PASSWORD --><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a>&nbsp; <!-- ENDIF --> <!-- IF S_AUTOLOGIN_ENABLED --> <span class="gensmall">{L_LOG_ME_IN}</span> <input type="checkbox" class="radio" name="autologin" /><!-- ENDIF -->&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
-	</tr>
-	</table>
-	{S_LOGIN_REDIRECT}
-	{S_FORM_TOKEN}
-	</form>
-<!-- ENDIF -->
-
-<br clear="all" />
-
-<table class="legend">
-<tr>
-	<td width="20" align="center">{FORUM_UNREAD_IMG}</td>
-	<td><span class="gensmall">{L_UNREAD_POSTS}</span></td>
-	<td>&nbsp;&nbsp;</td>
-	<td width="20" align="center">{FORUM_IMG}</td>
-	<td><span class="gensmall">{L_NO_UNREAD_POSTS}</span></td>
-	<td>&nbsp;&nbsp;</td>
-	<td width="20" align="center">{FORUM_LOCKED_IMG}</td>
-	<td><span class="gensmall">{L_FORUM_LOCKED}</span></td>
-</tr>
-</table>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/jumpbox.html b/phpBB/styles/subsilver2/template/jumpbox.html
deleted file mode 100644
index e0603c6a6e..0000000000
--- a/phpBB/styles/subsilver2/template/jumpbox.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-<!-- IF S_DISPLAY_JUMPBOX -->
-	<form method="get" name="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}">
-
-	<table cellspacing="0" cellpadding="0" border="0">
-	<tr>
-		<td nowrap="nowrap">{HIDDEN_FIELDS_FOR_JUMPBOX}<span class="gensmall"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->{L_COLON}</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
-
-		<!-- BEGIN jumpbox_forums -->
-			<!-- IF jumpbox_forums.S_FORUM_COUNT eq 1 --><option value="-1">------------------</option><!-- ENDIF -->
-			<option value="{jumpbox_forums.FORUM_ID}"{jumpbox_forums.SELECTED}><!-- BEGIN level -->&nbsp; &nbsp;<!-- END level -->{jumpbox_forums.FORUM_NAME}</option>
-		<!-- END jumpbox_forums -->
-
-		</select>&nbsp;<input class="btnlite" type="submit" value="{L_GO}" /></td>
-	</tr>
-	</table>
-
-	</form>
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html
deleted file mode 100644
index ed63e748cf..0000000000
--- a/phpBB/styles/subsilver2/template/login_body.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form action="{S_LOGIN_ACTION}" method="post">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<!-- IF not S_ADMIN_AUTH -->
-		<th colspan="2">{L_LOGIN}</th>
-	<!-- ELSE -->
-		<th>{LOGIN_EXPLAIN}</th>
-	<!-- ENDIF -->
-</tr>
-<!-- IF LOGIN_EXPLAIN && not S_ADMIN_AUTH -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall">{LOGIN_EXPLAIN}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr><!-- IF not S_ADMIN_AUTH and S_REGISTER_ENABLED -->
-	<td class="row1" width="50%">
-		<p class="genmed">{L_LOGIN_INFO}</p>
-
-		<p class="genmed" align="center">
-			<a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a>
-		</p>
-	</td>
-	<!-- ENDIF -->
-	<td <!-- IF not S_ADMIN_AUTH -->class="row2"<!-- ELSE -->class="row1"<!-- ENDIF -->>
-	
-		<table align="center" cellspacing="1" cellpadding="4" style="width: 100%;">
-		<!-- IF LOGIN_ERROR -->
-			<tr>
-				<td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td>
-			</tr>
-		<!-- ENDIF -->
-
-		<tr>
-			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: {S_CONTENT_FLOW_END};"<!-- ENDIF -->><b class="gensmall">{L_USERNAME}{L_COLON}</b></td>
-			<td><input class="post" type="text" name="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" tabindex="1" />
-				<!-- IF not S_ADMIN_AUTH and S_REGISTER_ENABLED -->
-					<br /><a class="gensmall" href="{U_REGISTER}">{L_REGISTER}</a>
-				<!-- ENDIF -->
-			</td>
-		</tr>
-		<tr>
-			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: {S_CONTENT_FLOW_END};"<!-- ENDIF -->><b class="gensmall">{L_PASSWORD}{L_COLON}</b></td>
-			<td>
-				<input class="post" type="password" name="{PASSWORD_CREDENTIAL}" size="25" tabindex="2" />
-				<!-- IF U_SEND_PASSWORD --><br /><a class="gensmall" href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a><!-- ENDIF -->
-				<!-- IF U_RESEND_ACTIVATION and not S_ADMIN_AUTH --><br /><a class="gensmall" href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a><!-- ENDIF -->
-			</td>
-		</tr>
-		<!-- IF S_DISPLAY_FULL_LOGIN -->
-			<!-- IF S_AUTOLOGIN_ENABLED -->
-			<tr>
-				<td>&nbsp;</td>
-				<td><input type="checkbox" class="radio" name="autologin" tabindex="3" /> <span class="gensmall">{L_LOG_ME_IN}</span></td>
-			</tr>
-			<!-- ENDIF -->
-			<tr>
-				<td>&nbsp;</td>
-				<td><input type="checkbox" class="radio" name="viewonline" tabindex="4" /> <span class="gensmall">{L_HIDE_ME}</span></td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF not S_ADMIN_AUTH and PROVIDER_TEMPLATE_FILE -->
-			<!-- INCLUDE {PROVIDER_TEMPLATE_FILE} -->
-		<!-- ENDIF -->
-		</table>
-	</td>
-</tr>
-
-<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
-</table>
-<table class="tablebg" width="100%" cellspacing="1">
-	<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
-	<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
-<!-- ENDIF -->
-
-{S_LOGIN_REDIRECT}
-<tr>
-	<td class="cat" <!-- IF not S_ADMIN_AUTH or S_CONFIRM_CODE -->colspan="2"<!-- ENDIF --> align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="5" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<script type="text/javascript">
-// <![CDATA[
-	(function()
-	{
-		var elements = document.getElementsByName("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->");
-		for (var i = 0; i < elements.length; ++i)
-		{
-			if (elements[i].tagName.toLowerCase() == 'input')
-			{
-				elements[i].focus();
-				break;
-			}
-		}
-	})();
-// ]]>
-</script>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/login_body_oauth.html b/phpBB/styles/subsilver2/template/login_body_oauth.html
deleted file mode 100644
index 6f374fa4f2..0000000000
--- a/phpBB/styles/subsilver2/template/login_body_oauth.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- BEGIN oauth -->
-	<tr>
-		<td>
-			<a href="{oauth.REDIRECT_URL}">{oauth.SERVICE_NAME}</a>
-		</td>
-	</tr>
-<!-- END oauth -->
diff --git a/phpBB/styles/subsilver2/template/login_forum.html b/phpBB/styles/subsilver2/template/login_forum.html
deleted file mode 100644
index 9a141fc295..0000000000
--- a/phpBB/styles/subsilver2/template/login_forum.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<!-- IF FORUM_NAME -->
-	<div id="pageheader">
-		<h2><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
-	</div>
-
-	<br clear="all" /><br />
-<!-- ENDIF -->
-
-<div id="pagecontent">
-
-	<form name="login_forum" method="post" action="{S_LOGIN_ACTION}">
-	
-	<table class="tablebg" width="100%" cellspacing="1" align="center">
-	<tr> 
-		<th>{L_LOGIN}</th>
-	</tr>
-	<tr>
-		<td class="row3" align="center"><span class="gensmall">{L_LOGIN_FORUM}</span></td>
-	</tr>
-	<tr> 
-		<td class="row1" align="center">
-		
-			<table cellspacing="1" cellpadding="4" border="0">
-			<!-- IF LOGIN_ERROR -->
-				<tr>
-					<td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td>
-				</tr>
-			<!-- ENDIF -->
-			<tr> 
-				<td class="gensmall"><b>{L_PASSWORD}{L_COLON}</b></td>
-				<td><input class="post" type="password" name="password" size="25" tabindex="2" /></td>
-			</tr>
-			</table>
-		</td>
-	</tr>
-	<tr> 
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="3" /></td>
-	</tr>
-	</table>
-	{S_FORM_TOKEN}
-	{S_LOGIN_REDIRECT}
-	</form>
-
-</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_approve.html b/phpBB/styles/subsilver2/template/mcp_approve.html
deleted file mode 100644
index 8c2ef0806b..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_approve.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="pagecontent">
-
-	<form name="confirm" action="{S_CONFIRM_ACTION}" method="post">
-	
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{MESSAGE_TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center">
-			<!-- IF ADDITIONAL_MSG -->
-				<span class="gen error">{ADDITIONAL_MSG}</span><br />
-			<!-- ENDIF -->
-			<!-- IF S_NOTIFY_POSTER -->
-				<input type="checkbox" class="radio" name="notify_poster" checked="checked" /><span class="gen"><!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></span><br />
-			<!-- ENDIF -->
-			<!-- IF not S_APPROVE and not S_RESTORE and .reason -->
-				<br />
-				<table border="0" width="90%" cellspacing="2" cellpadding="1">
-				<tr>
-					<td class="row1" width="22%"><b class="gen">{L_DISAPPROVE_REASON}{L_COLON}</b></td>
-					<td class="row1" width="78%"><select name="reason_id"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></td>
-				</tr>
-				<tr>
-					<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}{L_COLON}</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td>
-					<td class="row1"><textarea class="post" style="width:500px" name="reason" rows="10" cols="40">{REASON}</textarea></td>
-				</tr>
-				</table>
-				<br />
-			<!-- ENDIF -->
-			<br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br />
-			<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span>
-		</td>
-	</tr>
-	</table>
-	{S_FORM_TOKEN}
-	</form>
-	
-</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html
deleted file mode 100644
index cc24d21d73..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_ban.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-
-	var ban_length = new Array();
-		ban_length[-1] = '';
-	var ban_reason = new Array();
-		ban_reason[-1] = '';
-	var ban_give_reason = new Array();
-		ban_give_reason[-1] = '';
-
-	<!-- BEGIN bans -->
-		ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}';
-		<!-- IF bans.A_REASON -->
-			ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}';
-		<!-- ENDIF -->
-		<!-- IF bans.A_GIVE_REASON -->
-			ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}';
-		<!-- ENDIF -->
-	<!-- END bans -->
-
-	function display_details(option)
-	{
-		document.getElementById('mcp_ban').unbanlength.value = ban_length[option];
-		if (option in ban_reason) {
-			document.getElementById('mcp_ban').unbanreason.value = ban_reason[option];
-		} else {
-			document.getElementById('mcp_ban').unbanreason.value = '';
-		}
-		if (option in ban_give_reason) {
-			document.getElementById('mcp_ban').unbangivereason.value = ban_give_reason[option];
-		} else {
-			document.getElementById('mcp_ban').unbangivereason.value = '';
-		}
-	}
-
-// ]]>
-</script>
-
-<form id="mcp_ban" method="post" action="{U_ACTION}">
-
-<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
-<tr>
-	<th colspan="2" nowrap="nowrap">{L_TITLE}</th>
-</tr>
-<tr>
-	<td class="row3" colspan="2">{L_EXPLAIN}</td>
-</tr>
-<!-- EVENT mcp_ban_fields_before -->
-<tr>
-	<td class="row1" width="45%" valign="top"><b>{L_BAN_CELL}{L_COLON}</b></td>
-	<td class="row2">
-		<textarea name="ban" id="ban" cols="40" rows="3" class="post">{USERNAMES}</textarea>
-		<!-- IF S_USERNAME_BAN --><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- ENDIF -->
-	</td>
-</tr>
-<tr>
-	<td class="row1" valign="top"><b>{L_BAN_LENGTH}{L_COLON}</b></td>
-	<td class="row2"><select name="banlength">{S_BAN_END_OPTIONS}</select><br /><input type="text" name="banlengthother" class="post" /> {L_YEAR_MONTH_DAY}</td>
-</tr>
-<tr>
-	<td class="row1" valign="top"><b>{L_BAN_EXCLUDE}{L_COLON}</b><br /><span class="gensmall">{L_BAN_EXCLUDE_EXPLAIN}</span></td>
-	<td class="row2"><input type="radio" class="radio" name="banexclude" value="1" /> {L_YES} &nbsp; <input type="radio" class="radio" name="banexclude" value="0" checked="checked" /> {L_NO}</td>
-</tr>
-<tr>
-	<td class="row1" valign="top"><b>{L_BAN_REASON}{L_COLON}</b></td>
-	<td class="row2"><input name="banreason" type="text" class="post" maxlength="255" /></td>
-</tr>
-<tr>
-	<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}{L_COLON}</b></td>
-	<td class="row2"><input name="bangivereason" type="text" class="post" maxlength="255" /></td>
-</tr>
-<!-- EVENT mcp_ban_fields_after -->
-<tr>
-	<td class="cat" colspan="2" align="center"><input type="submit" name="bansubmit" value="{L_SUBMIT}" class="btnmain" />&nbsp; <input type="reset" value="{L_RESET}" class="btnlite" />&nbsp;</td>
-</tr>
-</table>
-
-<br /><br />
-
-<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
-<tr>
-	<th colspan="2" nowrap="nowrap">{L_UNBAN_TITLE}</th>
-</tr>
-<tr>
-	<td class="row3" colspan="2">{L_UNBAN_EXPLAIN}</td>
-</tr>
-<!-- IF S_BANNED_OPTIONS -->
-	<!-- EVENT mcp_ban_unban_before -->
-	<tr>
-		<td class="row1" valign="top" width="45%"><b>{L_BAN_CELL}{L_COLON}</b></td>
-		<td class="row2"><select name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></td>
-	</tr>
-	<tr>
-		<td class="row1" valign="top"><b>{L_BAN_LENGTH}{L_COLON}</b></td>
-		<td class="row2"><input style="border: 0; width: 100%" type="text" name="unbanlength" readonly="readonly" /></td>
-	</tr>
-	<tr>
-		<td class="row1" valign="top"><b>{L_BAN_REASON}{L_COLON}</b></td>
-		<td class="row2"><textarea style="border: 0; width: 100%" name="unbanreason" readonly="readonly" rows="5" cols="80">&nbsp;</textarea></td>
-	</tr>
-	<tr>
-		<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}{L_COLON}</b></td>
-		<td class="row2"><textarea style="border: 0; width: 100%" name="unbangivereason" readonly="readonly" rows="5" cols="80">&nbsp;</textarea></td>
-	</tr>
-	<!-- EVENT mcp_ban_unban_after -->
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" />&nbsp; <input type="reset" value="{L_RESET}" class="btnlite" />&nbsp;</td>
-	</tr>
-<!-- ELSE -->
-	<tr>
-		<td class="row1" colspan="2"><b>{L_NO_BAN_CELL}</b></td>
-	</tr>
-<!-- ENDIF -->
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_footer.html b/phpBB/styles/subsilver2/template/mcp_footer.html
deleted file mode 100644
index 280920b148..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_footer.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-			</td>
-		</tr>
-	</table>
-
-	<!-- IF .pagination -->
-		<table width="80%" align="{S_CONTENT_FLOW_END}" cellspacing="1">
-		<tr>
-			<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-			<td class="gensmall" nowrap="nowrap">&nbsp;[ <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ELSEIF TOTAL_POSTS -->{TOTAL_POSTS}<!-- ELSE -->{TOTAL}<!-- ENDIF --> ]&nbsp;</td>
-			<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-		</tr>
-		</table>
-		<br />
-	<!-- ENDIF -->
-	
-</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_forum.html b/phpBB/styles/subsilver2/template/mcp_forum.html
deleted file mode 100644
index b168bf3ac8..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_forum.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<!-- IF S_MERGE_SELECT --><div style="float: {S_CONTENT_FLOW_END};"><!-- INCLUDE jumpbox.html --></div><!-- ENDIF -->
-
-<!-- IF U_VIEW_FORUM_LOGS --><a href="{U_VIEW_FORUM_LOGS}">{L_VIEW_FORUM_LOGS}</a><!-- ENDIF -->
-
-<!-- IF S_MERGE_SELECT --><br clear="{S_CONTENT_FLOW_END}" /><!-- ENDIF -->
-
-<form method="post" id="mcp" action="{S_MCP_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
-</tr>
-<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_MARK}&nbsp;</th>
-</tr>
-<!-- BEGIN topicrow -->
-	<tr>
-		<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
-		<!-- IF S_TOPIC_ICONS -->
-			<!-- td class="row1" width="25" align="center">{topicrow.TOPIC_ICON_IMG}</td -->
-		<!-- ENDIF -->
-		<td class="row1">
-			<!-- IF topicrow.S_SELECT_TOPIC -->
-				<span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT_MERGE}</a> ]&nbsp;</span>
-			<!-- ENDIF -->
-			<p class="topictitle">{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a>
-			<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
-				<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
-			<!-- ENDIF -->
-			<!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED -->
-				<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.DELETED_IMG}</a>&nbsp;
-			<!-- ENDIF -->
-			<!-- IF topicrow.S_TOPIC_REPORTED and topicrow.U_MCP_REPORT -->
-				<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
-			<!-- ENDIF -->
-			<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->
-				[ <a href="{topicrow.U_DELETE_TOPIC}">{L_DELETE_SHADOW_TOPIC}</a> ]&nbsp;
-			<!-- ENDIF -->
-			</p>
-		</td>
-		<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
-		<td class="row1" width="120" align="center"><p class="topicdetails">{topicrow.LAST_POST_TIME}</p></td>
-		<td class="row2" align="center">
-			<!-- IF not topicrow.S_MOVED_TOPIC and not S_MERGE_SELECT --><input type="checkbox" class="radio" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE -->&nbsp;<!-- ENDIF -->
-		</td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="8" align="center"><p class="gen">{L_NO_TOPICS}</p></td>
-	</tr>
-<!-- END topicrow -->
-<!-- IF not S_MERGE_SELECT -->
-<tr>
-	<td class="cat" colspan="6" align="{S_CONTENT_FLOW_END}">
-		<select name="action">
-			<option value="" selected="selected">{L_SELECT_ACTION}</option>
-			<!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF -->
-			<!-- IF S_CAN_RESTORE --><option value="restore_topic">{L_RESTORE}</option><!-- ENDIF -->
-			<!-- IF S_CAN_MERGE --><option value="merge_topics">{L_MERGE}</option><!-- ENDIF -->
-			<!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF -->
-			<!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF -->
-			<!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF -->
-			<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
-			<!-- IF S_CAN_MAKE_NORMAL --><option value="make_normal">{L_MAKE_NORMAL}</option><!-- ENDIF -->
-			<!-- IF S_CAN_MAKE_STICKY --><option value="make_sticky">{L_MAKE_STICKY}</option><!-- ENDIF -->
-			<!-- IF S_CAN_MAKE_ANNOUNCE -->
-				<option value="make_announce">{L_MAKE_ANNOUNCE}</option>
-				<option value="make_global">{L_MAKE_GLOBAL}</option>
-			<!-- ENDIF -->
-		</select>
-		<input class="btnmain" type="submit" value="{L_SUBMIT}" />
-	</td>
-</tr>
-<!-- ENDIF -->
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<!-- IF not S_MERGE_SELECT -->
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="gensmall"><a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a></b></td>
-</tr>
-</table>
-<!-- ENDIF -->
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html
deleted file mode 100644
index 7c17e13c52..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_front.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<!-- IF S_SHOW_UNAPPROVED -->
-	<form name="mcp_queue" method="post" action="{S_MCP_QUEUE_ACTION}">
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row3" colspan="6" align="center"><b class="gen">{L_LATEST_UNAPPROVED}</b></td>
-	</tr>
-	<tr>
-		<th>&nbsp;{L_FORUM}&nbsp;</th>
-		<th>&nbsp;{L_TOPIC}&nbsp;</th>
-		<th>&nbsp;{L_SUBJECT}&nbsp;</th>
-		<th>&nbsp;{L_AUTHOR}&nbsp;</th>
-		<th>&nbsp;{L_POST_TIME}&nbsp;</th>
-		<th width="5%">&nbsp;{L_SELECT}&nbsp;</th>
-	</tr>
-	<!-- BEGIN unapproved -->
-		<tr>
-			<td class="row1" width="15%" valign="top"><span class="gen"><!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --></span><!-- IF unapproved.U_MCP_FORUM --><br /><span class="gensmall">[ <a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a> ]</span><!-- ENDIF --></td>
-			<td class="row2" valign="top"><span class="gen"><a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a></span><br /><span class="gensmall">[ <a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a> ]</span></td>
-			<td class="row1" valign="top">{unapproved.ATTACH_ICON_IMG} <span class="gen">{unapproved.SUBJECT}</span><br /><span class="gensmall">[ <a href="{unapproved.U_POST_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
-			<td class="row2" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{unapproved.AUTHOR_FULL}</span></td>
-			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gensmall">{unapproved.POST_TIME}</span></td>
-			<td class="row2" align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{unapproved.POST_ID}" /></td>
-		</tr>
-	<!-- END unapproved -->
-		<tr>
-			<td class="row3" colspan="6"><span class="gensmall">{L_UNAPPROVED_TOTAL}</span></td>
-		</tr>
-	<tr>
-		<td class="cat" colspan="6" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
-	</tr>
-	</table>
-	{S_FORM_TOKEN}
-	</form>
-	
-	<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr>
-		<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="gensmall"><a href="#" onclick="marklist('mcp_queue', '', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp_queue', '', false); return false;">{L_UNMARK_ALL}</a></b></td>
-	</tr>
-	</table>
-
-	<br clear="all" /><br />
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_REPORTS -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_REPORTED}</b></td>
-	</tr>
-	<tr>
-		<th>&nbsp;{L_FORUM}&nbsp;</th>
-		<th>&nbsp;{L_TOPIC}&nbsp;</th>
-		<th>&nbsp;{L_SUBJECT}&nbsp;</th>
-		<th>&nbsp;{L_REPORTER}&nbsp;</th>
-		<th>&nbsp;{L_REPORT_TIME}&nbsp;</th>
-	</tr>
-	<!-- BEGIN report -->
-		<tr>
-			<td class="row1" width="15%" valign="top"><span class="gen"><!-- IF report.U_FORUM --><a href="{report.U_FORUM}">{report.FORUM_NAME}</a><!-- ELSE -->{report.FORUM_NAME}<!-- ENDIF --></span><!-- IF report.U_MCP_FORUM --><br /><span class="gensmall">[ <a href="{report.U_MCP_FORUM}">{L_MODERATE}</a> ]</span><!-- ENDIF --></td>
-			<td class="row2" valign="top"><span class="gen"><a href="{report.U_TOPIC}">{report.TOPIC_TITLE}</a></span><br /><span class="gensmall">[ <a href="{report.U_MCP_TOPIC}">{L_MODERATE}</a> ]</span></td>
-			<td class="row1" valign="top">{report.ATTACH_ICON_IMG} <span class="gen">{report.SUBJECT}</span><br /><span class="gensmall">[ <a href="{report.U_POST_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
-			<td class="row2" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{report.REPORTER_FULL}</span></td>
-			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gensmall">{report.REPORT_TIME}</span></td>
-		</tr>
-	<!-- END report -->
-		<tr>
-			<td class="row3" colspan="5"><span class="gensmall">{L_REPORTS_TOTAL}</span></td>
-		</tr>
-	</table>
-
-	<br clear="all" /><br />
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_PM_REPORTS -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row3" colspan="6" align="center"><b class="gen">{L_LATEST_REPORTED_PMS}</b></td>
-	</tr>
-	<tr>
-		<th>&nbsp;{L_PM_SUBJECT}&nbsp;</th>
-		<th>&nbsp;{L_PM_FROM}&nbsp;</th>
-		<th>&nbsp;{L_TO} &amp; {L_BCC}&nbsp;</th>
-		<th>&nbsp;{L_SENT_AT}&nbsp;</th>
-		<th>&nbsp;{L_REPORTER}&nbsp;</th>
-		<th>&nbsp;{L_REPORT_TIME}&nbsp;</th>
-	</tr>
-	<!-- BEGIN pm_report -->
-		<tr>
-			<td class="row1" valign="top">{pm_report.ATTACH_ICON_IMG} <span class="gen">{pm_report.PM_SUBJECT}</span><br /><span class="gensmall">[ <a href="{pm_report.U_PM_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
-			<td class="row2" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.PM_AUTHOR_FULL}</span></td>
-			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.RECIPIENTS}</span></td>
-			<td class="row2" align="center" width="10%" nowrap="nowrap" valign="top"><span class="gensmall">{pm_report.PM_TIME}</span></td>
-			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.REPORTER_FULL}</span></td>
-			<td class="row2" align="center" width="10%" nowrap="nowrap" valign="top"><span class="gensmall">{pm_report.REPORT_TIME}</span></td>
-		</tr>
-	<!-- END pm_report -->
-		<tr>
-			<td class="row3" colspan="6"><span class="gensmall">{L_PM_REPORTS_TOTAL}</span></td>
-		</tr>
-	</table>
-
-	<br clear="all" /><br />
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_LOGS -->
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="{S_CONTENT_FLOW_END}">
-	<tr>
-		<td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_LOGS}</b></td>
-	</tr>
-	<tr>
-		<th width="15%" nowrap="nowrap">{L_USERNAME}</th>
-		<th width="12%" nowrap="nowrap">{L_IP}</th>
-		<th width="45%" nowrap="nowrap">{L_ACTION}</th>
-		<th nowrap="nowrap"></th>
-		<th width="18%" nowrap="nowrap">{L_TIME}</th>
-	</tr>
-	<!-- BEGIN log -->
-		<tr>
-			<td class="row1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td>
-			<td class="row1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td>
-			<td class="row1"><span class="genmed">{log.ACTION}</span></td>
-			<td class="row1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEW_TOPIC --><a href="{log.U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td>
-			<td class="row1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
-		</tr>
-	<!-- END log -->
-	</table>
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_header.html b/phpBB/styles/subsilver2/template/mcp_header.html
deleted file mode 100644
index 7144750ed4..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_header.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="pageheader">
-	<!-- IF U_MCP -->
-		<p class="linkmcp">
-			[<!-- IF U_ACP -->&nbsp;<a href="{U_ACP}">{L_ACP}</a>&nbsp;|<!-- ENDIF -->&nbsp;<a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM -->&nbsp;|&nbsp;<a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC -->&nbsp;|&nbsp;<a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST -->&nbsp;|&nbsp;<a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF -->&nbsp;]
-		</p>
-	<!-- ENDIF -->
-
-	<!-- IF TOPIC_TITLE or FORUM_NAME -->
-	<h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h2>
-	<!-- ENDIF -->
-</div>
-
-<br clear="all" />
-
-<div id="pagecontent">
-
-	<table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr>
-		<td width="20%" valign="top">
-
-			<table class="tablebg" width="100%" cellspacing="1">
-			<tr>
-				<th>{L_OPTIONS}</th>
-			</tr>
-			<!-- BEGIN l_block1 -->
-				<tr>
-				<!-- IF l_block1.S_SELECTED -->
-					<td class="row1"><b class="nav">{l_block1.L_TITLE}</b>
-
-					<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
-					<!-- BEGIN l_block2 -->
-						<li>&#187; <!-- IF l_block1.l_block2.S_SELECTED --><b>{l_block1.l_block2.L_TITLE}</b><!-- ELSE --><a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a><!-- ENDIF --></li>
-					<!-- END l_block2 -->
-					</ul>
-				<!-- ELSE -->
-					<td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href=this.firstChild.href;"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a>
-				<!-- ENDIF -->
-					</td>
-				</tr>
-			<!-- END l_block1 -->
-			</table>
-
-		</td>
-		<td><img src="images/spacer.gif" width="4" alt="" /></td>
-		<td width="80%" valign="top">
-
-		<!-- IF MESSAGE -->
-			<table class="tablebg" width="100%" cellspacing="1">
-			<tr>
-				<th>{L_MESSAGE}</th>
-			</tr>
-			<tr>
-				<td class="row1" align="center"><br /><span class="gen">{MESSAGE}<br /><br /><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br /><br /><!-- END return_links --></span></td>
-			</tr>
-			</table>
-
-			<br />
-		<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/mcp_logs.html b/phpBB/styles/subsilver2/template/mcp_logs.html
deleted file mode 100644
index 64f2a6a64d..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_logs.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" name="mcp" action="{U_POST_ACTION}">
-	
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th>{L_USERNAME}</th>
-	<th>{L_IP}</th>
-	<th>{L_TIME}</th>
-	<th>{L_ACTION}</th>
-	<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
-</tr>
-<!-- IF S_LOGS -->
-
-	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td class="genmed">{log.USERNAME}</td>
-			<td class="genmed" style="text-align: center;">{log.IP}</td>
-			<td class="genmed" style="text-align: center;">{log.DATE}</td>
-			<td class="genmed">{log.ACTION}<br />{log.DATA}</td>
-			<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td><!-- ENDIF -->
-		</tr>
-	<!-- END log -->
-	<tr align="center">
-		<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SEARCH_KEYWORDS}{L_COLON}</span> <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="btnlite" name="filter" value="{L_SEARCH}" /></td>
-	</tr>
-	<tr align="center">
-		<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
-	</tr>
-	<!-- IF S_CLEAR_ALLOWED -->
-		<tr>
-			<td class="cat" colspan="5" align="center"><input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />&nbsp; <input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" /></td>
-		</tr>
-	<!-- ENDIF -->
-<!-- ELSE -->
-	<tr>
-		<td class="row1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
-	</tr>
-<!-- ENDIF -->
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" /><br />
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_message.html b/phpBB/styles/subsilver2/template/mcp_message.html
deleted file mode 100644
index 5699dd54af..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_message.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-<tr>
-	<th><b>{MESSAGE_TITLE}</b></th>
-</tr>
-<tr> 
-	<td class="row1" align="center"><br /><span class="gen">{MESSAGE_TEXT}</span><br /><br /></td>
-</tr>
-</table>
-
-<br clear="all" />
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_move.html b/phpBB/styles/subsilver2/template/mcp_move.html
deleted file mode 100644
index b8958187e6..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_move.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="pagecontent">
-
-	<form name="confirm" action="{S_CONFIRM_ACTION}" method="post">
-	
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{MESSAGE_TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center">
-			<!-- IF ADDITIONAL_MSG -->
-				<span class="gen error">{ADDITIONAL_MSG}</span><br />
-			<!-- ENDIF -->
-			<!-- IF S_FORUM_SELECT -->
-				<span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span>
-					<select name="to_forum_id">{S_FORUM_SELECT}</select><br />
-				<!-- IF S_CAN_LEAVE_SHADOW -->
-					<input type="checkbox" class="radio" name="move_leave_shadow" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
-				<!-- ENDIF -->
-				<!-- IF S_CAN_LOCK_TOPIC -->
-					<input type="checkbox" class="radio" name="move_lock_topics" /><span class="gen">{L_LOCK_TOPIC}</span><br />
-				<!-- ENDIF -->
-				<br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br />
-				<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" />
-			<!-- ELSE -->
-				<span class="gen">{L_NO_DESTINATION_FORUM}</span><br /><br />
-					{S_HIDDEN_FIELDS}
-					<input type="submit" name="cancel" value="{L_CANCEL}" class="btnlite" />
-			<!-- ENDIF -->
-		</td>
-	</tr>
-	</table>
-	{S_FORM_TOKEN}	
-	</form>
-	
-</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_notes_front.html b/phpBB/styles/subsilver2/template/mcp_notes_front.html
deleted file mode 100644
index e2e14e0150..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_notes_front.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" name="mcp" action="{U_POST_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-<tr>
-	<th colspan="2"align="center">{L_SELECT_USER}</th>
-</tr>
-<tr>
-	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}{L_COLON} </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>
-	<td class="row2"><input type="text" class="post" name="username" size="20" /></td>
-</tr>
-<tr>
-	<td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" /><br />
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_notes_user.html b/phpBB/styles/subsilver2/template/mcp_notes_user.html
deleted file mode 100644
index 4bd8de6862..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_notes_user.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" name="mcp" action="{U_POST_ACTION}">
-	
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th colspan="2" align="center">{USERNAME}</th>
-</tr>
-<tr> 
-	<td class="row1" align="center">
-		<table cellspacing="1" cellpadding="2" border="0">
-		<tr>
-			<td class="gen" align="center"><b>{USERNAME_FULL}</b></td>
-		</tr>
-		<!-- IF RANK_TITLE -->
-			<tr>
-				<td class="postdetails" align="center">{RANK_TITLE}</td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF RANK_IMG -->
-			<tr>
-				<td align="center">{RANK_IMG}</td>
-			</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td>
-		</tr>
-		</table>
-	</td>
-	<td class="row1">
-		<table width="100%" cellspacing="1" cellpadding="2" border="0">
-		<tr> 
-			<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}{L_COLON} </td>
-			<td width="100%"><b class="gen">{JOINED}</b></td>
-		</tr>
-		<tr> 
-			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}{L_COLON} </td>
-			<td><b class="gen">{POSTS}</b></td>
-		</tr>
-		<tr> 
-			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}{L_COLON} </td>
-			<td><b class="gen">{WARNINGS}</b></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<br />
-
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th colspan="5" align="center">{L_FEEDBACK}</th>
-</tr>
-<!-- IF S_USER_NOTES -->
-
-	<tr align="center">
-		<td colspan="5" class="row3"><span class="gensmall">{L_SEARCH_KEYWORDS}{L_COLON}</span> <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="btnlite" name="filter" value="{L_SEARCH}" /></td>
-	</tr>
-	<tr align="center">
-		<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}{L_COLON}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
-	</tr>
-	<tr>
-		<th>{L_REPORT_BY}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
-		<th>{L_ACTION}</th>
-		<th><!-- IF S_CLEAR_ALLOWED -->{L_MARK}<!-- ENDIF --></th>
-	</tr>
-
-	<!-- BEGIN usernotes -->
-		<!-- IF usernotes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td class="gen">{usernotes.REPORT_BY}</td>
-			<td style="text-align: center;">{usernotes.IP}</td>
-			<td style="text-align: center;">{usernotes.REPORT_AT}</td>
-			<td class="gen">
-				{usernotes.ACTION}
-				<!-- IF usernotes.DATA --><br />&#187; <span class="gensmall">[ {usernotes.DATA} ]</span><!-- ENDIF -->
-			</td>
-			<td style="text-align: center;"><!-- IF S_CLEAR_ALLOWED --><input type="checkbox" class="radio" name="marknote[]" value="{usernotes.ID}" /><!-- ENDIF --></td>
-		</tr>
-	<!-- END usernotes -->
-
-	<!-- IF S_CLEAR_ALLOWED -->
-		<tr>
-			<td class="cat" colspan="5" align="center"><input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />&nbsp; <input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" /></td>
-		</tr>
-	<!-- ENDIF -->
-
-<!-- ELSE -->
-	<tr>
-		<td class="row1" colspan="2" align="center"><span class="gen">{L_NO_FEEDBACK}</span></td>
-	</tr>
-<!-- ENDIF -->
-</table>
-
-<br clear="all" />
-	
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th colspan="2" align="center">{L_ADD_FEEDBACK}</th>
-</tr>
-<tr>
-	<td class="row3" align="center" colspan="2"><span class="genmed">{L_ADD_FEEDBACK_EXPLAIN}</span></td>
-</tr>
-<tr>
-	<td colspan="2" class="row1" align="center"><textarea name="usernote" rows="10" cols="76"></textarea></td>
-</tr>
-<tr>
-	<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
-</tr>
-</table>
-
-<table width="100%" cellspacing="0" cellpadding="0">
-<tr>
-	<td class="pagination">{PAGE_NUMBER} [ {TOTAL_REPORTS} ]</td>
-	<td align="{S_CONTENT_FLOW_END}"><span class="pagination"><!-- INCLUDE pagination.html --></span></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" /><br />
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html
deleted file mode 100644
index f5052ee2d0..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_post.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<!-- IF S_MCP_REPORT -->
-	<form method="post" name="mcp_report" action="{S_CLOSE_ACTION}">
-
-	<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-	<tr>
-		<th colspan="2" align="center"><!-- IF S_PM -->{L_PM_REPORT_DETAILS}<!-- ELSE -->{L_REPORT_DETAILS}<!-- ENDIF --></th>
-	</tr>
-	<tr>
-		<td class="row1"><b class="gen">{L_REPORT_REASON}{L_COLON} </b></td>
-		<td class="row2"><span class="gen">{REPORT_REASON_TITLE} &raquo; {REPORT_REASON_DESCRIPTION}</span></td>
-	</tr>
-	<tr>
-		<td class="row1" width="20%"><b class="gen">{L_REPORTER}{L_COLON} </b></td>
-		<td class="row2" width="80%"><span class="gen"<!-- IF REPORTER_COLOUR --> style="font-weight: bold; color: {REPORTER_COLOUR};"<!-- ENDIF -->>{REPORTER_NAME}</span> &nbsp; <span class="gen">[ <!-- IF U_VIEW_REPORTER_PROFILE --><a href="{U_VIEW_REPORTER_PROFILE}">{L_READ_PROFILE}</a><!-- ENDIF --><!-- IF S_USER_NOTES --><!-- IF U_VIEW_REPORTER_PROFILE --> | <!-- ENDIF --><a href="{U_MCP_REPORTER_NOTES}">{L_VIEW_NOTES}</a> | <a href="{U_MCP_WARN_REPORTER}">{L_WARN_USER}</a><!-- ENDIF --> ]</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><b class="gen">{L_REPORTED}{L_COLON} </b></td>
-		<td class="row2"><span class="postdetails">{REPORT_DATE}</span></td>
-	</tr>
-	<!-- IF REPORT_TEXT -->
-		<tr>
-			<th colspan="2" align="center">{L_MORE_INFO}</th>
-		</tr>
-		<tr>
-			<td class="row1" colspan="2"><div class="gen" style="overflow: auto; width: 100%; height: 80pt; border: 1px;">{REPORT_TEXT}</div></td>
-		</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td class="cat" align="center" colspan="2"><!-- IF not S_REPORT_CLOSED --><input class="btnmain" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /><!-- ELSE -->{L_REPORT_CLOSED}<!-- ENDIF --> &nbsp; <input class="btnlite" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" /></td>
-	</tr>
-	</table>
-
-	<input type="hidden" name="report_id_list[]" value="{REPORT_ID}" />
-	{S_FORM_TOKEN}
-	</form>
-
-	<br clear="all"/>
-<!-- ENDIF -->
-
-<!-- IF S_MCP_QUEUE --><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}"><!-- ELSE --><form method="post" name="mcp_report_details" action="{S_CLOSE_ACTION}"><!-- ENDIF -->
-
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th colspan="2" align="center"><!-- IF S_PM -->{L_PM}<!-- ELSE -->{L_POST_DETAILS}<!-- ENDIF --></th>
-</tr>
-<tr>
-	<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS}<!-- IF not S_PM --> | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ENDIF --><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
-</tr>
-<tr>
-	<td class="row1"><b class="gen"><!-- IF S_PM -->{L_PM_SUBJECT}<!-- ELSE -->{L_POST_SUBJECT}<!-- ENDIF -->{L_COLON} </b></td>
-	<td class="row2">
-		<span class="gen">{POST_SUBJECT}</span>
-		<!-- IF S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span> <!-- ENDIF -->
-		<!-- IF S_POST_DELETED --><span class="postapprove">{DELETED_IMG} <a href="{U_MCP_APPROVE}">{L_POST_DELETED}</a></span> <!-- ENDIF -->
-		<!-- IF S_POST_REPORTED and not S_MCP_REPORT --><span class="postreported">{REPORTED_IMG} <a href="{U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF -->
-	</td>
-</tr>
-<tr>
-	<td class="row1" width="20%"><b class="gen"><!-- IF S_PM -->{L_PM_FROM}<!-- ELSE -->{L_POSTER}<!-- ENDIF -->{L_COLON} </b></td>
-	<td class="row2" width="80%"><span class="gen"<!-- IF POST_AUTHOR_COLOUR --> style="font-weight: bold; color: {POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{POST_AUTHOR}</span><span class="gen"> &nbsp; [ <!-- IF U_POST_AUTHOR --><a href="{U_POST_AUTHOR}">{L_READ_PROFILE}</a><!-- ENDIF --><!-- IF S_USER_NOTES --><!-- IF U_POST_AUTHOR --> | <!-- ENDIF --><a href="{U_MCP_USER_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_MCP_WARN_USER -->| <a href="{U_MCP_WARN_USER}">{L_WARN_USER}</a><!-- ENDIF --><!-- ENDIF --> ]</span></td>
-</tr>
-<!-- IF S_CAN_VIEWIP -->
-	<tr>
-		<td class="row1"><b class="gen"><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->{L_COLON} </b></td>
-		<td class="row2"><span class="gen">
-			<!-- IF U_WHOIS -->
-				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
-			<!-- ELSE -->
-				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
-			<!-- ENDIF -->
-		</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row1"><b class="gen"><!-- IF S_PM -->{L_SENT_AT}<!-- ELSE -->{L_POSTED}<!-- ENDIF -->{L_COLON} </b></td>
-	<td class="row2"><span class="postdetails">{POST_DATE}</span></td>
-</tr>
-<!-- IF S_TO_RECIPIENT -->
-	<tr>
-		<td class="row1" nowrap="nowrap" width="150"><b class="gen">{L_TO}{L_COLON}</b></td>
-		<td class="row2 gen">
-		<!-- BEGIN to_recipient -->
-			<!-- IF to_recipient.IS_GROUP --><span class="sep"><a href="{to_recipient.U_VIEW}">{to_recipient.NAME}</a></span><!-- ELSE -->{to_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-		<!-- END to_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_BCC_RECIPIENT -->
-	<tr>
-		<td class="row1" nowrap="nowrap" width="150"><b class="gen">{L_BCC}{L_COLON}</b></td>
-		<td class="row2 gen">
-		<!-- BEGIN bcc_recipient -->
-			<!-- IF bcc_recipient.IS_GROUP --><span class="sep"><a href="{bcc_recipient.U_VIEW}">{bcc_recipient.NAME}</a></span><!-- ELSE -->{bcc_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-		<!-- END bcc_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<th colspan="2" align="center">{L_PREVIEW}</th>
-</tr>
-<tr>
-	<td class="row1" colspan="2">
-	<!-- IF U_EDIT --><div class="gen" style="float: {S_CONTENT_FLOW_END};"><a href="{U_EDIT}" class="imageset">{EDIT_IMG}</a></div><!-- ENDIF -->
-
-	<div class="postbody">{POST_PREVIEW}</div>
-
-	<!-- IF S_HAS_ATTACHMENTS -->
-		<br clear="all" /><br />
-
-		<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>
-		</tr>
-		<!-- BEGIN attachment -->
-			<tr>
-				<!-- IF attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{attachment.DISPLAY_ATTACHMENT}</td>
-			</tr>
-		<!-- END attachment -->
-		</table>
-	<!-- ENDIF -->
-
-	</td>
-</tr>
-<!-- IF S_POST_UNAPPROVED and S_MCP_QUEUE -->
-	<tr>
-		<td class="cat" align="center" colspan="2"><input class="btnmain" type="submit" value="{L_APPROVE}" name="action[approve]" /> &nbsp; <input class="btnlite" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /></td>
-	</tr>
-	<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
-<!-- ENDIF -->
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<!-- IF S_MCP_QUEUE -->
-	<br clear="all" />
-
-	<!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
-<!-- ELSEIF S_MCP_REPORT -->
-	<br clear="all" />
-
-	<!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
-<!-- ELSE -->
-	<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER -->
-		<br /><a name="mod" class="anchor"></a>
-
-		<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-		<tr>
-			<th colspan="2" align="center">{L_MOD_OPTIONS}</th>
-		</tr>
-		<!-- IF S_CAN_CHGPOSTER -->
-			<tr>
-				<td class="row1" valign="top"><b class="gen">{L_CHANGE_POSTER}</b></td>
-				<td class="row2"><form method="post" name="mcp_chgposter" action="{U_POST_ACTION}"><input class="post" type="text" name="username" value="" /> <input class="btnmain" type="submit" value="{L_CONFIRM}" name="action[chgposter]" /><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span><!-- IF S_USER_SELECT --><br /><select name="u">{S_USER_SELECT}</select> <input type="submit" class="btnmain" name="action[chgposter_ip]" value="{L_CONFIRM}" /><!-- ENDIF -->{S_FORM_TOKEN}</form></td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST -->
-			<tr>
-				<td class="row1" valign="top"><b class="gen">{L_MOD_OPTIONS}</b></td>
-				<td class="row2"><form method="post" name="mcp" action="{U_MCP_ACTION}"><select name="action"><!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF --><!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF --></select> <input class="btnmain" type="submit" value="{L_SUBMIT}" />	{S_FORM_TOKEN}</form></td>
-			</tr>
-		<!-- ENDIF -->
-		</table>
-	<!-- ENDIF -->
-
-	<!-- IF S_CAN_VIEWIP -->
-		<br /><a name="ip" class="anchor"></a>
-
-		<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-		<tr>
-			<th colspan="2" align="center">{L_IP_INFO}</th>
-		</tr>
-		<tr>
-			<td colspan="2" class="cat"><b class="gen">{L_OTHER_USERS}</b></td>
-		</tr>
-		<!-- BEGIN userrow -->
-			<!-- IF userrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td><span class="gen"><!-- IF userrow.U_PROFILE --><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a><!-- ELSE -->{userrow.USERNAME}<!-- ENDIF --> [ {userrow.NUM_POSTS} {userrow.L_POST_S} ]</span></td>
-				<td align="center"><a href="{userrow.U_SEARCHPOSTS}" class="imageset">{SEARCH_IMG}</a></td>
-			</tr>
-		<!-- BEGINELSE -->
-			<tr class="row1">
-				<td colspan="2" align="center"><span class="gen">{L_NO_MATCHES_FOUND}</span></td>
-			</tr>
-		<!-- END userrow -->
-		<tr>
-			<td class="cat"><b class="gen">{L_IPS_POSTED_FROM}</b></td>
-			<td class="cat" width="10%" nowrap="nowrap"><!-- IF U_LOOKUP_ALL --><span class="gen">[ <a href="{U_LOOKUP_ALL}">{L_LOOKUP_ALL}</a> ]</span><!-- ENDIF --></td>
-		</tr>
-		<!-- BEGIN iprow -->
-			<!-- IF iprow.S_ROW_COUNT is even -->
-				<tr class="row1">
-			<!-- ELSE -->
-				<tr class="row2">
-			<!-- ENDIF -->
-				<td><span class="gen"><!-- IF iprow.HOSTNAME --><a href="{iprow.U_WHOIS}">{iprow.HOSTNAME}</a> ({iprow.IP})<!-- ELSE --><a href="{iprow.U_WHOIS}">{iprow.IP}</a><!-- ENDIF --> [ {iprow.NUM_POSTS} {iprow.L_POST_S} ]</span></td>
-				<td align="center"><!-- IF iprow.U_LOOKUP_IP --><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a> ]</span><!-- ENDIF --></td>
-			</tr>
-		<!-- BEGINELSE -->
-			<tr class="row1">
-				<td colspan="2" align="center"><span class="gen">{L_NO_MATCHES_FOUND}</span></td>
-			</tr>
-		<!-- END iprow -->
-		</table>
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_queue.html b/phpBB/styles/subsilver2/template/mcp_queue.html
deleted file mode 100644
index 7ca659b5da..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_queue.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}">
-
-<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
-<tr>
-	<th colspan="4" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
-</tr>
-<tr>
-	<td colspan="4" class="cat" align="center"><span class="gensmall">{L_DISPLAY_ITEMS}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> &nbsp; <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <b>{L_ONLY_TOPIC}</b> &nbsp; <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
-</tr>
-<tr> 
-	<th>&nbsp;<!-- IF S_TOPICS -->{L_TOPIC}<!-- ELSE -->{L_POST}<!-- ENDIF -->&nbsp;</th>
-	<th>&nbsp;{L_AUTHOR}&nbsp;</th>
-	<th>&nbsp;{L_POST_TIME}&nbsp;</th>
-	<th width="5%">&nbsp;{L_SELECT}&nbsp;</th>
-</tr>
-<!-- BEGIN postrow -->
-
-	<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p>
-			<span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td>
-		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.POST_AUTHOR_FULL}</span><br />
-			<span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
-		<td class="postdetails" style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap">{postrow.POST_TIME}</td>
-		<td align="center">
-			<!-- IF S_TOPICS -->
-				<input type="checkbox" class="radio" name="topic_id_list[]" value="{postrow.TOPIC_ID}" />
-			<!-- ELSE -->
-				<input type="checkbox" class="radio" name="post_id_list[]" value="{postrow.POST_ID}" />
-			<!-- ENDIF -->
-		</td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="4" height="30" align="center" valign="middle">
-			<span class="gen">
-				<!-- IF S_RESTORE -->
-					<!-- IF S_TOPICS -->{L_NO_TOPICS_DELETED}<!-- ELSE -->{L_NO_POSTS_DELETED}<!-- ENDIF -->
-				<!-- ELSE -->
-					<!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS_QUEUE}<!-- ENDIF -->
-				<!-- ENDIF -->
-			</span>
-		</td>
-	</tr>
-<!-- END postrow -->
-<tr>
-	<td class="cat" colspan="4" align="center">
-		<!-- IF S_RESTORE -->
-			<input class="btnlite" type="submit" name="action[delete]" value="{L_DELETE}" />&nbsp;&nbsp;
-			<input class="btnmain" type="submit" name="action[restore]" value="{L_RESTORE}" />
-		<!-- ELSE -->
-			<input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;
-			<input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />
-		<!-- ENDIF -->
-	</td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">
-		<b class="gensmall">
-			<!-- IF S_TOPICS -->
-				<a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a>
-			<!-- ELSE -->
-				<a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a>
-			<!-- ENDIF -->
-		</b>
-	</td>
-</tr>
-</table>
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_reports.html b/phpBB/styles/subsilver2/template/mcp_reports.html
deleted file mode 100644
index 158f9c2603..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_reports.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}">
-
-<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
-<tr>
-	<th colspan="5" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
-</tr>
-<tr>
-	<td colspan="5" class="cat" align="center"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- IF not S_PM -->&nbsp;<span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> &nbsp; <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <b>{L_ONLY_TOPIC}</b> &nbsp; <!-- ENDIF --><!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
-</tr>
-<tr> 
-	<!-- IF S_PM -->
-	<th>&nbsp;{L_PM}&nbsp;</th>
-	<th>&nbsp;{L_TO} &amp; {L_BCC}&nbsp;</th>
-	<!-- ELSE -->
-	<th>&nbsp;{L_POST}&nbsp;</th>
-	<th>&nbsp;{L_AUTHOR}&nbsp;</th>
-	<!-- ENDIF -->
-	<th>&nbsp;{L_REPORTER}&nbsp;</th>
-	<th>&nbsp;{L_REPORT_TIME}&nbsp;</th>
-	<th width="5%">&nbsp;{L_SELECT}&nbsp;</th>
-</tr>
-<!-- BEGIN postrow -->
-
-	<!-- IF postrow.S_ROW_ is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<!-- IF S_PM -->
-		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEW_DETAILS}">{postrow.PM_SUBJECT}</a></p>
-			<span class="gensmall">{L_PM_FROM}{L_COLON} {postrow.PM_AUTHOR_FULL}</span></td>
-		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><span class="gen">{postrow.RECIPIENTS}</span><br />
-			<span class="gensmall">{L_SENT_AT}{L_COLON} {postrow.PM_TIME}</span></td>
-		<!-- ELSE -->
-		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p>
-			<span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td>
-		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.POST_AUTHOR_FULL}</span><br />
-			<span class="gensmall">{postrow.POST_TIME}</span></td>
-		<!-- ENDIF -->
-		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.REPORTER_FULL}</span></td>
-		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.REPORT_TIME}</span><br />
-			<span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
-		<td align="center"><input type="checkbox" class="radio" name="report_id_list[]" value="{postrow.REPORT_ID}" /></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="5" height="30" align="center" valign="middle"><span class="gen">{L_NO_POSTS}</span></td>
-	</tr>
-<!-- END postrow -->
-<tr>
-	<td class="cat" colspan="5" align="center">
-	<!-- IF S_CLOSED -->
-		<input class="btnmain" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" />
-	<!-- ELSE -->
-		<input class="btnmain" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /> &nbsp; <input class="btnlite" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" />
-	<!-- ENDIF -->
-	</td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="gensmall"><a href="#" onclick="marklist('mcp', '', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', '', false); return false;">{L_UNMARK_ALL}</a></b></td>
-</tr>
-</table>
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
deleted file mode 100644
index cba473147e..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<!-- IF S_CAN_SPLIT -->
-	<tr>
-		<th colspan="3" nowrap="nowrap">{L_SPLIT_TOPIC}</th>
-	</tr>
-	<tr>
-		<td class="row2" colspan="3" align="center"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td>
-	</tr>
-	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_SUBJECT}</span></td>
-		<td class="row2" colspan="2"><input class="post" style="width: 350px" type="text" size="35" maxlength="124" name="subject" value="{SPLIT_SUBJECT}" /></td>
-	</tr>
-	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
-		<td class="row2" colspan="2"><select name="to_forum_id">{S_FORUM_SELECT}</select></td>
-	</tr>
-
-	<!-- IF S_SHOW_TOPIC_ICONS -->
-		<tr>
-			<td class="row1"><span class="gen">{L_TOPIC_ICON}</span></td>
-			<td class="row2" colspan="2">
-				<table width="100%" cellspacing="0" cellpadding="0" border="0">
-				<tr>
-					<td><span class="genmed nowrap"><input type="radio" class="radio" name="icon" value="0"<!-- IF not S_TOPIC_ICON --> checked="checked"<!-- ENDIF --> />{L_NO_TOPIC_ICON}</span> <!-- BEGIN topic_icon --><span class="nowrap"><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"<!-- IF topic_icon.S_CHECKED --> checked="checked"<!-- ENDIF --> /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /></span> <!-- END topic_icon --></td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-	<!-- ENDIF -->
-<!-- ENDIF -->
-
-<!-- IF S_CAN_MERGE -->
-	<tr>
-		<th colspan="3" nowrap="nowrap">{L_MERGE_POSTS}</th>
-	</tr>
-	<tr>
-		<td class="row2" colspan="3" align="center"><span class="gensmall">{L_MERGE_TOPIC_EXPLAIN}</span></td>
-	</tr>
-	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen">{L_MERGE_TOPIC_ID}</span></td>
-		<td class="row2" colspan="2"><input class="post" type="number" min="0" size="6" name="to_topic_id" value="{TO_TOPIC_ID}" /> <a href="{U_SELECT_TOPIC}">{L_SELECT_TOPIC}</a></td>
-	</tr>
-	<!-- IF TO_TOPIC_INFO -->
-		<tr>
-			<td class="row3" colspan="3" align="center"><b class="gen">{TO_TOPIC_INFO}</b></td>
-		</tr>
-	<!-- ENDIF -->
-<!-- ENDIF -->
-<tr>
-	<th colspan="3" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
-</tr>
-<tr>
-	<td class="row1" nowrap="nowrap"><span class="gen">{L_POSTS_PER_PAGE}</span><br /><span class="gensmall">{L_POSTS_PER_PAGE_EXPLAIN}</span></td>
-	<td class="row2" colspan="2"><input class="post" type="number" min="0" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></td>
-</tr>
-<tr>
-	<td class="cat" colspan="3" align="center"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
-</tr>
-<tr>
-	<th nowrap="nowrap" colspan="3">{L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE}</th>
-</tr>
-<tr>
-	<td class="row3" colspan="3" align="center"><span class="gensmall">{RETURN_TOPIC}</span></td>
-</tr>
-<!-- BEGIN postrow -->
-
-	<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td align="center"><b class="postauthor">{postrow.POST_AUTHOR_FULL}</b></td>
-		<td width="100%">
-			<table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr style="vertical-align: top;">
-				<td class="gensmall" nowrap="nowrap">&nbsp;<b>{L_POST_SUBJECT}{L_COLON}</b>&nbsp;</td>
-				<td class="gensmall" width="100%">{postrow.POST_SUBJECT}</td>
-			</tr>
-			</table>
-		</td>
-		<td width="5%" align="center"><a href="{postrow.U_POST_DETAILS}" class="imageset">{INFO_IMG}</a></td>
-	</tr>
-
-	<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td width="100%" valign="top" colspan="2">
-			<table width="100%" cellspacing="0" cellpadding="2" border="0">
-			<tr>
-				<td valign="top">
-					<div class="postbody">{postrow.MESSAGE}</div>
-					<!-- IF postrow.S_HAS_ATTACHMENTS -->
-						<br clear="all" /><br />
-
-						<table class="tablebg" width="100%" cellspacing="1">
-						<tr>
-							<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>
-						</tr>
-						<!-- BEGIN attachment -->
-							<tr>
-								<!-- IF postrow.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{postrow.attachment.DISPLAY_ATTACHMENT}</td>
-							</tr>
-						<!-- END attachment -->
-						</table>
-					<!-- ENDIF -->
-
-				</td>
-			</tr>
-			<tr>
-				<td valign="bottom">
-					<table width="100%" cellspacing="0" cellpadding="0" border="0">
-					<tr valign="middle">
-						<td width="100%">
-							<!-- IF postrow.S_POST_UNAPPROVED and postrow.U_MCP_APPROVE --><span class="postapprove">{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span><br /><!-- ENDIF -->
-							<!-- IF postrow.S_POST_DELETED and postrow.U_MCP_APPROVE --><span class="postapprove">{DELETED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_DELETED}</a></span><br /><!-- ENDIF -->
-							<!-- IF postrow.S_POST_REPORTED and postrow.U_MCP_REPORT --><span class="postreported">{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF -->
-						</td>
-						<td width="10" nowrap="nowrap">{postrow.MINI_POST_IMG}</td>
-						<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}{L_COLON}</b> {postrow.POST_DATE}</td>
-					</tr>
-					</table>
-				</td>
-			</tr>
-			</table>
-		</td>
-		<td width="5%" align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></td>
-	</tr>
-	<tr>
-		<td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt="" /></td>
-	</tr>
-<!-- END postrow -->
-<tr>
-	<td class="cat" colspan="3" align="center"><select name="action"><option value="" selected="selected">{L_SELECT_ACTION}</option>
-		<!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_RESTORE --><option value="restore">{L_RESTORE_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF ACTION eq 'merge' --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF ACTION eq 'split' --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
-		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
-	</select>&nbsp;<input class="btnmain" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" /></td>
-</tr>
-</table>
-{S_HIDDEN_FIELDS}
-{S_FORM_TOKEN}
-</form>
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="gensmall"><a href="#" onclick="marklist('mcp', '', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', '', false); return false;">{L_UNMARK_ALL}</a></b></td>
-</tr>
-</table>
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html
deleted file mode 100644
index f6daec9cc5..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_warn_front.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" name="mcp" action="{U_POST_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1" border="0" align="center">
-<tr>
-	<th colspan="2"align="center">{L_SELECT_USER}</th>
-</tr>
-<tr>
-	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}{L_COLON} </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>
-	<td class="row2"><input type="text" class="post" name="username" size="20" /></td>
-</tr>
-<tr>
-	<td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" /><br />
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<td class="row3" colspan="4" align="center"><b class="gen">{L_MOST_WARNINGS}</b></td>
-</tr>
-<tr>
-	<th>&nbsp;{L_USERNAME}&nbsp;</th>
-	<th>&nbsp;{L_WARNINGS}&nbsp;</th>
-	<th>&nbsp;{L_LATEST_WARNING_TIME}&nbsp;</th>
-	<th>&nbsp;</th>
-</tr>
-<!-- BEGIN highest -->
-	<tr>
-		<td class="row1" width="15%" valign="top"><span class="gen">{highest.USERNAME_FULL}</span></td>
-		<td class="row2" width="15%" valign="top"><span class="gen">{highest.WARNINGS}</span></td>
-		<td class="row1" width="15%" valign="top"><span class="gen">{highest.WARNING_TIME}</span></td>
-		<td class="row2" width="15%" valign="top"><span class="gen"><a href="{highest.U_NOTES}">{L_VIEW_NOTES}</a></span></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
-	</tr>
-<!-- END highest -->
-</table>
-
-<br clear="all" /><br />
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<td class="row3" colspan="4" align="center"><b class="gen">{L_LATEST_WARNINGS}</b></td>
-</tr>
-<tr>
-	<th>&nbsp;{L_USERNAME}&nbsp;</th>
-	<th>&nbsp;{L_TIME}&nbsp;</th>
-	<th>&nbsp;{L_TOTAL_WARNINGS}&nbsp;</th>
-	<th>&nbsp;</th>
-</tr>
-<!-- BEGIN latest -->
-	<tr>
-		<td class="row1" width="15%" valign="top"><span class="gen">{latest.USERNAME_FULL}</span></td>
-		<td class="row2" width="15%" valign="top"><span class="gen">{latest.WARNING_TIME}</span></td>
-		<td class="row1" width="15%" valign="top"><span class="gen">{latest.WARNINGS}</span></td>
-		<td class="row2" width="15%" valign="top"><span class="gen"><a href="{latest.U_NOTES}">{L_VIEW_NOTES}</a></span></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
-	</tr>
-<!-- END latest -->
-</table>
-
-<br clear="all" /><br />
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_list.html b/phpBB/styles/subsilver2/template/mcp_warn_list.html
deleted file mode 100644
index 6e263b6403..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_warn_list.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" name="mcp" action="{U_POST_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<td class="row3" colspan="4" align="center"><b class="gen">{L_WARNED_USERS}</b></td>
-</tr>
-<tr>
-	<th>&nbsp;{L_USERNAME}&nbsp;</th>
-	<th>&nbsp;{L_WARNINGS}&nbsp;</th>
-	<th>&nbsp;{L_LATEST_WARNING_TIME}&nbsp;</th>
-	<th>&nbsp;</th>
-</tr>
-<!-- BEGIN user -->
-	<tr>
-		<td class="row1" width="15%" valign="top"><span class="gen">{user.USERNAME_FULL}</span></td>
-		<td class="row2" width="15%" valign="top"><span class="gen">{user.WARNINGS}</span></td>
-		<td class="row1" width="15%" valign="top"><span class="gen">{user.WARNING_TIME}</span></td>
-		<td class="row2" width="15%" valign="top"><span class="gen"><a href="{user.U_NOTES}">{L_VIEW_NOTES}</a></span></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
-	</tr>
-<!-- END user -->
-<tr align="center">
-	<td class="row3" colspan="4"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
-</tr>
-</table>
-
-<table width="100%" cellspacing="0" cellpadding="0">
-<tr>
-	<td class="pagination">{PAGE_NUMBER} [ {TOTAL_USERS} ]</td>
-	<td align="{S_CONTENT_FLOW_END}"><span class="pagination"><!-- INCLUDE pagination.html --></span></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" /><br />
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_post.html b/phpBB/styles/subsilver2/template/mcp_warn_post.html
deleted file mode 100644
index 223457d158..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_warn_post.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th colspan="2" align="center">{L_POST}</th>
-</tr>
-<tr> 
-	<td class="row1" align="center">
-		<table cellspacing="1" cellpadding="2" border="0">
-		<tr>
-			<td class="gen" align="center"><!-- IF USER_COLOR --><b style="color: #{USER_COLOR}"><!-- ELSE --><b><!-- ENDIF -->{USERNAME}</b></td>
-		</tr>
-		<!-- IF RANK_TITLE -->
-			<tr>
-				<td class="postdetails" align="center">{RANK_TITLE}</td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF RANK_IMG -->
-			<tr>
-				<td align="center">{RANK_IMG}</td>
-			</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td>
-		</tr>
-		</table>
-	</td>
-	<td class="row1">
-		<span class="gen">{POST}</span>
-	</td>
-</tr>
-</table>
-
-<br clear="all" /><br />
-
-<form method="post" name="mcp" action="{U_POST_ACTION}">
-
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th align="center">{L_ADD_WARNING}</th>
-</tr>
-<tr>
-	<td class="row3" align="center"><span class="genmed">{L_ADD_WARNING_EXPLAIN}</span></td>
-</tr>
-<tr>
-	<td class="row1" align="center"><textarea name="warning" rows="10" cols="76">{L_WARNING_POST_DEFAULT}</textarea></td>
-</tr>
-<!-- IF S_CAN_NOTIFY -->
-<tr>
-	<td class="row1" align="center"><input type="checkbox" class="radio" name="notify_user" checked="checked" /><span class="genmed">{L_NOTIFY_USER_WARN}</span></td>
-</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" /><br />
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_user.html b/phpBB/styles/subsilver2/template/mcp_warn_user.html
deleted file mode 100644
index 6b78c71557..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_warn_user.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th colspan="2" align="center">{USERNAME}</th>
-</tr>
-<tr> 
-	<td class="row1" align="center">
-		<table cellspacing="1" cellpadding="2" border="0">
-		<tr>
-			<td class="gen" align="center"><b>{USERNAME_FULL}</b></td>
-		</tr>
-		<!-- IF RANK_TITLE -->
-			<tr>
-				<td class="postdetails" align="center">{RANK_TITLE}</td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF RANK_IMG -->
-			<tr>
-				<td align="center">{RANK_IMG}</td>
-			</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td>
-		</tr>
-		</table>
-	</td>
-	<td class="row1">
-		<table width="100%" cellspacing="1" cellpadding="2" border="0">
-		<tr> 
-			<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}{L_COLON} </td>
-			<td width="100%"><b class="gen">{JOINED}</b></td>
-		</tr>
-		<tr> 
-			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}{L_COLON} </td>
-			<td><b class="gen">{POSTS}</b></td>
-		</tr>
-		<tr> 
-			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}{L_COLON} </td>
-			<td><b class="gen">{WARNINGS}</b></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<br clear="all" /><br />
-
-<form method="post" name="mcp" action="{U_POST_ACTION}">
-
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th align="center">{L_ADD_WARNING}</th>
-</tr>
-<tr>
-	<td class="row3" align="center"><span class="genmed">{L_ADD_WARNING_EXPLAIN}</span></td>
-</tr>
-<tr>
-	<td class="row1" align="center"><textarea name="warning" rows="10" cols="76"></textarea></td>
-</tr>
-<!-- IF S_CAN_NOTIFY -->
-<tr>
-	<td class="row1" align="center"><input type="checkbox" class="radio" name="notify_user" checked="checked" /><span class="genmed">{L_NOTIFY_USER_WARN}</span></td>
-</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" /><br />
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/mcp_whois.html b/phpBB/styles/subsilver2/template/mcp_whois.html
deleted file mode 100644
index 3e3b983059..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_whois.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr> 
-	<th>{L_WHOIS}</th>
-</tr>
-<tr>
-	<td class="row3" align="center"><span class="gensmall">{RETURN_POST}</span></td>
-</tr>
-<tr>
-	<td class="row1"><pre>{WHOIS}</pre></td>
-</tr>
-</table>
-
-<!-- INCLUDE mcp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
deleted file mode 100644
index ecfb4b69c5..0000000000
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!-- IF S_IN_SEARCH_POPUP -->
-	<!-- INCLUDE simple_header.html -->
-<!-- ELSE -->
-	<!-- INCLUDE overall_header.html -->
-<!-- ENDIF -->
-
-<!-- IF S_SEARCH_USER -->	
-	<!-- INCLUDE memberlist_search.html -->	
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_GROUP --><!-- INCLUDE memberlist_group.html --><!-- ENDIF -->
-
-<!-- IF not S_SHOW_GROUP -->
-	<form method="post" name="charsearch" action="{S_MODE_ACTION}">
-		<table width="100%" cellspacing="1">
-		<tr>
-			<td align="{S_CONTENT_FLOW_BEGIN}"><span class="genmed">{L_USERNAME_BEGINS_WITH}{L_COLON} </span>
-				<select name="first_char" onchange="this.form.submit();">
-					<!-- BEGIN first_char -->
-						<option value="{first_char.VALUE}"<!-- IF first_char.S_SELECTED --> selected="selected"<!-- ENDIF -->>{first_char.DESC}</option>
-					<!-- END first_char -->
-				</select>&nbsp;<input type="submit" name="char" value="{L_DISPLAY}" class="btnlite" /></td>
-	<!-- IF U_FIND_MEMBER and not S_SEARCH_USER -->
-			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a></td>
-	<!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP -->
-			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a></td>
-	<!-- ENDIF -->
-		</tr>
-		</table>
-		{S_FORM_TOKEN}
-	</form>
-<!-- ENDIF -->
-
-<!-- IF S_IN_SEARCH_POPUP -->
-	<form method="post" name="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user);return false">
-<!-- ELSE -->
-	<form method="post" action="{S_MODE_ACTION}">
-<!-- ENDIF -->
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th nowrap="nowrap">#</th>
-	<th nowrap="nowrap" width="25%" align="{S_CONTENT_FLOW_BEGIN}"><a href="{U_SORT_USERNAME}">{L_USERNAME}</a></th>
-	<th nowrap="nowrap" width="15%"><a href="{U_SORT_JOINED}">{L_JOINED}</a></th>
-	<th nowrap="nowrap" width="10%"><a href="{U_SORT_POSTS}">{L_POSTS}</a></th>
-	<th nowrap="nowrap" width="15%"><a href="{U_SORT_RANK}">{L_RANK}</a></th>
-	<th nowrap="nowrap" width="11%">{L_SEND_MESSAGE}</th>
-	<th nowrap="nowrap" width="11%"><a href="{U_SORT_EMAIL}">{L_EMAIL}</a></th>
-	<!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><th width="2%" nowrap="nowrap">{L_MARK}</th><!-- ENDIF -->
-</tr>
-<!-- BEGIN memberrow -->
-
-	<!-- IF S_SHOW_GROUP -->
-		<!-- IF memberrow.S_FIRST_ROW and memberrow.S_GROUP_LEADER -->
-			<tr class="row3">
-				<td colspan="8"><b class="gensmall">{L_GROUP_LEADER}</b></td>
-			</tr>
-		<!-- ELSEIF not memberrow.S_GROUP_LEADER and not $S_MEMBER_HEADER -->
-			<tr class="row3">
-				<td colspan="8"><b class="gensmall">{L_GROUP_MEMBERS}</b></td>
-			</tr>
-				<!-- DEFINE $S_MEMBER_HEADER = 1 -->
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-
-	<!-- IF memberrow.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE -->	<tr class="row1"><!-- ENDIF -->
-
-		<td class="gen" align="center">&nbsp;{memberrow.ROW_NUMBER}&nbsp;</td>
-		<td class="genmed" align="{S_CONTENT_FLOW_BEGIN}"><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- EVENT memberlist_body_username_append --><!-- IF S_SELECT_SINGLE --> [&nbsp;<a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
-		<td class="genmed" align="center" nowrap="nowrap">&nbsp;{memberrow.JOINED}&nbsp;</td>
-		<td class="gen" align="center">{memberrow.POSTS}</td>
-		<td class="gen" align="center"><!-- IF memberrow.RANK_IMG -->{memberrow.RANK_IMG}<!-- ELSE -->{memberrow.RANK_TITLE}<!-- ENDIF --></td>
-		<td class="gen" align="center">&nbsp;<!-- IF memberrow.U_PM --><a href="{memberrow.U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
-		<td class="gen" align="center">&nbsp;<!-- IF memberrow.U_EMAIL --><a href="{memberrow.U_EMAIL}" class="imageset">{EMAIL_IMG}</a><!-- ENDIF -->&nbsp;</td>
-		<!-- IF memberrow.S_PROFILE_FIELD1 -->
-			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-			<td class="gen" align="center">&nbsp;{memberrow.PROFILE_FIELD1_VALUE}</td>
-		<!-- ENDIF -->
-		<!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><td align="center"><input type="checkbox" class="radio" name="user" value="{memberrow.USERNAME}" /></td><!-- ENDIF -->
-	</tr>
-
-<!-- BEGINELSE -->
-
-	<tr>
-		<td class="row1" colspan="<!-- IF S_IN_SEARCH_POPUP -->9<!-- ELSE -->8<!-- ENDIF -->" align="center">
-			<span class="gen"><!-- IF S_SHOW_GROUP -->{L_NO_GROUP_MEMBERS}<!-- ELSE -->{L_NO_MEMBERS}<!-- ENDIF --></span>
-		</td>
-	</tr>
-
-<!-- END memberrow -->
-
-<tr>
-	<td class="cat" colspan="<!-- IF S_IN_SEARCH_POPUP -->9<!-- ELSE -->8<!-- ENDIF -->" align="center"><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input class="btnlite" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}{L_COLON}</span>&nbsp;<select name="sk">{S_MODE_SELECT}</select>&nbsp; <span class="gensmall">{L_ORDER}</span>&nbsp;<select name="sd">{S_ORDER_SELECT}</select>&nbsp; <input type="submit" name="submit" value="{L_SUBMIT}" class="btnlite" /><!-- ENDIF --></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-	
-</form>
-
-<table width="100%" cellspacing="0" cellpadding="0">
-<tr>
-	<td class="pagination">{PAGE_NUMBER} [ {TOTAL_USERS} ]</td>
-	<td align="{S_CONTENT_FLOW_END}"><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><b class="nav"><a href="#" onclick="marklist('results', 'user', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('results', 'user', false); return false;">{L_UNMARK_ALL}</a></b><br /><!-- ENDIF --><span class="pagination"><!-- INCLUDE pagination.html --></span></td>
-</tr>
-</table>
-
-
-
-<!-- IF S_IN_SEARCH_POPUP -->
-	<!-- INCLUDE simple_footer.html -->	
-<!-- ELSE -->
-	<br clear="all" />
-	
-	<!-- INCLUDE breadcrumbs.html -->
-	
-	<br clear="all" />
-	
-	<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>	
-	<!-- INCLUDE overall_footer.html -->
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html
deleted file mode 100644
index 13ff4baace..0000000000
--- a/phpBB/styles/subsilver2/template/memberlist_email.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="pagecontent">
-
-	<form action="{S_POST_ACTION}" method="post" name="postform">
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-	<!-- IF S_CONTACT_ADMIN-->
-		<th colspan="2">{L_CONTACT_ADMIN}</th>
-	<!-- ELSEIF S_SEND_USER -->
-		<th colspan="2">{L_SEND_EMAIL_USER}</th>
-	<!-- ELSE -->
-		<th colspan="2">{L_EMAIL_TOPIC}</th>
-	<!-- ENDIF -->
-	</tr>
-	<!-- IF ERROR_MESSAGE -->
-		<tr>
-			<td class="row3" colspan="2" align="center"><span class="error">{ERROR_MESSAGE}</span></td>
-		</tr>
-	<!-- ENDIF -->
-	<!-- IF CONTACT_INFO -->
-	<tr>
-		<td class="row1" colspan="2">{CONTACT_INFO}</td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- IF S_SEND_USER -->
-		<tr>
-			<td class="row1" width="35%"><b class="genmed">{L_RECIPIENT}</b></td>
-			<td class="row2" width="65%"><b class="genmed">{USERNAME}</b></td>
-		</tr>
-		<tr>
-			<td class="row1" width="35%"><b class="genmed">{L_SUBJECT}</b></td>
-			<td class="row2"><input class="post" type="text" name="subject" size="50" tabindex="2" value="{SUBJECT}" /></td>
-		</tr>
-	<!-- ELSEIF S_CONTACT_ADMIN-->
-		<tr>
-			<td class="row1" width="35%"><b class="genmed">{L_RECIPIENT}</b></td>
-			<td class="row2" width="65%"><b class="genmed">{L_ADMINISTRATOR}</b></td>
-		</tr>
-		<!-- IF not S_IS_REGISTERED -->
-		<tr>
-			<td class="row1" width="35%"><b class="genmed">{L_SENDER_EMAIL_ADDRESS}</b></td>
-			<td class="row2"><input class="post" type="text" name="email" size="50" maxlength="100" value="{EMAIL}" /></td>
-		</tr>
-		<tr>
-			<td class="row1" width="35%"><b class="genmed">{L_SENDER_NAME}</b></td>
-			<td class="row2"><input class="post" type="text" name="name" size="50" value="{NAME}" /></td>
-		</tr>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		<tr>
-			<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}</b></td>
-			<td class="row2"><input class="post" type="email" name="email" size="50" maxlength="100" value="{EMAIL}" /></td>
-		</tr>
-		<tr>
-			<td class="row1" width="35%"><b class="genmed">{L_REAL_NAME}</b></td>
-			<td class="row2"><input class="post" type="text" name="name" size="50" value="{NAME}" /></td>
-		</tr>
-		<tr>
-			<td class="row1" width="35%"><b class="genmed">{L_DEST_LANG}</b><br /><span class="gensmall">{L_DEST_LANG_EXPLAIN}</span></td>
-			<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>
-		</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}</b><br /><span class="gensmall">{L_EMAIL_BODY_EXPLAIN}</span></td>
-		<td class="row2"><textarea class="post" name="message" rows="15" cols="76" tabindex="3">{MESSAGE}</textarea></td>
-	</tr>
-	<tr>
-		<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
-		<td class="row2">
-			<table cellspacing="0" cellpadding="1" border="0">
-			<tr>
-				<td><input type="checkbox" class="radio" name="cc_email" value="1" checked="checked" /></td>
-				<td class="gen">{L_CC_EMAIL}</td>
-			</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" tabindex="6" name="submit" class="btnmain" value="{L_SEND_EMAIL}" /></td>
-	</tr>
-	</table>
-
-	{S_FORM_TOKEN}
-
-	</form>
-
-</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div style="float: {S_CONTENT_FLOW_END};"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_group.html b/phpBB/styles/subsilver2/template/memberlist_group.html
deleted file mode 100644
index 4140c8cdbf..0000000000
--- a/phpBB/styles/subsilver2/template/memberlist_group.html
+++ /dev/null
@@ -1,17 +0,0 @@
- 
-<table class="tablebg" width="100%" cellspacing="1">
-<tr> 
-	<th colspan="3">{L_GROUP_INFORMATION}</th>
-</tr>
-<tr> 
-	<td class="row1" width="20%"><b class="genmed">{L_GROUP_NAME}{L_COLON}</b></td>
-	<td class="row2"><b class="gen"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR}"<!-- ENDIF -->>{GROUP_NAME}</b></td>
-<!-- IF AVATAR_IMG or RANK_IMG or GROUP_RANK or U_PM -->
-	<td class="row1" width="33%" rowspan="2" align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<br /><!-- ENDIF --><!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --><!-- IF GROUP_RANK --><span class="gensmall">{GROUP_RANK}</span><br /><br /><!-- ENDIF --><!-- IF U_PM --><a href="{U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF --></td>
-<!-- ENDIF -->
-</tr>
-<tr> 
-	<td class="row1" width="20%"><b class="genmed">{L_GROUP_DESC}{L_COLON}</b></td>
-	<td class="row2"><span class="gen">{GROUP_DESC}</span><p class="forumdesc">{GROUP_TYPE}</p></td>
-</tr>
-</table>
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
deleted file mode 100644
index a19229605a..0000000000
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<br clear="all" />
-
-<form method="post" action="{S_IM_ACTION}">
-	<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2">{L_SEND_IM}</th>
-	</tr>
-	<tr>
-		<td class="row3" colspan="2"><span class="gensmall">{L_SEND_IM_EXPLAIN}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><b class="genmed">{L_IM_RECIPIENT}{L_COLON} </b></td>
-		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
-	</tr>
-
-	<!-- IF S_SEND_JABBER -->
-		<tr>
-			<td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td>
-			<td class="row2"><textarea class="post" name="message" rows="5" cols="45"></textarea></td>
-		</tr>
-		<tr>
-			<td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td>
-		</tr>
-		<tr>
-			<td class="row1" colspan="2" align="center"><span class="gen">{L_IM_SENT_JABBER}</span></td>
-		</tr>
-		<tr>
-			<td class="cat" colspan="2" align="center"></td>
-		</tr>
-	<!-- ELSEIF S_NO_SEND_JABBER -->
-		<tr>
-			<td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td>
-		</tr>
-	<!-- ENDIF -->
-
-	</table>
-{S_FORM_TOKEN}
-</form>
-
-<a class="nav" href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
-
-<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
deleted file mode 100644
index 12dd10be2e..0000000000
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!-- You should retain this javascript in your own template! -->
-
-<!-- IF S_IN_SEARCH_POPUP -->
-	<script type="text/javascript">
-	// <![CDATA[
-		function insert_user(user)
-		{
-			opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
-		}
-
-		function insert_marked(users)
-		{
-			if (typeof(users.length) == "undefined")
-			{
-				if (users.checked)
-				{
-					insert_user(users.value);
-				}
-			}
-			else if (users.length > 0)
-			{
-				for (i = 0; i < users.length; i++)
-				{
-					if (users[i].checked)
-					{
-						insert_user(users[i].value);
-					}
-				}
-			}
-
-			self.close();
-		}
-
-		function insert_single(user)
-		{
-			opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = user;
-			self.close();
-		}
-
-		/**
-		* Mark/unmark checklist
-		* id = ID of parent container, name = name prefix, state = state [true/false]
-		*/
-		function marklist(id, name, state)
-		{
-			var parent = document.getElementById(id) || document[id];
-
-			if (!parent)
-			{
-				return;
-			}
-
-			var rb = parent.getElementsByTagName('input');
-
-			for (var r = 0; r < rb.length; r++)
-			{
-				if (rb[r].name.substr(0, name.length) == name)
-				{
-					rb[r].checked = state;
-				}
-			}
-		}
-	// ]]>
-	</script>
-<!-- ENDIF -->
-
-<form method="post" action="{S_MODE_ACTION}" name="search">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="4">{L_FIND_USERNAME}</th>
-</tr>
-<tr>
-	<td class="row3" colspan="4"><span class="gensmall">{L_FIND_USERNAME_EXPLAIN}</span></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="username" value="{USERNAME}" /></td>
-	<!-- IF S_EMAIL_SEARCH_ALLOWED -->
-		<td class="row1"><b class="genmed">{L_EMAIL}{L_COLON}</b></td>
-		<td class="row2"><input class="post" type="email" name="email" value="{EMAIL}" /></td>
-	<!-- ELSE -->
-		<td colspan="2" class="row1">&nbsp;</td>
-	<!-- ENDIF -->
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_JOINED}{L_COLON}</b></td>
-	<td class="row2"><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="post" type="text" name="joined" value="{JOINED}" /></td>
-	<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>
-	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="number" min="0" name="count" value="{COUNT}" /></td>
-</tr>
-<!-- IF S_VIEWONLINE -->
-<tr>
-	<td class="row1"><b class="genmed">{L_LAST_ACTIVE}{L_COLON}</b></td>
-	<td class="row2"><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="post" type="text" name="active" value="{ACTIVE}" /></td>
-	<!-- IF S_IP_SEARCH_ALLOWED -->
-		<td class="row1"><b class="genmed">{L_POST_IP}{L_COLON}</b></td>
-		<td class="row2"><input class="post" type="text" name="ip" value="{IP}" /></td>
-	<!-- ELSE -->
-		<td colspan="2" class="row1">&nbsp;</td>
-	<!-- ENDIF -->
-</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row1"><b class="genmed">{L_GROUP}{L_COLON}</b></td>
-	<td class="row2" nowrap="nowrap"><select name="search_group_id">{S_GROUP_SELECT}</select></td>
-	<!-- IF S_JABBER_ENABLED -->
-		<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
-		<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
-	<!-- ELSE -->
-		<td colspan="2" class="row1">&nbsp;</td>
-	<!-- ENDIF -->
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_SORT_BY}{L_COLON}</b></td>
-	<td class="row2" nowrap="nowrap"><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select>&nbsp;</td>
-	<td colspan="2" class="row1">&nbsp;</td>
-</tr>
-<tr>
-	<td class="cat" colspan="4" align="center"><input class="btnmain" type="submit" name="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/memberlist_team.html b/phpBB/styles/subsilver2/template/memberlist_team.html
deleted file mode 100644
index a4f38aafc4..0000000000
--- a/phpBB/styles/subsilver2/template/memberlist_team.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form method="post" action="{S_MODE_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th nowrap="nowrap" width="20%">{L_USERNAME}</th>
-	<!-- IF S_DISPLAY_MODERATOR_FORUMS --><th nowrap="nowrap" width="25%">{L_FORUMS}</th><!-- ENDIF -->
-	<th nowrap="nowrap" width="20%">{L_PRIMARY_GROUP}</th>
-	<th nowrap="nowrap" width="15%">{L_RANK}</th>
-	<th nowrap="nowrap" width="11%">{L_SEND_MESSAGE}</th>
-</tr>
-<!-- BEGIN group -->
-<tr class="row3">
-	<td colspan="5"><b class="gensmall"><!-- IF group.U_GROUP --><a href="{group.U_GROUP}">{group.GROUP_NAME}</a><!-- ELSE -->{group.GROUP_NAME}<!-- ENDIF --></b></td>
-</tr>
-<!-- BEGIN user -->
-	<!-- IF group.user.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF -->
-
-	<td class="gen" align="center"><strong>{group.user.USERNAME_FULL}</strong></td>
-	<!-- IF S_DISPLAY_MODERATOR_FORUMS --><td class="gensmall" align="center"><!-- IF group.user.FORUM_OPTIONS --><select style="width: 100%;">{group.user.FORUMS}</select><!-- ELSEIF group.user.FORUMS -->{group.user.FORUMS}<!-- ELSE -->-<!-- ENDIF --></td><!-- ENDIF -->
-	<td class="gensmall" align="center" nowrap="nowrap">&nbsp;
-		<!-- IF group.user.U_GROUP -->
-			<a<!-- IF group.user.GROUP_COLOR --> style="font-weight: bold; color:#{group.user.GROUP_COLOR}"<!-- ENDIF --> href="{group.user.U_GROUP}">{group.user.GROUP_NAME}</a>
-		<!-- ELSE -->
-			{group.user.GROUP_NAME}
-		<!-- ENDIF -->
-	&nbsp;</td>
-	<td class="gen" align="center"><!-- IF group.user.RANK_IMG -->{group.user.RANK_IMG}<!-- ELSE -->{group.user.RANK_TITLE}<!-- ENDIF --></td>
-	<td class="gen" align="center">&nbsp;<!-- IF group.user.U_PM --><a href="{group.user.U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
-</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="5" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
-	</tr>
-<!-- END user -->
-<!-- END group -->
-</table>
-
-</form>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div style="float: {S_CONTENT_FLOW_END};"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
deleted file mode 100644
index 00c627f62e..0000000000
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="pagecontent">
-
-	<!-- EVENT memberlist_view_content_prepend -->
-
-	<form method="post" action="{S_PROFILE_ACTION}">
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="2" nowrap="nowrap">{L_VIEWING_PROFILE}</th>
-	</tr>
-	<tr>
-		<td class="cat" width="40%" align="center"><h4>{L_USER_PRESENCE}</h4></td>
-		<td class="cat" width="60%" align="center"><h4>{L_USER_FORUM}</h4></td>
-	</tr>
-	<tr>
-		<td class="row1" align="center">
-
-			<table cellspacing="1" cellpadding="2" border="0">
-			<!-- IF S_USER_INACTIVE -->
-			<tr>
-				<td align="center"><b class="gen inactive">{L_USER_IS_INACTIVE}</b><br />{L_INACTIVE_REASON}{L_COLON} {USER_INACTIVE_REASON}<br /><br /></td>
-			</tr>
-			<!-- ENDIF -->
-			<tr>
-				<td align="center"><!-- IF USER_COLOR --><b class="gen" style="color: {USER_COLOR}"><!-- ELSE --><b class="gen"><!-- ENDIF -->{USERNAME}</b><!-- IF U_USER_BAN --><span class="genmed"> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]</span><!-- ENDIF --><!-- IF U_USER_ADMIN --><span class="genmed"> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]</span><!-- ENDIF --></td>
-			</tr>
-			<!-- IF RANK_TITLE -->
-				<tr>
-					<td class="postdetails" align="center">{RANK_TITLE}</td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- IF RANK_IMG -->
-				<tr>
-					<td align="center">{RANK_IMG}</td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- IF AVATAR_IMG -->
-				<tr>
-					<td align="center">{AVATAR_IMG}</td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- IF ONLINE_IMG -->
-			<tr>
-				<td align="center">{ONLINE_IMG}</td>
-			</tr>
-			<!-- ENDIF -->
-			<!-- IF U_SWITCH_PERMISSIONS -->
-				<tr>
-					<td class="genmed" align="center">[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
-				<tr>
-					<td class="genmed" align="center">[
-						<!-- IF U_REMOVE_FRIEND -->
-							<a href="{U_REMOVE_FRIEND}">{L_REMOVE_FRIEND}</a>
-						<!-- ELSEIF U_REMOVE_FOE -->
-							<a href="{U_REMOVE_FOE}">{L_REMOVE_FOE}</a>
-						<!-- ELSE -->
-							<!-- IF U_ADD_FRIEND --><a href="{U_ADD_FRIEND}">{L_ADD_FRIEND}</a><!-- ENDIF --><!-- IF U_ADD_FOE --><!-- IF U_ADD_FRIEND --> | <!-- ENDIF --><a href="{U_ADD_FOE}">{L_ADD_FOE}</a><!-- ENDIF -->
-						<!-- ENDIF -->
-					]</td>
-				</tr>
-			<!-- ENDIF -->
-			</table>
-		</td>
-		<td class="row1">
-			<table width="100%" cellspacing="1" cellpadding="2" border="0">
-			<!-- EVENT memberlist_view_user_statistics_before -->
-			<tr>
-				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}{L_COLON} </td>
-				<td width="100%"><b class="gen">{JOINED}</b></td>
-			</tr>
-			<tr>
-				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LAST_ACTIVE}{L_COLON} </td>
-				<td width="100%"><b class="gen">{LAST_ACTIVE}</b></td>
-			</tr>
-			<!-- IF S_WARNINGS -->
-				<tr>
-					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}{L_COLON} </td>
-					<td width="100%"><b class="gen">{WARNINGS}</b><!-- IF U_NOTES or U_WARN --><br /><span class="genmed"> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]</span><!-- ENDIF --></td>
-				</tr>
-			<!-- ENDIF -->
-			<tr>
-				<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}{L_COLON} </td>
-				<td><b class="gen">{POSTS}</b><span class="genmed"><!-- IF POSTS_PCT --><br />[{POSTS_PCT} / {POSTS_DAY}]<!-- ENDIF -->
-				<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />[<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>]<!-- ELSEIF POSTS_IN_QUEUE --><br />[{L_POSTS_IN_QUEUE}]<!-- ENDIF -->
-				<!-- IF S_DISPLAY_SEARCH --><br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a><!-- ENDIF --></span></td>
-			</tr>
-			<!-- IF S_SHOW_ACTIVITY -->
-				<tr>
-					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_FORUM}{L_COLON} </td>
-					<td><!-- IF ACTIVE_FORUM != '' --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
-				</tr>
-				<tr>
-					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}{L_COLON} </td>
-					<td><!-- IF ACTIVE_TOPIC != '' --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- EVENT memberlist_view_user_statistics_after -->
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td class="cat" align="center"><h4>{L_CONTACT}</h4></td>
-		<td class="cat" align="center"><h4>{L_ABOUT_USER}</h4></td>
-	</tr>
-	<!-- EVENT memberlist_view_contact_before -->
-	<tr>
-		<td class="row1">
-			<table width="100%" cellspacing="1" cellpadding="2" border="0">
-			<tr>
-				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_EMAIL_ADDRESS}{L_COLON} </td>
-				<td width="100%"><!-- IF U_EMAIL --><a href="{U_EMAIL}" class="imageset">{EMAIL_IMG}</a><!-- ENDIF --></td>
-			</tr>
-			<!-- IF U_PM -->
-				<tr>
-					<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_PM}{L_COLON} </td>
-					<td><a href="{U_PM}" class="imageset">{PM_IMG}</a></td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- IF S_JABBER_ENABLED -->
-			<tr>
-				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_JABBER}{L_COLON} </td>
-				<td><!-- IF U_JABBER --><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false" class="imageset">{JABBER_IMG}</a><!-- ELSEIF USER_JABBER -->{USER_JABBER_IMG}<!-- ENDIF --></td>
-			</tr>
-			<!-- ENDIF -->
-			<!-- BEGIN custom_fields -->
-				<!-- IF custom_fields.S_PROFILE_CONTACT -->
-				<tr>
-					<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{custom_fields.PROFILE_FIELD_NAME}{L_COLON} </td>
-					<!-- IF custom_fields.PROFILE_FIELD_CONTACT -->
-						<td><a href="{custom_fields.PROFILE_FIELD_CONTACT}"><span class="imageset {custom_fields.PROFILE_FIELD_IDENT}-icon">{custom_fields.PROFILE_FIELD_DESC}</span></a></td>
-					<!-- ELSE -->
-						<td><b class="genmed">{custom_fields.PROFILE_FIELD_VALUE}</b></td>
-					<!-- ENDIF -->
-				</tr>
-				<!-- ENDIF -->
-			<!-- END custom_fields -->
-			</table>
-		</td>
-		<td class="row1">
-			<table cellspacing="1" cellpadding="2" border="0">
-			<tr>
-				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_USERGROUPS}{L_COLON} </td>
-				<td><select name="g">{S_GROUP_OPTIONS}</select> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td>
-			</tr>
-			<!-- IF AGE !== '' -->
-			<tr>
-				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_AGE}{L_COLON} </td>
-				<td><b class="genmed">{AGE}</b></td>
-			</tr>
-			<!-- ENDIF -->
-			<!-- IF S_PROFILE_FIELD1 -->
-				<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-				<tr>
-					<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{PROFILE_FIELD1_NAME}{L_COLON} </td>
-					<td><b class="genmed">{PROFILE_FIELD1_VALUE}</b></td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- BEGIN custom_fields -->
-				<!-- IF not custom_fields.S_PROFILE_CONTACT -->
-				<tr>
-					<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{custom_fields.PROFILE_FIELD_NAME}{L_COLON} </td>
-					<td><b class="genmed">{custom_fields.PROFILE_FIELD_VALUE}</b></td>
-				</tr>
-				<!-- ENDIF -->
-			<!-- END custom_fields -->
-			</table>
-		</td>
-	</tr>
-	<!-- EVENT memberlist_view_contact_after -->
-	<!-- IF SIGNATURE -->
-		<tr>
-			<td class="cat" colspan="2" align="center"><h4>{L_SIGNATURE}</h4></td>
-		</tr>
-		<tr>
-			<td class="row1" colspan="2"><div class="postbody" style="padding: 10px;">{SIGNATURE}</div></td>
-		</tr>
-	<!-- ENDIF -->
-	</table>
-
-	</form>
-
-	<!-- EVENT memberlist_view_content_append -->
-
-</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div style="float: {S_CONTENT_FLOW_END};"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/message_body.html b/phpBB/styles/subsilver2/template/message_body.html
deleted file mode 100644
index b9b502a57f..0000000000
--- a/phpBB/styles/subsilver2/template/message_body.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th>{MESSAGE_TITLE}</th>
-</tr>
-<tr> 
-	<td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br /></td>
-</tr>
-</table>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
deleted file mode 100644
index 42ee17f2ed..0000000000
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ /dev/null
@@ -1,27 +0,0 @@
-	<!-- EVENT overall_footer_content_after -->
-
-	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
-</div>
-
-<!-- EVENT overall_footer_page_body_after -->
-
-<div id="wrapfooter">
-	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright">
-	<!-- EVENT overall_footer_copyright_prepend -->
-	{CREDIT_LINE}
-	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-	<!-- EVENT overall_footer_copyright_append -->
-	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
-</div>
-
-<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
-
-<!-- EVENT overall_footer_after -->
-
-{$SCRIPTS}
-
-</body>
-</html>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
deleted file mode 100644
index ebb7b3be4d..0000000000
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<!DOCTYPE html>
-<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
-<head>
-<meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-{META}
-<title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
-
-<!-- IF S_ENABLE_FEEDS -->
-	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
-	<!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{U_FEED}?mode=news" /><!-- ENDIF -->
-	<!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{U_FEED}?mode=forums" /><!-- ENDIF -->
-	<!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_NEW}" href="{U_FEED}?mode=topics" /><!-- ENDIF -->
-	<!-- IF S_ENABLE_FEEDS_TOPICS_ACTIVE --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_ACTIVE}" href="{U_FEED}?mode=topics_active" /><!-- ENDIF -->
-	<!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} - {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}" /><!-- ENDIF -->
-	<!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&amp;t={S_TOPIC_ID}" /><!-- ENDIF -->
-<!-- ENDIF -->
-
-<!-- IF U_CANONICAL -->
-	<link rel="canonical" href="{U_CANONICAL}" />
-<!-- ENDIF -->
-
-<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
-<link rel="stylesheet" href="{T_STYLESHEET_LANG_LINK}" type="text/css" />
-
-<script type="text/javascript">
-// <![CDATA[
-
-function popup(url, width, height, name)
-{
-	if (!name)
-	{
-		name = '_popup';
-	}
-
-	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes,width=' + width);
-	return false;
-}
-
-function jumpto()
-{
-	var page = prompt('{LA_JUMP_PAGE}{L_COLON}', '{CURRENT_PAGE}');
-	var per_page = '{PER_PAGE}';
-	var base_url = '{BASE_URL|e('js')}';
-
-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
-	{
-		if (base_url.indexOf('?') == -1)
-		{
-			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
-		}
-		else
-		{
-			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
-		}
-	}
-}
-
-/**
-* Find a member
-*/
-function find_username(url)
-{
-	popup(url, 760, 570, '_usersearch');
-	return false;
-}
-
-/**
-* Mark/unmark checklist
-* id = ID of parent container, name = name prefix, state = state [true/false]
-*/
-function marklist(id, name, state)
-{
-	var parent = document.getElementById(id) || document[id];
-
-	if (!parent)
-	{
-		return;
-	}
-
-	var rb = parent.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].name.substr(0, name.length) == name)
-		{
-			rb[r].checked = state;
-		}
-	}
-}
-
-<!-- IF ._file -->
-
-	/**
-	* Play quicktime file by determining it's width/height
-	* from the displayed rectangle area
-	*
-	* Only defined if there is a file block present.
-	*/
-	function play_qt_file(obj)
-	{
-		var rectangle = obj.GetRectangle();
-
-		if (rectangle)
-		{
-			rectangle = rectangle.split(',')
-			var x1 = parseInt(rectangle[0]);
-			var x2 = parseInt(rectangle[2]);
-			var y1 = parseInt(rectangle[1]);
-			var y2 = parseInt(rectangle[3]);
-
-			var width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
-			var height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
-		}
-		else
-		{
-			var width = 200;
-			var height = 0;
-		}
-
-		obj.width = width;
-		obj.height = height + 16;
-
-		obj.SetControllerVisible(true);
-
-		obj.Play();
-	}
-<!-- ENDIF -->
-
-// ]]>
-</script>
-
-<!-- EVENT overall_header_head_append -->
-
-{$STYLESHEETS}
-
-<!-- EVENT overall_header_stylesheets_after -->
-
-</head>
-<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">
-
-<!-- EVENT overall_header_body_before -->
-
-<a name="top" class="anchor"></a>
-
-<div id="wrapheader">
-
-	<div id="logodesc">
-		<table width="100%" cellspacing="0">
-		<tr>
-			<td><a href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" class="imageset">{SITE_LOGO_IMG}</a></td>
-			<td width="100%" align="center"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}</span></td>
-		</tr>
-		</table>
-	</div>
-
-	<div id="menubar">
-		<table width="100%" cellspacing="0">
-		<tr>
-			<td class="genmed dropdown-container">
-				<!-- IF S_NOTIFICATIONS_DISPLAY and not S_IS_BOT and S_USER_LOGGED_IN -->
-					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger">
-						<img src="{T_THEME_PATH}/images/icon_mini_notification.gif" width="12" height="13" alt="*" />
-						{L_NOTIFICATIONS} [<strong>{NOTIFICATIONS_COUNT}</strong>]
-					</a>&nbsp;
-					<div id="notification_list" class="notification_list dropdown">
-						<div class="row1 header">
-							{L_NOTIFICATIONS}
-							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
-						</div>
-
-						<div class="notification_scroll">
-							<table class="tablebg" cellspacing="1">
-								<!-- BEGIN notifications -->
-									<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
-										<td width="50">
-											<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
-										</td>
-										<td valign="top">
-											<div class="notification_title">
-												<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
-													{notifications.FORMATTED_TITLE}
-												<!-- IF notifications.URL --></a><!-- ENDIF -->
-
-												<!-- IF notifications.REFERENCE --><br /><span class="notification-reference">{notifications.REFERENCE}</span><!-- ENDIF -->
-												<!-- IF notifications.FORUM --><br /><span class="notification-forum">{notifications.FORUM}</span><!-- ENDIF -->
-												<!-- IF notifications.REASON --><br /><span class="notification-reason">{notifications.REASON}</span><!-- ENDIF -->
-													<br /><span class="notification-time">{notifications.TIME}</span>
-												<!-- IF not notifications.URL and notifications.UNREAD -->
-													<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
-												<!-- ENDIF -->
-											</div>
-										</td>
-				   					</tr>
-				   				<!-- END notifications -->
-				   			</table>
-				   		</div>
-
-						<div class="row1 footer">
-							<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
-						</div>
-					</div>
-				<!-- ENDIF -->
-				<!-- IF not S_IS_BOT -->
-					<!-- IF S_USER_LOGGED_IN -->
-						<!-- IF S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" alt="*" /> {L_PRIVATE_MESSAGES} [<strong>{PRIVATE_MESSAGE_COUNT}</strong>]</a><!-- ENDIF -->
-					<!-- ELSEIF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --> &nbsp;<a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" alt="*" /> {L_REGISTER}</a>
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-				<!-- IF not S_IS_BOT --> &nbsp;<a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_LOGIN_LOGOUT}</a>&nbsp;<!-- ENDIF -->
-				<!-- IF U_RESTORE_PERMISSIONS --> &nbsp;<a href="{U_RESTORE_PERMISSIONS}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_RESTORE_PERMISSIONS}</a><!-- ENDIF -->
-				<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> &nbsp;<span class="error">{L_BOARD_DISABLED}</span><!-- ENDIF -->
-			</td>
-			<td class="genmed" align="{S_CONTENT_FLOW_END}">
-				<!-- EVENT overall_header_navigation_prepend -->
-				<a href="{U_FAQ}" rel="help"><img src="{T_THEME_PATH}/images/icon_mini_faq.gif" width="12" height="13" alt="*" /> {L_FAQ}</a>
-				<!-- IF S_DISPLAY_SEARCH -->&nbsp; &nbsp;<a href="{U_SEARCH}"><img src="{T_THEME_PATH}/images/icon_mini_search.gif" width="12" height="13" alt="*" /> {L_SEARCH}</a><!-- ENDIF -->
-				<!-- IF not S_IS_BOT -->
-					<!-- IF S_DISPLAY_MEMBERLIST -->&nbsp; &nbsp;<a href="{U_MEMBERLIST}"><img src="{T_THEME_PATH}/images/icon_mini_members.gif" width="12" height="13" alt="*" /> {L_MEMBERLIST}</a><!-- ENDIF -->
-					<!-- IF S_USER_LOGGED_IN -->&nbsp; &nbsp;<a href="{U_PROFILE}"><img src="{T_THEME_PATH}/images/icon_mini_profile.gif" width="12" height="13" alt="*" /> {L_PROFILE}</a><!-- ENDIF -->
-				<!-- ENDIF -->
-				<!-- EVENT overall_header_navigation_append -->
-			</td>
-		</tr>
-		</table>
-	</div>
-
-	<div id="datebar">
-		<table width="100%" cellspacing="0">
-		<tr>
-			<td class="gensmall"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ENDIF --></td>
-			<td class="gensmall" align="{S_CONTENT_FLOW_END}">{CURRENT_TIME}<br /></td>
-		</tr>
-		</table>
-	</div>
-
-</div>
-
-<!-- EVENT overall_header_page_body_before -->
-
-<div id="wrapcentre">
-
-	<!-- IF S_DISPLAY_SEARCH -->
-	<p class="searchbar">
-		<span style="float: {S_CONTENT_FLOW_BEGIN};"><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a> | <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></span>
-		<!-- IF S_USER_LOGGED_IN or S_LOAD_UNREADS -->
-		<span style="float: {S_CONTENT_FLOW_END};"><!-- IF S_LOAD_UNREADS --><a href="{U_SEARCH_UNREAD}">{L_SEARCH_UNREAD}</a><!-- IF S_USER_LOGGED_IN --> | <!-- ENDIF --><!-- ENDIF --><!-- IF S_USER_LOGGED_IN --><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a> | <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a><!-- ENDIF --></span>
-		<!-- ENDIF -->
-	</p>
-	<!-- ENDIF -->
-
-	<br style="clear: both;" />
-
-	<!-- DEFINE $S_MICRODATA = 1 -->
-	<!-- DEFINE $OVERALL_HEADER_BREADCRUMBS = 1 -->
-	<!-- INCLUDE breadcrumbs.html -->
-	<!-- UNDEFINE $OVERALL_HEADER_BREADCRUMBS -->
-	<!-- DEFINE $S_MICRODATA = 0 -->
-
-	<br />
-	<!-- EVENT overall_header_content_before -->
diff --git a/phpBB/styles/subsilver2/template/pagination.html b/phpBB/styles/subsilver2/template/pagination.html
deleted file mode 100644
index b1c1d0e6c9..0000000000
--- a/phpBB/styles/subsilver2/template/pagination.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- IF .pagination -->
-	<!-- IF BASE_URL --><b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE_CLICK}">{L_GOTO_PAGE}</a></b><!-- ENDIF -->
-	<!-- BEGIN pagination -->
-		<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a>
-		<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>
-		<!-- ELSEIF pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
-		<!-- ELSEIF pagination.S_IS_NEXT --><a href="{pagination.PAGE_URL}">{L_NEXT}</a>
-		<!-- ELSE --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
-		<!-- ENDIF -->
-	<!-- END pagination -->
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_attach_body.html b/phpBB/styles/subsilver2/template/posting_attach_body.html
deleted file mode 100644
index 8c70e4c831..0000000000
--- a/phpBB/styles/subsilver2/template/posting_attach_body.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<tr>
-	<th colspan="2">
-		<script type="text/javascript">
-		// <![CDATA[
-			/**
-			* Show upload progress bar
-			*/
-			function popup_progress_bar()
-			{
-				close_waitscreen = 0;
-				// no scrollbars
-				popup('{UA_PROGRESS_BAR}', 400, 200, '_upload');
-			}
-		// ]]>
-		</script>
-
-		<!-- IF S_CLOSE_PROGRESS_WINDOW -->
-			<script type="text/javascript">
-			// <![CDATA[
-				close_waitscreen = 1;
-			// ]]>
-			</script>
-		<!-- ENDIF -->
-
-		{L_ADD_ATTACHMENT}
-	</th>
-</tr>
-<tr>
-	<td class="row3" colspan="2"><span class="gensmall">{L_ADD_ATTACHMENT_EXPLAIN}</span></td>
-</tr>
-
-<tr> 
-	<td class="row1"><b class="genmed">{L_FILENAME}</b></td> 
-	<td class="row2"><input type="file" name="fileupload" size="40" maxlength="{FILESIZE}" value="" class="btnfile" /></td> 
-</tr> 
-<tr> 
-	<td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td> 
-	<td class="row2">
-		<table border="0" cellspacing="0" cellpadding="2">
-		<tr>
-			<td><textarea class="post" name="filecomment" rows="3" cols="35">{FILE_COMMENT}</textarea>&nbsp;</td>
-			<td valign="top">
-				<table border="0" cellspacing="4" cellpadding="0">
-				<tr>
-					<td><input class="btnlite" type="submit" style="width:150px" name="add_file" value="{L_ADD_FILE}" onclick="popup_progress_bar();" /></td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		</table>
-	</td>
-</tr> 
-
-<!-- IF S_HAS_ATTACHMENTS -->
-	<tr>
-		<th colspan="2">{L_POSTED_ATTACHMENTS}</th>
-	</tr>
-
-	<!-- BEGIN attach_row -->
-		<tr>
-			<td class="row1"><b class="genmed">{L_FILENAME}</b></td>
-			<td class="row2"><a class="genmed" href="{attach_row.U_VIEW_ATTACHMENT}" target="_blank">{attach_row.FILENAME}</a></td> 
-		</tr>
-		<tr> 
-			<td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td> 
-			<td class="row2">{attach_row.S_HIDDEN}
-				<table border="0" cellspacing="0" cellpadding="2">
-				<tr>
-					<td><textarea class="post" name="comment_list[{attach_row.ASSOC_INDEX}]" rows="3" cols="35" wrap="virtual">{attach_row.FILE_COMMENT}</textarea>&nbsp;</td>
-					<td valign="top">
-						<table border="0" cellspacing="4" cellpadding="0">
-						<tr>
-							<td><input class="btnlite" type="submit" style="width:150px" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" /></td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-	<!-- END attach_row -->
-
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
deleted file mode 100644
index 321e4227ee..0000000000
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ /dev/null
@@ -1,426 +0,0 @@
-<!-- IF S_PRIVMSGS -->
-	<!-- INCLUDE ucp_header.html -->
-<!-- ELSE -->
-	<!-- INCLUDE overall_header.html -->
-<!-- ENDIF -->
-
-<!-- IF S_FORUM_RULES -->
-	<div class="forumrules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">
-		<!-- IF U_FORUM_RULES -->
-			<h3>{L_FORUM_RULES}</h3><br />
-			<a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a>
-		<!-- ELSE -->
-			<h3>{L_FORUM_RULES}</h3><br />
-			{FORUM_RULES}
-		<!-- ENDIF -->
-	</div>
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-<!-- IF not S_PRIVMSGS -->
-	<div id="pageheader">
-		<h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h2>
-
-		<!-- IF MODERATORS -->
-			<p class="moderators">{L_MODERATORS}{L_COLON} {MODERATORS}</p>
-		<!-- ENDIF -->
-		<!-- IF U_MCP or U_ACP -->
-			<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
-		<!-- ENDIF -->
-	</div>
-
-	<br clear="all" /><br />
-<!-- ENDIF -->
-
-<!-- IF not S_SHOW_PM_BOX -->
-	<form action="{S_POST_ACTION}" method="post" name="postform"{S_FORM_ENCTYPE}>
-<!-- ENDIF -->
-
-<!-- IF S_DRAFT_LOADED -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th align="center">{L_INFORMATION}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><span class="gen"><!-- IF S_PRIVMSGS -->{L_DRAFT_LOADED_PM}<!-- ELSE -->{L_DRAFT_LOADED}<!-- ENDIF --></span></td>
-	</tr>
-	</table>
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_DRAFTS -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="3" align="center">{L_LOAD_DRAFT}</th>
-	</tr>
-	<tr>
-		<td class="row1" colspan="3" align="center"><span class="gen">{L_LOAD_DRAFT_EXPLAIN}</span></td>
-	</tr>
-	<tr>
-		<th>{L_SAVE_DATE}</th>
-		<th>{L_DRAFT_TITLE}</th>
-		<th>{L_OPTIONS}</th>
-	</tr>
-	<!-- BEGIN draftrow -->
-
-		<!-- IF draftrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td class="postdetails" style="padding: 4px;">{draftrow.DATE}</td>
-		<td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b>
-			<!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>
-			<!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>
-			<!-- ELSEIF draftrow.S_LINK_PM --><br /><span class="gensmall">{L_PRIVATE_MESSAGE}</span>
-			<!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF -->
-		</td>
-		<td style="padding: 4px;" align="center"><span class="gen"><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a></span></td>
-	</tr>
-	<!-- END draftrow -->
-	</table>
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-
-<!-- IF S_POST_REVIEW --><!-- INCLUDE posting_review.html --><!-- ENDIF -->
-<!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->
-
-
-<!-- IF not S_PRIVMSGS and S_UNGLOBALISE -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{L_MOVE}</th>
-	</tr>
-	<tr>
-		<td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-	</tr>
-	<tr>
-		<td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br /><input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" />&nbsp;&nbsp; <input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></td>
-	</tr>
-	</table>
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2"><b>{L_POST_A}</b></th>
-</tr>
-
-<!-- IF ERROR -->
-	<tr>
-		<td class="row2" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_ICON}{L_COLON}</b></td>
-		<td class="row2">
-			<table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} tabindex="1" /><span class="genmed"><!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></span> <!-- BEGIN topic_icon --><span style="white-space: nowrap;"><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /></span> <!-- END topic_icon --></td>
-			</tr>
-			</table>
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b></td>
-		<td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" value="{USERNAME}" /></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_PRIVMSGS -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_TO}{L_COLON}</b></td>
-		<td class="row2">
-			{S_HIDDEN_ADDRESS_FIELD}
-		<!-- BEGIN to_recipient -->
-			<span style="display: block; float: {S_CONTENT_FLOW_BEGIN};" class="nowrap genmed"><strong>
-			<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><span class="sep">{to_recipient.NAME}</span></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF --></strong>&nbsp;<!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="{L_REMOVE}" />&nbsp;<!-- ENDIF -->
-			</span>
-		<!-- BEGINELSE -->
-			<span class="genmed">{L_NO_TO_RECIPIENT}</span>
-		<!-- END to_recipient -->
-		</td>
-	</tr>
-	<!-- IF S_ALLOW_MASS_PM -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_BCC}{L_COLON}</b></td>
-		<td class="row2">
-		<!-- BEGIN bcc_recipient -->
-			<span class="genmed nowrap"><strong>
-			<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><span class="sep">{bcc_recipient.NAME}</span></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF --></strong>&nbsp;<!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="{L_REMOVE}" />&nbsp;<!-- ENDIF -->
-			</span>
-		<!-- BEGINELSE -->
-			<span class="genmed">{L_NO_BCC_RECIPIENT}</span>
-		<!-- END bcc_recipient -->
-		</td>
-	</tr>
-	<!-- ENDIF -->
-<!-- ENDIF -->
-<!-- EVENT posting_editor_subject_before -->
-<tr>
-	<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>
-	<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}" /></td>
-</tr>
-<!-- EVENT posting_editor_subject_after -->
-<tr>
-	<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}{L_COLON}</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}&nbsp;</span><br /><br />
-	<!-- IF S_SMILIES_ALLOWED -->
-		<table width="100%" cellspacing="5" cellpadding="0" border="0" align="center">
-		<tr>
-			<td class="gensmall" align="center"><b>{L_SMILIES}</b></td>
-		</tr>
-		<tr>
-			<td align="center">
-				<!-- BEGIN smiley -->
-					<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a>
-				<!-- END smiley -->
-			</td>
-		</tr>
-
-		<!-- IF S_SHOW_SMILEY_LINK -->
-			<tr>
-				<td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a></td>
-			</tr>
-		<!-- ENDIF -->
-
-		</table>
-	<!-- ENDIF -->
-	</td>
-	<td class="row2" valign="top">
-		<script type="text/javascript">
-		// <![CDATA[
-			var form_name = 'postform';
-			var text_name = 'message';
-		// ]]>
-		</script>
-
-		<table width="100%" cellspacing="0" cellpadding="0" border="0">
-		<!-- INCLUDE posting_buttons.html -->
-		<!-- EVENT posting_editor_message_before -->
-		<tr>
-			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td>
-			<!-- IF S_BBCODE_ALLOWED -->
-			<td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="11" data-height="10" data-bbcode="true">
-			</td>
-			<!-- ENDIF -->
-	 	</tr>
-	 	<!-- EVENT posting_editor_message_after -->
-		</table>
-	</td>
-</tr>
-
-<!-- IF S_INLINE_ATTACHMENT_OPTIONS -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_ATTACHMENTS}{L_COLON}</b></td>
-		<td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select>&nbsp;<input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_form = document.forms[form_name].elements['attachments']; attach_inline(attach_form.value, attach_form.options[attach_form.selectedIndex].text);" onmouseover="helpline('a')" onmouseout="helpline('tip')" />
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<tr>
-	<td class="row1" valign="top"><b class="genmed">{L_OPTIONS}{L_COLON}</b><br />
-		<table cellspacing="2" cellpadding="0" border="0">
-		<tr>
-			<td class="gensmall">{BBCODE_STATUS}</td>
-		</tr>
-		<!-- IF S_BBCODE_ALLOWED -->
-		<tr>
-			<td class="gensmall">{IMG_STATUS}</td>
-		</tr>
-		<tr>
-			<td class="gensmall">{FLASH_STATUS}</td>
-		</tr>
-		<tr>
-			<td class="gensmall">{URL_STATUS}</td>
-		</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td class="gensmall">{SMILIES_STATUS}</td>
-		</tr>
-		</table>
-	</td>
-	<td class="row2">
-		<table cellpadding="1">
-		<!-- EVENT posting_editor_options_prepend -->
-		<!-- IF S_BBCODE_ALLOWED -->
-			<tr>
-				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
-				<td class="gen">{L_DISABLE_BBCODE}</td>
-			</tr>
-		<!-- ENDIF -->
-
-		<!-- IF S_SMILIES_ALLOWED -->
-			<tr>
-				<td><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /></td>
-				<td class="gen">{L_DISABLE_SMILIES}</td>
-			</tr>
-		<!-- ENDIF -->
-
-		<!-- IF S_LINKS_ALLOWED -->
-		<tr>
-			<td><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /></td>
-			<td class="gen">{L_DISABLE_MAGIC_URL}</td>
-		</tr>
-		<!-- ENDIF -->
-
-		<!-- IF S_SIG_ALLOWED -->
-			<tr>
-				<td><input type="checkbox" class="radio" name="attach_sig"{S_SIGNATURE_CHECKED} /></td>
-				<td class="gen">{L_ATTACH_SIG}</td>
-			</tr>
-		<!-- ENDIF -->
-
-		<!-- IF S_NOTIFY_ALLOWED -->
-			<tr>
-				<td><input type="checkbox" class="radio" name="notify"{S_NOTIFY_CHECKED} /></td>
-				<td class="gen">{L_NOTIFY_REPLY}</td>
-			</tr>
-		<!-- ENDIF -->
-
-		<!-- IF not S_PRIVMSGS -->
-			<!-- IF S_LOCK_TOPIC_ALLOWED -->
-				<tr>
-					<td><input type="checkbox" class="radio" name="lock_topic"{S_LOCK_TOPIC_CHECKED} /></td>
-					<td class="gen">{L_LOCK_TOPIC}</td>
-				</tr>
-			<!-- ENDIF -->
-
-			<!-- IF S_LOCK_POST_ALLOWED -->
-				<tr>
-					<td><input type="checkbox" class="radio" name="lock_post"{S_LOCK_POST_CHECKED} /></td>
-					<td class="gen">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</td>
-				</tr>
-			<!-- ENDIF -->
-
-			<!-- IF S_TYPE_TOGGLE -->
-				<tr>
-					<td></td>
-					<td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->{L_COLON} <!-- BEGIN topic_type --><input type="radio" class="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}&nbsp;&nbsp;<!-- END topic_type --></td>
-				</tr>
-			<!-- ENDIF -->
-		<!-- ENDIF -->
-		</table>
-	</td>
-</tr>
-
-<!-- IF S_SOFTDELETE_ALLOWED or S_DELETE_ALLOWED -->
-	<tr>
-		<td class="row1" valign="top"><b class="genmed">{L_DELETE_POST}{L_COLON}</b></td>
-		<td class="row2">
-			<table cellpadding="1">
-				<tr>
-					<td><input type="checkbox" class="radio" name="delete" /></td>
-					<td class="gen">{L_DELETE_POST_WARN}</td>
-				</tr>
-				<!-- IF S_SOFTDELETE_ALLOWED and S_DELETE_ALLOWED -->
-					<tr>
-						<td><input type="checkbox" class="radio" name="delete_permanent" /></td>
-						<td class="gen">{L_DELETE_POST_PERMANENTLY}</td>
-					</tr>
-				<!-- ENDIF -->
-			</table>
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}{L_COLON}</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td>
-		<td class="row2"><input class="post" type="number" min="0" max="999" name="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_EDIT_REASON -->
-	<tr>
-		<td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}{L_COLON}</b></td>
-		<td class="row2"><input class="post" type="text" name="edit_reason" size="50" value="{EDIT_REASON}" /></td>
-	</tr>
-<!-- ENDIF -->
-
-		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
-		<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
-		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
-		<!-- ENDIF -->
-
-
-<!-- IF S_SHOW_ATTACH_BOX or S_SHOW_POLL_BOX -->
-	<tr>
-		<td class="cat" colspan="2" align="center">
-			<input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" />
-			&nbsp; <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />
-			<!-- IF S_SAVE_ALLOWED -->&nbsp; <input class="btnlite" type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE_DRAFT}" /><!-- ENDIF -->
-			<!-- IF S_HAS_DRAFTS -->&nbsp; <input class="btnlite" type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD_DRAFT}" /><!-- ENDIF -->
-			&nbsp; <input class="btnlite" type="submit" accesskey="c" tabindex="9" name="cancel" value="{L_CANCEL}" />
-		</td>
-	</tr>
-
-	<!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF -->
-
-	<!-- IF S_SHOW_POLL_BOX -->
-		<!-- INCLUDE posting_poll_body.html -->
-	<!-- ELSEIF S_POLL_DELETE -->
-		<tr>
-			<td class="row1"><span class="genmed"><b>{L_POLL_DELETE}{L_COLON}</b></span></td>
-			<td class="row2"><input type="checkbox" class="radio" name="poll_delete" /></td>
-		</tr>
-	<!-- ENDIF -->
-<!-- ENDIF -->
-
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}
-		<input class="btnlite" type="submit" tabindex="10" name="preview" value="{L_PREVIEW}" />
-		&nbsp; <input class="btnmain" type="submit" accesskey="s" tabindex="11" name="post" value="{L_SUBMIT}" />
-		<!-- IF not S_SHOW_ATTACH_BOX and not S_SHOW_POLL_BOX -->
-			<!-- IF S_SAVE_ALLOWED -->&nbsp; <input class="btnlite" type="submit" accesskey="k" tabindex="12" name="save" value="{L_SAVE_DRAFT}" /><!-- ENDIF -->
-			<!-- IF S_HAS_DRAFTS -->&nbsp; <input class="btnlite" type="submit" accesskey="d" tabindex="13" name="load" value="{L_LOAD_DRAFT}" /><!-- ENDIF -->
-		<!-- ENDIF -->
-		&nbsp; <input class="btnlite" type="submit" accesskey="c" tabindex="14" name="cancel" value="{L_CANCEL}" />
-	</td>
-</tr>
-</table>
-<!-- IF not S_PRIVMSGS -->
-	{S_FORM_TOKEN}
-	</form>
-<!-- ENDIF -->
-<br clear="all" />
-
-<!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
-<!-- IF S_DISPLAY_HISTORY --><!-- INCLUDE ucp_pm_history.html --><!-- ENDIF -->
-
-<!-- IF S_PRIVMSGS -->
-	<!-- INCLUDE ucp_footer.html -->
-<!-- ELSE -->
-
-	<!-- INCLUDE breadcrumbs.html -->
-
-
-	<!-- IF S_DISPLAY_ONLINE_LIST -->
-		<br clear="all" />
-
-		<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td>
-		</tr>
-		<tr>
-			<td class="row1"><span class="gensmall">{LOGGED_IN_USER_LIST}</span></td>
-		</tr>
-		</table>
-	<!-- ENDIF -->
-
-	<br clear="all" />
-
-	<table width="100%" cellspacing="1">
-	<tr>
-		<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></td>
-	</tr>
-	</table>
-
-	<!-- INCLUDE overall_footer.html -->
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
deleted file mode 100644
index d1c0f79a16..0000000000
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
-	<td colspan="2">
-		<script type="text/javascript">
-		// <![CDATA[
-		
-		// Define the bbCode tags
-		var bbcode = new Array();
-		var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
-		var imageTag = false;
-		
-		// Helpline messages
-		var help_line = {
-			b: '{LA_BBCODE_B_HELP}',
-			i: '{LA_BBCODE_I_HELP}',
-			u: '{LA_BBCODE_U_HELP}',
-			q: '{LA_BBCODE_Q_HELP}',
-			c: '{LA_BBCODE_C_HELP}',
-			l: '{LA_BBCODE_L_HELP}',
-			e: '{LA_BBCODE_LISTITEM_HELP}',
-			o: '{LA_BBCODE_O_HELP}',
-			p: '{LA_BBCODE_P_HELP}',
-			w: '{LA_BBCODE_W_HELP}',
-			a: '{LA_BBCODE_A_HELP}',
-			s: '{LA_BBCODE_S_HELP}',
-			f: '{LA_BBCODE_F_HELP}',
-			y: '{LA_BBCODE_Y_HELP}',
-			d: '{LA_BBCODE_D_HELP}',
-			tip: '{L_STYLES_TIP}'
-			<!-- BEGIN custom_tags -->
-				,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
-			<!-- END custom_tags -->
-		}
-
-		// ]]>
-		</script>
-		<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
-
-<!-- IF S_BBCODE_ALLOWED -->
-	<!-- EVENT posting_editor_buttons_before -->
-	<div id="core-bbcode-buttons">
-		<input type="button" class="btnbbcode bbcode-b" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
-		<input type="button" class="btnbbcode bbcode-i" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
-		<input type="button" class="btnbbcode bbcode-u" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
-		<!-- IF S_BBCODE_QUOTE -->
-			<input type="button" class="btnbbcode bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
-		<!-- ENDIF -->
-		<input type="button" class="btnbbcode bbcode-code" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
-		<input type="button" class="btnbbcode bbcode-list" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
-		<input type="button" class="btnbbcode bbcode-list-" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-		<input type="button" class="btnbbcode bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />				
-		<!-- IF S_BBCODE_IMG -->
-			<input type="button" class="btnbbcode bbcode-img" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
-		<!-- ENDIF -->
-		<!-- IF S_LINKS_ALLOWED -->
-			<input type="button" class="btnbbcode bbcode-url" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
-		<!-- ENDIF -->
-		<!-- IF S_BBCODE_FLASH -->
-			<input type="button" class="btnbbcode bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
-		<!-- ENDIF -->
-		<span class="genmed nowrap">{L_FONT_SIZE}{L_COLON} <select class="gensmall bbcode-size" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
-			<option value="50">{L_FONT_TINY}</option>
-			<option value="85">{L_FONT_SMALL}</option>
-			<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-			<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
-				<option value="150">{L_FONT_LARGE}</option>
-				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-					<option value="200">{L_FONT_HUGE}</option>
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-		</select></span>
-	</div>
-	<!-- EVENT posting_editor_buttons_after -->
-<!-- ENDIF -->
-	</td>
-</tr>
-<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
-	<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
-		<td colspan="2">
-		<div id="custom-bbcode-buttons">
-		<!-- BEGIN custom_tags -->
-			<input type="button" class="btnbbcode bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
-		<!-- END custom_tags -->
-		</div>
-		</td>
-	</tr>
-<!-- ENDIF -->
-<!-- IF S_BBCODE_ALLOWED -->
-<tr>
-	<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td>
-	<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
-		<td class="genmed" align="center">{L_FONT_COLOR}</td>
-	<!-- ENDIF -->
-</tr>
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_poll_body.html b/phpBB/styles/subsilver2/template/posting_poll_body.html
deleted file mode 100644
index 67996eaf33..0000000000
--- a/phpBB/styles/subsilver2/template/posting_poll_body.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<tr>
-	<th colspan="2">{L_ADD_POLL}</th>
-</tr>
-<tr>
-	<td class="row3" colspan="2"><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_POLL_QUESTION}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="poll_title" size="50" maxlength="255" value="{POLL_TITLE}" /></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_POLL_OPTIONS}{L_COLON}</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td>
-	<td class="row2"><textarea style="width:450px" name="poll_option_text" rows="5" cols="35">{POLL_OPTIONS}</textarea></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}{L_COLON}</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td>
-	<td class="row2"><input class="post" type="number" min="1" max="999" name="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" /></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_POLL_FOR}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="number" min="0" max="999" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_POLL_FOR_EXPLAIN}</span></td>
-</tr>
-<!-- IF S_POLL_VOTE_CHANGE -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_POLL_VOTE_CHANGE}{L_COLON}</b><br /><span class="gensmall">{L_POLL_VOTE_CHANGE_EXPLAIN}</span></td>
-		<td class="row2"><input type="checkbox" class="radio" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_POLL_DELETE -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_POLL_DELETE}{L_COLON}</b></td>
-		<td class="row2"><input type="checkbox" class="radio" name="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /></td>
-	</tr>
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_preview.html b/phpBB/styles/subsilver2/template/posting_preview.html
deleted file mode 100644
index b0dbef6a5a..0000000000
--- a/phpBB/styles/subsilver2/template/posting_preview.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr> 
-	<th>{L_PREVIEW}</th>
-</tr>
-<tr> 
-	<td class="row1">{MINI_POST_IMG}<span class="postdetails">{L_POSTED}{L_COLON} {POST_DATE} &nbsp;&nbsp;&nbsp; {L_POST_SUBJECT}{L_COLON} {PREVIEW_SUBJECT}</span></td>
-</tr>
-<!-- IF S_HAS_POLL_OPTIONS -->
-	<tr>
-		<td class="row2" colspan="2" align="center"><br clear="all" />
-			<table cellspacing="0" cellpadding="4" border="0" align="center">
-			<tr>
-				<td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
-			</tr>
-			<tr>
-				<td align="center">
-					<table cellspacing="0" cellpadding="2" border="0">
-					<!-- BEGIN poll_option -->
-						<tr>
-							<td>
-							<!-- IF S_IS_MULTI_CHOICE -->
-								<input type="checkbox" class="radio" name="vote_id" value="" />
-							<!-- ELSE -->
-								<input type="radio" class="radio" name="vote_id" value="" />
-							<!-- ENDIF -->
-							</td>
-							<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
-						</tr>
-					<!-- END poll_option -->
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td align="center"><span class="gensmall">{L_MAX_VOTES}</span></td>
-			</tr>
-			</table>
-		</td>
-	</tr>
-<!-- ENDIF -->
-<tr> 
-	<td class="row1">
-		<table width="100%" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td><div class="postbody">{PREVIEW_MESSAGE}</div>
-			<!-- IF .attachment -->
-				<br clear="all" /><br />
-
-				<table class="tablebg" width="100%" cellspacing="1">
-				<tr>
-					<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>
-				</tr>
-				<!-- BEGIN attachment -->
-					<tr>
-						<td class="row2">{attachment.DISPLAY_ATTACHMENT}</td>
-					</tr>
-				<!-- END attachment -->
-				</table>
-			<!-- ENDIF -->
-			<!-- IF PREVIEW_SIGNATURE --><span class="postbody"><br />_________________<br />{PREVIEW_SIGNATURE}</span><!-- ENDIF --></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-<tr>
-	<td class="spacer"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-</tr>
-</table>
-
-<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/posting_progress_bar.html b/phpBB/styles/subsilver2/template/posting_progress_bar.html
deleted file mode 100644
index f9decc506b..0000000000
--- a/phpBB/styles/subsilver2/template/posting_progress_bar.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-<script type="text/javascript">
-// <![CDATA[
-	/**
-	* Close upload popup
-	*/
-	function close_popup()
-	{
-		if (opener != null)
-		{
-			if (opener.close_waitscreen != null)
-			{
-				if (opener.close_waitscreen == 1)
-				{
-					opener.close_waitscreen = 0;
-					self.close();
-					return 0;
-				}
-			}
-		}
-		setTimeout("close_popup()", 1000);
-		return 0;
-	}
-// ]]>
-</script>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="10">
-<tr>
-	<td>
-		<table width="100%" border="0" cellspacing="1" cellpadding="4">
-		<tr> 
-			<td valign="top" class="row1" align="center"><br /><span class="genmed">{L_UPLOAD_IN_PROGRESS}</span><br /><br /><div style="align:center">{PROGRESS_BAR}</div><br /><br /><span class="genmed"><a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></span><br /><br /></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<script type="text/javascript">
-// <![CDATA[
-	close_popup();	
-// ]]>
-</script>
-<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/posting_review.html b/phpBB/styles/subsilver2/template/posting_review.html
deleted file mode 100644
index c118499564..0000000000
--- a/phpBB/styles/subsilver2/template/posting_review.html
+++ /dev/null
@@ -1,99 +0,0 @@
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th align="center">{L_POST_REVIEW}</th>
-</tr>
-<tr>
-	<td class="row1" align="center"><span class="gen">{L_POST_REVIEW_EXPLAIN}</span></td>
-</tr>
-<tr>
-	<td class="spacer"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-</tr>
-<tr>
-	<td class="row1">
-		<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<th width="22%">{L_AUTHOR}</th>
-			<th>{L_MESSAGE}</th>
-		</tr>
-		<!-- BEGIN post_review_row -->
-
-			<!-- IF post_review_row.S_ROW_COUNT is even -->	<tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<!-- IF post_review_row.S_IGNORE_POST -->
-				<td colspan="2">{post_review_row.L_IGNORE_POST}</td>
-				<!-- ELSE -->
-
-				<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{post_review_row.POST_ID}" class="anchor"></a>
-					<table width="150" cellspacing="0" cellpadding="4" border="0">
-					<tr>
-						<td align="center"><b class="postauthor">{post_review_row.POST_AUTHOR_FULL}</b></td>
-					</tr>
-					</table>
-				</td>
-				<td width="100%">
-					<table width="100%" cellspacing="0" cellpadding="0" border="0">
-					<tr>
-						<td>&nbsp;</td>
-						<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}{L_COLON}</b>&nbsp;</td>
-						<td class="gensmall" width="100%" valign="middle">{post_review_row.POST_SUBJECT}</td>
-						<td>&nbsp;</td>
-					</tr>
-					</table>
-				</td>
-			</tr>
-
-			<!-- IF post_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-				<td valign="top">
-					<table width="100%" cellspacing="0">
-					<tr>
-						<td valign="top">
-							<table width="100%" cellspacing="0" cellpadding="2">
-							<tr>
-								<td><div class="postbody">{post_review_row.MESSAGE}</div>
-
-								<!-- IF post_review_row.S_HAS_ATTACHMENTS -->
-									<br clear="all" /><br />
-
-									<table class="tablebg" width="100%" cellspacing="1">
-									<tr>
-										<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>
-									</tr>
-									<!-- BEGIN attachment -->
-										<tr>
-											<!-- IF post_review_row.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{post_review_row.attachment.DISPLAY_ATTACHMENT}</td>
-										</tr>
-									<!-- END attachment -->
-									</table>
-								<!-- ENDIF -->
-								
-								</td>
-							</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table width="100%" cellspacing="0" cellpadding="0" border="0">
-							<tr valign="middle">
-								<td width="100%">&nbsp;</td>
-								<td width="10" nowrap="nowrap"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}" class="imageset">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --></td>
-								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}{L_COLON}</b> {post_review_row.POST_DATE}</td>
-							</tr>
-							</table>
-						</td>
-					</tr>
-					</table>
-				</td>
-			<!-- ENDIF -->
-			</tr>
-			<tr>
-				<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-			</tr>
-		<!-- END post_review_row -->
-		</table>
-	</td>
-</tr>
-</table>
-
-<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html
deleted file mode 100644
index 7087414fa8..0000000000
--- a/phpBB/styles/subsilver2/template/posting_smilies.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	var form_name = opener.form_name;
-	var text_name = opener.text_name;
-// ]]>
-</script>
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
-
-<table width="100%" cellspacing="1" cellpadding="4" border="0">
-<tr>
-	<td>
-		<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0">
-		<tr>
-			<th>{L_SMILIES}</th>
-		</tr>
-		<tr>
-			<td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a> <!-- END smiley --><br />
-			<!-- IF .pagination -->
-				<b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE_CLICK}">{L_GOTO_PAGE}</a> 
-				<!-- BEGIN pagination -->
-					<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
-					<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>
-					<!-- ELSEIF pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
-					<!-- ELSEIF pagination.S_IS_NEXT --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
-					<!-- ELSE --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
-					<!-- ENDIF -->
-				<!-- END pagination -->
-			<br />	
-			<!-- ENDIF -->
-			<a class="nav" href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html
deleted file mode 100644
index 20976861fc..0000000000
--- a/phpBB/styles/subsilver2/template/posting_topic_review.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<script type="text/javascript">
-// <![CDATA[
-	bbcodeEnabled = {S_BBCODE_ALLOWED};
-// ]]>
-</script>
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th align="center">{L_TOPIC_REVIEW} - {TOPIC_TITLE}</th>
-</tr>
-<tr>
-	<td class="row1"><div style="overflow: auto; width: 100%; height: 300px;">
-
-		<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<th width="22%">{L_AUTHOR}</th>
-			<th>{L_MESSAGE}</th>
-		</tr>
-		<!-- BEGIN topic_review_row -->
-
-			<!-- IF topic_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-				<!-- IF topic_review_row.S_IGNORE_POST -->
-				<td colspan="2">{topic_review_row.L_IGNORE_POST}</td>
-				<!-- ELSE -->
-				<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{topic_review_row.POST_ID}" class="anchor"></a>
-					<table width="150" cellspacing="0">
-					<tr>
-						<td align="center"><b class="postauthor"<!-- IF topic_review_row.POST_AUTHOR_COLOUR --> style="color: {topic_review_row.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{topic_review_row.POST_AUTHOR}</b></td>
-					</tr>
-					</table>
-				</td>
-				<td width="100%">
-					<table width="100%" cellspacing="0">
-					<tr>
-						<td>&nbsp;</td>
-						<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}{L_COLON}</b>&nbsp;</td>
-						<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>
-						<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="#" onclick="addquote({topic_review_row.POST_ID},'{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}'); return false;" class="imageset">{QUOTE_IMG}</a><!-- ENDIF --></td>
-					</tr>
-					</table>
-				</td>
-			</tr>
-
-			<!-- IF topic_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-				<td valign="top">
-					<table width="100%" cellspacing="0">
-					<tr>
-						<td valign="top">
-							<table width="100%" cellspacing="0" cellpadding="2">
-							<tr>
-								<td>
-									<!-- IF topic_review_row.POST_ID == REPORTED_POST_ID -->
-									<table width="100%" cellspacing="0">
-										<tr>
-											<span class="postreported">{REPORTED_IMG}</span>
-										</tr>
-									</table>
-									<!-- ENDIF -->
-									<div class="postbody">{topic_review_row.MESSAGE}</div>
-
-									<!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
-										<br clear="all" /><br />
-
-										<table class="tablebg" width="100%" cellspacing="1">
-										<tr>
-											<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>
-										</tr>
-										<!-- BEGIN attachment -->
-											<tr>
-												<!-- IF topic_review_row.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{topic_review_row.attachment.DISPLAY_ATTACHMENT}</td>
-											</tr>
-										<!-- END attachment -->
-										</table>
-									<!-- ENDIF -->
-
-									<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
-										<div id="message_{topic_review_row.POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
-									<!-- ENDIF -->
-								</td>
-							</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table width="100%" cellspacing="0">
-							<tr valign="middle">
-								<td width="100%" align="{S_CONTENT_FLOW_BEGIN}"><span class="gensmall"><!-- IF topic_review_row.U_MCP_DETAILS -->[ <a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></span></td>
-								<td width="10" nowrap="nowrap"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}" class="imageset">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --></td>
-								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}{L_COLON}</b> {topic_review_row.POST_DATE}</td>
-							</tr>
-							</table>
-						</td>
-					</tr>
-					</table>
-				</td>
-				<!-- ENDIF -->
-			</tr>
-			<tr>
-				<td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-			</tr>
-		<!-- END topic_review_row -->
-		</table>
-	</div></td>
-</tr>
-</table>
-
-<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/profilefields/bool.html b/phpBB/styles/subsilver2/template/profilefields/bool.html
deleted file mode 100644
index f57bd4e4da..0000000000
--- a/phpBB/styles/subsilver2/template/profilefields/bool.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- BEGIN bool -->
-	<!-- IF bool.FIELD_LENGTH eq 1 -->
-		<!-- BEGIN options --><input type="radio" class="radio" name="{bool.FIELD_IDENT}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /><span class="genmed">{bool.options.VALUE}</span>&nbsp; &nbsp;<!-- END options -->
-	<!-- ELSE -->
-		<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" value="1"<!-- IF bool.FIELD_VALUE eq 1 --> checked="checked"<!-- ENDIF --> />
-	<!-- ENDIF -->
-<!-- END bool -->
diff --git a/phpBB/styles/subsilver2/template/profilefields/date.html b/phpBB/styles/subsilver2/template/profilefields/date.html
deleted file mode 100644
index e2da2463a5..0000000000
--- a/phpBB/styles/subsilver2/template/profilefields/date.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- BEGIN date -->
-<span class="genmed">{L_DAY}{L_COLON}</span> <select name="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
-<span class="genmed">{L_MONTH}{L_COLON}</span> <select name="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
-<span class="genmed">{L_YEAR}{L_COLON}</span> <select name="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
-<!-- END date -->
diff --git a/phpBB/styles/subsilver2/template/profilefields/dropdown.html b/phpBB/styles/subsilver2/template/profilefields/dropdown.html
deleted file mode 100644
index 16242da895..0000000000
--- a/phpBB/styles/subsilver2/template/profilefields/dropdown.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- BEGIN dropdown -->
-<select name="{dropdown.FIELD_IDENT}">
-	<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
-</select>
-<!-- END dropdown -->
diff --git a/phpBB/styles/subsilver2/template/profilefields/int.html b/phpBB/styles/subsilver2/template/profilefields/int.html
deleted file mode 100644
index 067921e320..0000000000
--- a/phpBB/styles/subsilver2/template/profilefields/int.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- BEGIN int -->
-	<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="post" name="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
-<!-- END int -->
diff --git a/phpBB/styles/subsilver2/template/profilefields/string.html b/phpBB/styles/subsilver2/template/profilefields/string.html
deleted file mode 100644
index 5a98562e2a..0000000000
--- a/phpBB/styles/subsilver2/template/profilefields/string.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- BEGIN string -->
-	<input type="text" class="post" name="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
-<!-- END string -->
diff --git a/phpBB/styles/subsilver2/template/profilefields/text.html b/phpBB/styles/subsilver2/template/profilefields/text.html
deleted file mode 100644
index df2474ad3e..0000000000
--- a/phpBB/styles/subsilver2/template/profilefields/text.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- BEGIN text -->
-<textarea name="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}">{text.FIELD_VALUE}</textarea>
-<!-- END text -->
diff --git a/phpBB/styles/subsilver2/template/profilefields/url.html b/phpBB/styles/subsilver2/template/profilefields/url.html
deleted file mode 100644
index 42805aa98d..0000000000
--- a/phpBB/styles/subsilver2/template/profilefields/url.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- BEGIN url -->
-	<input type="url" class="post" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}" />
-<!-- END url -->
diff --git a/phpBB/styles/subsilver2/template/quickreply_editor.html b/phpBB/styles/subsilver2/template/quickreply_editor.html
deleted file mode 100644
index 5afc723f48..0000000000
--- a/phpBB/styles/subsilver2/template/quickreply_editor.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<form method="post" action="{U_QR_ACTION}">
-<!-- EVENT quickreply_editor_panel_before -->
-	<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<th align="center" colspan="2">{L_QUICKREPLY}</th>
-		</tr>
-		<tr>
-			<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>
-			<td  class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" /></td>
-		</tr>
-		<!-- EVENT quickreply_editor_message_before -->
-		<tr>
-			<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}{L_COLON}</b></td>
-			<td class="row2" valign="top" align="left" width="78%"><textarea name="message" rows="7" cols="76" tabindex="3"  style="width: 700px; height: 130px; min-width: 98%; max-width: 98%;"></textarea> </td>
-		</tr>
-		<!-- EVENT quickreply_editor_message_after -->
-		<tr>
-			<td class="cat" colspan="2" align="center">
-				<input class="btnlite" type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" />&nbsp;
-				<input class="btnmain" type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" />
-
-				{S_FORM_TOKEN}
-				{QR_HIDDEN_FIELDS}
-			</td>
-		</tr>
-	</table>
-<!-- EVENT quickreply_editor_panel_after -->
-</form>
-<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/report_body.html b/phpBB/styles/subsilver2/template/report_body.html
deleted file mode 100644
index 906a957ef4..0000000000
--- a/phpBB/styles/subsilver2/template/report_body.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form method="post" id="report" action="{S_REPORT_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2"><!-- IF S_REPORT_POST -->{L_REPORT_POST}<!-- ELSE -->{L_REPORT_MESSAGE}<!-- ENDIF --></th>
-</tr>
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row3" colspan="2"><span class="gensmall"><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></span></td>
-</tr>
-<tr>
-	<td class="row1" width="22%"><b class="gen">{L_REASON}{L_COLON}</b></td>
-	<td class="row2" width="78%"><select name="reason_id">
-		<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.TITLE} &raquo; {reason.DESCRIPTION}</option><!-- END reason -->
-	</select></td>
-</tr>
-<!-- IF S_CAN_NOTIFY -->
-	<tr>
-		<td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}{L_COLON}</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td>
-		<td class="row2"><span class="gen"><input type="radio" class="radio" name="notify" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="notify" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}{L_COLON}</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td>
-	<td class="row2"><textarea class="post" name="report_text" rows="10" cols="50">{REPORT_TEXT}</textarea></td>
-</tr>
-<!-- IF CAPTCHA_TEMPLATE -->
-			<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
-<!-- ENDIF -->	
-<tr>
-	<td class="cat" colspan="2" align="center"><input type="submit" name="submit" class="btnmain" value="{L_SUBMIT}" />&nbsp;<input type="submit" name="cancel" class="btnlite" value="{L_CANCEL}" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<div style="float: {S_CONTENT_FLOW_END};"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/search_body.html b/phpBB/styles/subsilver2/template/search_body.html
deleted file mode 100644
index c0199fbae8..0000000000
--- a/phpBB/styles/subsilver2/template/search_body.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="pagecontent">
-
-	<form method="get" action="{S_SEARCH_ACTION}">
-	
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="4">{L_SEARCH_QUERY}</th>
-	</tr>
-	<tr>
-		<td class="row1" colspan="2" width="50%"><b class="genmed">{L_SEARCH_KEYWORDS}{L_COLON} </b><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td>
-		<td class="row2" colspan="2" valign="top"><input type="text" style="width: 300px" class="post" name="keywords" size="30" /><br /><input type="radio" class="radio" name="terms" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_ALL_TERMS}</span><br /><input type="radio" class="radio" name="terms" value="any" /> <span class="genmed">{L_SEARCH_ANY_TERMS}</span></td>
-	</tr>
-	<tr>
-		<td class="row1" colspan="2"><b class="genmed">{L_SEARCH_AUTHOR}{L_COLON}</b><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td>
-		<td class="row2" colspan="2" valign="middle"><input type="text" style="width: 300px" class="post" name="author" size="30" /></td>
-	</tr>
-	<tr>
-		<td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}{L_COLON} </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td>
-		<td class="row2" colspan="2"><select name="fid[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td>
-	</tr>
-	<tr>
-		<th colspan="4">{L_SEARCH_OPTIONS}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_SUBFORUMS}{L_COLON} </b></td>
-		<td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sc" value="1" checked="checked" /> <span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="sc" value="0" /> <span class="genmed">{L_NO}</span></td>
-		<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}{L_COLON} </b></td>
-		<td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sf" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" class="radio" name="sf" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="firstpost" /> <span class="genmed">{L_SEARCH_FIRST_POST}</span></td>
-	</tr>
-	<tr>
-		<td class="row1"><b class="genmed">{L_RESULT_SORT}{L_COLON} </b></td>
-		<td class="row2" nowrap="nowrap">{S_SELECT_SORT_KEY}<br /><input type="radio" class="radio" name="sd" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" class="radio" name="sd" value="d" checked="checked" /> <span class="genmed">{L_SORT_DESCENDING}</span></td>
-		<td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}{L_COLON} </b></td>
-		<td class="row2" nowrap="nowrap"><input type="radio" class="radio" name="sr" value="posts" checked="checked" /> <span class="genmed">{L_POSTS}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="sr" value="topics" /> <span class="genmed">{L_TOPICS}</span></td>
-	</tr>
-	<tr>
-		<td class="row1" width="25%"><b class="genmed">{L_RESULT_DAYS}{L_COLON} </b></td>
-		<td class="row2" width="25%" nowrap="nowrap">{S_SELECT_SORT_DAYS}</td>
-		<td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}{L_COLON} </b></td>
-		<td class="row2" nowrap="nowrap"><select name="ch">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" name="submit" type="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
-	</tr>
-	</table>
-	
-	</form>
-
-	<br clear="all" />
-
-	<!-- IF .recentsearch -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="2">{L_RECENT_SEARCHES}</th>
-	</tr>
-	<!-- BEGIN recentsearch -->
-		<!-- IF recentsearch.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF -->
-
-			<td class="genmed" style="padding: 4px;" width="70%"><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td>
-			<td class="genmed" style="padding: 4px;" width="30%" align="center">{recentsearch.TIME}</td>
-		</tr>
-	<!-- END recentsearch -->
-	</table>
-
-	<br clear="all" />
-	<!-- ENDIF -->
-
-	</div>
-
-	<!-- INCLUDE breadcrumbs.html -->
-
-	<br clear="all" />
-
-	<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<script type="text/javascript">
-// <![CDATA[
-	(function()
-	{
-		var elements = document.getElementsByName("keywords");
-		for (var i = 0; i < elements.length; ++i)
-		{
-			if (elements[i].tagName.toLowerCase() == 'input')
-			{
-				elements[i].focus();
-				break;
-			}
-		}
-	})();
-// ]]>
-</script>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html
deleted file mode 100644
index 23d0b3a146..0000000000
--- a/phpBB/styles/subsilver2/template/search_results.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form method="post" action="{S_SEARCH_ACTION}">
-
-<table width="100%" cellspacing="1">
-<tr>
-	<td colspan="2"><span class="titles"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --></span><br /></td>
-</tr>
-<tr>
-	<td class="genmed"><!-- IF SEARCH_TOPIC -->{L_SEARCHED_TOPIC}{L_COLON} <a href="{U_SEARCH_TOPIC}"><b>{SEARCH_TOPIC}</b></a><br /><!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_SEARCHED_FOR}{L_COLON} <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- ENDIF --><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}{L_COLON} <b>{IGNORED_WORDS}</b><!-- ENDIF --></td>
-	<td align="{S_CONTENT_FLOW_END}"><!-- IF SEARCH_IN_RESULTS --><span class="genmed">{L_SEARCH_IN_RESULTS}{L_COLON} </span><input class="post" type="text" name="add_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /><!-- ENDIF --></td>
-</tr>
-</table>
-
-<br clear="all" />
-
-<!-- IF S_SHOW_TOPICS -->
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th width="4%" nowrap="nowrap">&nbsp;</th>
-		<th colspan="2" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_AUTHOR}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
-	</tr>
-	<!-- BEGIN searchresults -->
-		<!-- EVENT search_results_topic_before -->
-		<tr valign="middle">
-			<td class="row1" width="25" align="center">{searchresults.TOPIC_FOLDER_IMG}</td>
-			<td class="row1" width="25" align="center">
-			<!-- IF searchresults.TOPIC_ICON_IMG -->
-				<img src="{T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}" width="{searchresults.TOPIC_ICON_IMG_WIDTH}" height="{searchresults.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" />
-			<!-- ENDIF -->
-			</td>
-			<td class="row1">
-				<!-- EVENT topiclist_row_prepend -->
-				<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
-				{searchresults.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
-				<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
-					<a href="{searchresults.U_MCP_QUEUE}" class="imageset">{searchresults.UNAPPROVED_IMG}</a>&nbsp;
-				<!-- ENDIF -->
-				<!-- IF searchresults.S_TOPIC_DELETED -->
-					<a href="{searchresults.U_MCP_QUEUE}" class="imageset">{DELETED_IMG}</a>&nbsp;
-				<!-- ENDIF -->
-				<!-- IF searchresults.S_TOPIC_REPORTED -->
-					<a href="{searchresults.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
-				<!-- ENDIF -->
-				<!-- IF .searchresults.pagination -->
-					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON} 
-					<!-- BEGIN pagination -->
-						<!-- IF searchresults.pagination.S_IS_PREV -->
-						<!-- ELSEIF searchresults.pagination.S_IS_CURRENT --><strong>{searchresults.pagination.PAGE_NUMBER}</strong>
-						<!-- ELSEIF searchresults.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
-						<!-- ELSEIF searchresults.pagination.S_IS_NEXT -->
-						<!-- ELSE --><a href="{searchresults.pagination.PAGE_URL}">{searchresults.pagination.PAGE_NUMBER}</a>
-						<!-- ENDIF -->
-					<!-- END pagination -->
-					] </p>
-				<!-- ENDIF -->
-				<p class="gensmall">{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p>
-				<!-- EVENT topiclist_row_append -->
-			</td>
-			<td class="row2" width="100" align="center"><p class="topicauthor">{searchresults.TOPIC_AUTHOR_FULL}</p></td>
-			<td class="row1" width="50" align="center"><p class="topicdetails">{searchresults.TOPIC_REPLIES}</p></td>
-			<td class="row2" width="50" align="center"><p class="topicdetails">{searchresults.TOPIC_VIEWS}</p></td>
-			<td class="row1" width="120" align="center">
-				<p class="topicdetails">{searchresults.LAST_POST_TIME}</p>
-				<p class="topicdetails">{searchresults.LAST_POST_AUTHOR_FULL}
-					<a href="{searchresults.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a>
-				</p>
-			</td>
-		</tr>
-		<!-- EVENT search_results_topic_after -->
-	<!-- BEGINELSE -->
-		<tr valign="middle">
-			<td colspan="7" class="row3" align="center">{L_NO_SEARCH_RESULTS}</td>
-		</tr>
-	<!-- END searchresults -->
-	<tr>
-		<td class="cat" colspan="7" valign="middle" align="center"><!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY --><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY -->&nbsp;<span class="gensmall">{L_SORT_BY}{L_COLON}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- ENDIF -->&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /><!-- ENDIF --></td>
-	</tr>
-	</table>
-
-<!-- ELSE -->
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th width="150" nowrap="nowrap">{L_AUTHOR}</th>
-		<th width="100%" nowrap="nowrap">{L_MESSAGE}</th>
-	</tr>
-
-	<!-- BEGIN searchresults -->
-		<tr class="row2">
-		<!-- EVENT search_results_post_before -->
-		<!-- IF searchresults.S_IGNORE_POST -->
-			<td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td>
-		<!-- ELSE -->
-				<td colspan="2" height="25"><p class="topictitle"><a name="p{searchresults.POST_ID}" id="p{searchresults.POST_ID}" class="anchor"></a>&nbsp;{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> &nbsp; {L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a> </p></td>
-			</tr>
-			<tr class="row1">
-				<td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POST_AUTHOR_FULL}</b></td>
-				<td height="25">
-					<table width="100%" cellspacing="0" cellpadding="0" border="0">
-					<tr>
-						<td class="gensmall">
-							<div style="float: {S_CONTENT_FLOW_BEGIN};">
-							<!-- IF searchresults.POST_SUBJECT neq "" -->
-								&nbsp;<b>{L_POST_SUBJECT}{L_COLON}</b> <a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a>
-							<!-- ELSE -->
-								[ <a href="{searchresults.U_VIEW_POST}">{L_JUMP_TO_POST}</a> ]
-							<!-- ENDIF -->
-							</div>
-							<div style="float: {S_CONTENT_FLOW_END};"><b>{L_POSTED}{L_COLON}</b> {searchresults.POST_DATE}&nbsp;</div>
-						</td>
-					</tr>
-					</table>
-				</td>
-			</tr>
-			<tr class="row1">
-				<td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}{L_COLON} <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}{L_COLON} <b>{searchresults.TOPIC_VIEWS}</b></span><br /><br /></td>
-				<td valign="top">
-					<table width="100%" cellspacing="5">
-					<tr>
-						<td class="postbody">{searchresults.MESSAGE}</td>
-					</tr>
-					</table>
-				</td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- EVENT search_results_post_after -->
-		<tr>
-			<td class="spacer" colspan="2"><img src="images/spacer.gif" height="1" alt="" /></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr valign="middle">
-			<td colspan="2" class="row3" align="center">{L_NO_SEARCH_RESULTS}</td>
-		</tr>
-	<!-- END searchresults -->
-	<tr>
-		<td class="cat" colspan="2" align="center"><!-- IF S_SELECT_SORT_KEY --><span class="gensmall">{L_SORT_BY}{L_COLON}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /><!-- ENDIF --></td>
-	</tr>
-	</table>
-<!-- ENDIF -->
-
-</form>
-
-<div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};"><span class="nav">{PAGE_NUMBER}</span> [ {SEARCH_MATCHES} ]</div>
-<div class="nav" style="float: {S_CONTENT_FLOW_END};"><!-- INCLUDE pagination.html --></div>
-
-<br clear="all" /><br />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/searchbox.html b/phpBB/styles/subsilver2/template/searchbox.html
deleted file mode 100644
index 49de299ea2..0000000000
--- a/phpBB/styles/subsilver2/template/searchbox.html
+++ /dev/null
@@ -1 +0,0 @@
-<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}{L_COLON}</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_LOCAL_HIDDEN_FIELDS}</form>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
deleted file mode 100644
index d69c56fb8c..0000000000
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-</div>
-
-<div id="wrapfooter">
-	<span class="copyright">{CREDIT_LINE}</span>
-</div>
-
-<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-
-<!-- EVENT simple_footer_after -->
-
-{$SCRIPTS}
-</body>
-</html>
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
deleted file mode 100644
index 0c3dff4a05..0000000000
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
-<head>
-<meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-{META}
-<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
-
-<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
-<link rel="stylesheet" href="{T_STYLESHEET_LANG_LINK}" type="text/css" />
-
-<!-- EVENT simple_header_head_append -->
-
-{$STYLESHEETS}
-
-<!-- EVENT simple_header_stylesheets_after -->
-
-</head>
-
-<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">
-<!-- EVENT simple_header_body_before -->
-<a name="top" class="anchor"></a>
-<div id="wrapcentre">
diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js
deleted file mode 100644
index c5829c0bb1..0000000000
--- a/phpBB/styles/subsilver2/template/timezone.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function($) { // Avoid conflicts with other libraries
-
-"use strict";
-
-$('#tz_date').change(function() {
-	phpbb.timezoneSwitchDate(false);
-});
-
-$('#tz_select_date_suggest').click(function(){
-	phpbb.timezonePreselectSelect(true);
-});
-
-$(document).ready(
-	phpbb.timezoneEnableDateSelection
-);
-
-$(document).ready(
-	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') == 'true')
-);
-
-})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
deleted file mode 100644
index 0f27719f86..0000000000
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_BOARD_TIMEZONE}{L_COLON}</b></td>
-	<td class="row2">
-		<!-- IF S_TZ_DATE_OPTIONS -->
-		<div id="tz_select_date" style="display: none;">
-			<select name="tz_date" id="tz_date" class="autowidth tz_select">
-				<option value="">{L_SELECT_CURRENT_TIME}</option>
-				{S_TZ_DATE_OPTIONS}
-			</select><br />
-			<input type="button" id="tz_select_date_suggest" class="btnlite" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
-		</div>
-		<!-- ENDIF -->
-		<select name="tz" id="timezone" class="autowidth tz_select">
-			<option value="">{L_SELECT_TIMEZONE}</option>
-			{S_TZ_OPTIONS}
-		</select>
-
-		<!-- INCLUDEJS timezone.js -->
-	</td>
-</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html
deleted file mode 100644
index fca7eb2368..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_agreement.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<!-- IF S_SHOW_COPPA or S_REGISTRATION -->
-
-<!-- IF S_LANG_OPTIONS -->
-<script type="text/javascript">
-// <![CDATA[
-	/**
-	* Change language
-	*/
-	function change_language(lang_iso)
-	{
-		document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}';
-		document.forms['register'].change_lang.value = lang_iso;
-		document.forms['register'].submit();
-	}
-
-// ]]>
-</script>
-
-	<form method="post" action="{S_UCP_ACTION}" id="register">
-		<table width="100%" cellspacing="0">
-			<tr>
-				<td class="gensmall" align="{S_CONTENT_FLOW_END}">{L_LANGUAGE}{L_COLON} <select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></td>
-			</tr>
-		</table>
-		{S_HIDDEN_FIELDS}
-	</form>
-<!-- ENDIF -->
-
-	<form method="post" action="{S_UCP_ACTION}">
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th height="25">{SITENAME} - {L_REGISTRATION}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center">
-			<table width="90%" cellspacing="2" cellpadding="2" border="0" align="center">
-			<tr>
-				<!-- IF S_SHOW_COPPA -->
-					<td class="gen" align="center"><br />{L_COPPA_BIRTHDAY}<br /><br /><a href="{U_COPPA_NO}">{L_COPPA_NO}</a> :: <a href="{U_COPPA_YES}">{L_COPPA_YES}</a><br /><br /></td>
-				<!-- ELSE -->
-					<td>
-						<!-- EVENT ucp_agreement_terms_before -->
-						<span class="genmed"><br />{L_TERMS_OF_USE}<br /><br /></span>
-						<!-- EVENT ucp_agreement_terms_after -->
-						<div align="center">
-							<input class="btnlite" type="submit" id="agreed" name="agreed" value="{L_AGREE}" /><br /><br />
-							<input class="btnlite" type="submit" name="not_agreed" value="{L_NOT_AGREE}" />
-						</div>
-					</td>
-				<!-- ENDIF -->
-			</tr>
-			</table>
-		</td>
-	</tr>
-	</table>
-	{S_HIDDEN_FIELDS}
-	{S_FORM_TOKEN}
-	</form>
-
-<!-- ELSEIF S_AGREEMENT -->
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th height="25">{SITENAME} - {AGREEMENT_TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center">
-			<table width="90%" cellspacing="2" cellpadding="2" border="0" align="center">
-			<tr>
-				<td>
-					<span class="genmed"><br />{AGREEMENT_TEXT}<br /><br /></span>
-					<div align="center">
-						<a href="{U_BACK}">{L_BACK}</a>
-					</div>
-				</td>
-			</tr>
-			</table>
-		</td>
-	</tr>
-	</table>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_attachments.html b/phpBB/styles/subsilver2/template/ucp_attachments.html
deleted file mode 100644
index 0f6101aac7..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_attachments.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<!-- IF S_ATTACHMENT_ROWS -->
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th nowrap="nowrap">#</th>
-		<th nowrap="nowrap" width="15%"><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></th>
-		<th nowrap="nowrap" width="5%"><a href="{U_SORT_POST_TIME}">{L_POST_TIME}</a></th>
-		<th nowrap="nowrap" width="5%"><a href="{U_SORT_FILESIZE}">{L_FILESIZE}</a></th>
-		<th nowrap="nowrap" width="5%"><a href="{U_SORT_DOWNLOADS}">{L_DOWNLOADS}</a></th>
-		<th width="2%" nowrap="nowrap">{L_DELETE}</th>
-	</tr>
-	<!-- IF TOTAL_ATTACHMENTS -->
-		<tr>
-			<td class="row3" colspan="6">
-				<table width="100%" cellspacing="1">
-				<tr>
-					<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-					<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_ATTACHMENTS} ]&nbsp;</td>
-					<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN attachrow -->
-		<!-- IF attachrow.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF -->
-
-		<td class="genmed" style="padding: 4px;" align="center" width="2%">&nbsp;{attachrow.ROW_NUMBER}&nbsp;</td>
-		<td style="padding: 4px;"><a class="gen" href="{attachrow.U_VIEW_ATTACHMENT}">{attachrow.FILENAME}</a><br /><span class="gensmall"><!-- IF attachrow.S_IN_MESSAGE --><b>{L_PM}{L_COLON} </b><!-- ELSE --><b>{L_TOPIC}{L_COLON} </b><!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></span></td>
-		<td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap">&nbsp;{attachrow.POST_TIME}&nbsp;</td>
-		<td class="genmed" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap">{attachrow.SIZE}</td>
-		<td class="genmed" style="padding: 4px;" align="center">{attachrow.DOWNLOAD_COUNT}</td>
-		<td style="padding: 4px;" align="center" valign="middle"><input type="checkbox" class="radio" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></td>
-	</tr>
-	<!-- END attachrow -->
-	<tr> 
-		<td class="cat" colspan="6"><div style="float: {S_CONTENT_FLOW_BEGIN};"><span class="gensmall">{L_SORT_BY}{L_COLON} </span><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select>&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_SORT}" /></div><div style="float: {S_CONTENT_FLOW_END};"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" />&nbsp;</div></td>
-	</tr>
-	</table>
-
-	<div style="float: {S_CONTENT_FLOW_END};"><b class="gensmall"><a href="#" onclick="marklist('ucp', 'attachment', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 'attachment', false); return false;">{L_UNMARK_ALL}</a></b></div>
-
-<!-- ELSE -->
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{L_TITLE}</th>
-	</tr>
-	<tr class="row1">
-		<td align="center"><b class="genmed">{L_UCP_NO_ATTACHMENTS}</b></td>
-	</tr>
-	</table>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_auth_link.html b/phpBB/styles/subsilver2/template/ucp_auth_link.html
deleted file mode 100644
index 75e3133fcf..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_auth_link.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="4">{L_UCP_AUTH_LINK_TITLE}</th>
-	</tr>
-
-	<!-- IF ERROR -->
-		<tr>
-			<td class="row1" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td>
-		</tr>
-	<!-- ENDIF -->
-
-	<!-- IF PROVIDER_TEMPLATE_FILE -->
-		<!-- INCLUDE {PROVIDER_TEMPLATE_FILE} -->
-	<!-- ENDIF -->
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
deleted file mode 100644
index 80564d207b..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- BEGIN oauth -->
-	<tr>
-		<th>{oauth.SERVICE_NAME}</th>
-	</tr>
-
-	<tr>
-		<td class="row1">
-			<form id="ucp" method="post" action="{S_UCP_ACTION}">
-				<table>
-					<!-- IF oauth.UNIQUE_ID -->
-						<tr>
-							<td class="row1">{L_UCP_AUTH_LINK_ID}{L_COLON}</td>
-							<td class="row1">{oauth.UNIQUE_ID}</td>
-						</tr>
-						<tr>
-							<td class="row1">&nbsp;</td>
-							<td class="row1"><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_UNLINK}" class="button1" /></td>
-						</tr>
-					<!-- ELSE -->
-						<tr>
-							<td class="row1">{L_UCP_AUTH_LINK_ASK}</td>
-						</tr>
-						<tr>
-							<td class="row1"><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></td>
-						</tr>
-					<!-- ENDIF -->
-				</table>
-				{oauth.HIDDEN_FIELDS}
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-			</form>
-		</td>
-	</tr>
-<!-- END oauth -->
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
deleted file mode 100644
index b8840e0aab..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></td>
-		<td class="row2">
-			<input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-			<input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
-		</td>
-	</tr>
-</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
deleted file mode 100644
index 7beddfc109..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<table class="tablebg" width="100%" cellspacing="1">
-	<!-- IF .avatar_local_cats -->
-	<tr> 
-		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="avatar_local_cat" id="category">
-			<!-- BEGIN avatar_local_cats -->
-			<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
-			<!-- END avatar_local_cats -->
-			</select>&nbsp; <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="avatar_local_go" />
-		</td>
-	</tr>
-	<tr> 
-		<td class="row1" colspan="2" align="center">
-			<table cellspacing="1" cellpadding="4" border="0">
-			<!-- BEGIN avatar_local_row -->
-			<tr> 
-				<!-- BEGIN avatar_local_col -->
-					<td class="row1" align="center"><img src="{avatar_local_col.avatar_local_col.AVATAR_IMAGE}" alt="{avatar_local_col.avatar_local_col.AVATAR_NAME}" title="{avatar_local_col.avatar_local_col.AVATAR_NAME}" /></td>
-				<!-- END avatar_local_col -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_local_option -->
-					<td class="row2" align="center"><input type="radio" class="radio" name="avatar_local_file" value="{avatar_local_col.avatar_local_option.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_local_option -->
-			</tr>
-			<!-- BEGINELSE -->
-			<tr>
-				<td class="row1" colspan="2">{L_NO_AVATAR_CATEGORY}</td>
-			</tr>
-			<!-- END avatar_local_col -->
-			</table>
-		</td>
-	</tr>
-	<!-- ELSE -->
-	<tr>
-		<td class="row1" colspan="2"><strong>{L_NO_AVATARS}</strong></td>
-	</tr>
-	<!-- ENDIF -->
-</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
deleted file mode 100644
index 50ebb9b93d..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="avatar_remote_url" size="40" value="{AVATAR_REMOTE_URL}" /></td>
-	</tr>
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" /> <span class="gen">{L_PIXEL} &times; </span> <input class="post" type="text" name="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" /> <span class="gen">{L_PIXEL}</span></td>
-	</tr>
-</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html
deleted file mode 100644
index 6b813baeaa..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}{L_COLON} </b></td>
-		<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="avatar_upload_file" /></td>
-	</tr>
-<!-- IF S_UPLOAD_AVATAR_URL -->
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}{L_COLON} </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="avatar_upload_url" size="40" value="" /></td>
-	</tr>
-<!-- ENDIF -->
-</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_footer.html b/phpBB/styles/subsilver2/template/ucp_footer.html
deleted file mode 100644
index 57adb2da97..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_footer.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	<!-- IF not S_PRIVMSGS or S_SHOW_DRAFTS -->	{S_FORM_TOKEN}</form><!-- ENDIF --></td>
-</tr>
-</table>
-<!-- IF (S_SHOW_PM_BOX or S_EDIT_POST) and S_POST_ACTION -->{S_FORM_TOKEN}</form><!-- ENDIF -->
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
deleted file mode 100644
index 55c1c20528..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<!-- IF S_EDIT -->
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="2">{L_USERGROUPS}</th>
-	</tr>
-	<tr>
-		<td class="row1" colspan="2"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
-	</tr>
-
-	<tr>
-		<th colspan="2">{L_GROUP_DETAILS}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}{L_COLON}</label></td>
-		<td class="row2"><!-- IF S_SPECIAL_GROUP --><b<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</b><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></td>
-		<td class="row2"><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea>
-			<br /><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} &nbsp; <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} &nbsp; <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}
-		</td>
-	</tr>
-	<!-- IF not S_SPECIAL_GROUP -->
-		<tr>
-			<td class="row1" width="35%"><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></td>
-			<td class="row2">
-				<input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}
-			</td>
-		</tr>
-	<!-- ELSE -->
-		<tr style="display:none;"><td><input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" /></td></tr>
-	<!-- ENDIF -->
-
-	<tr>
-		<th colspan="2">{L_GROUP_SETTINGS_SAVE}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td>
-		<td class="row2">
-			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;
-			<span>[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
-			<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
-		</td>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></td>
-		<td class="row2"><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></td>
-	</tr>
-	<tr>
-		<th colspan="2">{L_GROUP_AVATAR}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></td>
-		<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="avatar_delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
-	</tr>
-<!-- IF not S_AVATARS_ENABLED -->
-	<tr>
-		<td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td>
-	</tr>
-<!-- ENDIF -->
-	<tr>
-		<th colspan="2">{L_AVATAR_SELECT}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
-		<td class="row2">
-			<select name="avatar_driver" id="avatar_driver">
-				<option value="">{L_NO_AVATAR}</option>
-				<!-- BEGIN avatar_drivers -->
-				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
-				<!-- END avatar_drivers -->
-			</select></td>
-	</tr>
-<!-- BEGIN avatar_drivers -->
-	<tr class="avatar_option_{avatar_drivers.DRIVER}">
-		<td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td>
-	</tr>
-	<tr class="avatar_option_{avatar_drivers.DRIVER}">
-		<td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td>
-	</tr>
-<!-- END avatar_drivers -->
-
-	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="btnmain" type="reset" id="reset" name="reset" value="{L_RESET}" /></td>
-	</tr>
-	</table>
-
-<!-- INCLUDEJS avatars.js -->
-
-<!-- ELSEIF S_LIST -->
-
-	<h1>{L_GROUP_MEMBERS}</h1>
-
-	<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_GROUP_DEFAULT}</th>
-		<th>{L_JOINED}</th>
-		<th>{L_POSTS}</th>
-		<th>{L_MARK}</th>
-	</tr>
-
-	<tr>
-		<td class="row3" colspan="5"><b>{L_GROUP_LEAD}</b></td>
-	</tr>
-	<!-- BEGIN leader -->
-		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td>{leader.USERNAME_FULL}</td>
-			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-			<td style="text-align: center;">{leader.JOINED}</td>
-			<td style="text-align: center;">{leader.USER_POSTS}</td>
-			<td style="text-align: center;"></td>
-		</tr>
-	<!-- END leader -->
-
-	<!-- BEGIN member -->
-		<!-- IF member.S_PENDING -->
-			<tr>
-				<td class="row3" colspan="5"><b>{L_GROUP_PENDING}</b></td>
-			</tr>
-		<!-- ELSEIF member.S_APPROVED -->
-			<tr>
-				<td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td>
-			</tr>
-		<!-- ELSE -->
-			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td>{member.USERNAME_FULL}</td>
-				<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-				<td style="text-align: center;">{member.JOINED}</td>
-				<td style="text-align: center;">{member.USER_POSTS}</td>
-				<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td>
-			</tr>
-		<!-- ENDIF -->
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
-		</tr>
-	<!-- END member -->
-	<tr>
-		<td class="cat" colspan="5" align="center"><div style="float: {S_CONTENT_FLOW_END};"><span class="small"><a href="#" onclick="marklist('ucp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 'mark', false); return false;">{L_UNMARK_ALL}</a></span></div><div style="float: {S_CONTENT_FLOW_BEGIN};"><select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> <input class="btnmain" type="submit" name="update" value="{L_SUBMIT}" /></div></td>
-	</tr>
-	</table>
-
-	<div class="pagination" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<!-- IF .pagination -->
-			<!-- INCLUDE pagination.html -->
-		<!-- ELSE -->
-			{PAGE_NUMBER}
-		<!-- ENDIF -->
-	</div>
-
-	<br />
-	<br />
-
-	<h1>{L_ADD_USERS}</h1>
-
-	<p>{L_ADD_USERS_UCP_EXPLAIN}</p>
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="2">{L_ADD_USERS}</th>
-	</tr>
-	<tr>
-		<td class="row1"><label for="default">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></td>
-		<td class="row2"><input name="default" type="radio" class="radio" value="1" /> {L_YES} &nbsp; <input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</td>
-	</tr>
-	<tr>
-		<td class="row1"><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></td>
-		<td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="addusers" value="{L_SUBMIT}" /></td>
-	</tr>
-	</table>
-
-<!-- ELSE -->
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="3">{L_USERGROUPS}</th>
-	</tr>
-	<tr>
-		<td class="row1" colspan="3"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
-	</tr>
-
-	<tr>
-		<th>{L_GROUP_DETAILS}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-	</tr>
-	<tr>
-		<td class="row3" colspan="3"><b class="gensmall">{L_GROUP_LEADER}</b></td>
-	</tr>
-	<!-- BEGIN leader -->
-		<!-- IF leader.S_ROW_COUNT is odd --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td><b class="genmed"<!-- IF leader.GROUP_COLOUR --> style="color: #{leader.GROUP_COLOUR};"<!-- ENDIF -->>{leader.GROUP_NAME}</b><!-- IF leader.GROUP_DESC --><p class="forumdesc">{leader.GROUP_DESC}</p><!-- ENDIF --></td>
-		<td style="text-align: center;"><a href="{leader.U_EDIT}">{L_EDIT}</a></td>
-		<td style="text-align: center;"><a href="{leader.U_LIST}">{L_GROUP_LIST}</a></td>
-
-	</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row2" align="center" colspan="3"><b class="genmed">{L_NO_LEADERS}</b></td>
-		</tr>
-	<!-- END leader -->
-
-	<tr>
-		<td class="cat" align="{S_CONTENT_FLOW_END}" colspan="3">&nbsp;</td>
-	</tr>
-	</table>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_membership.html b/phpBB/styles/subsilver2/template/ucp_groups_membership.html
deleted file mode 100644
index 846d48007e..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_groups_membership.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="3">{L_USERGROUPS}</th>
-</tr>
-<tr>
-	<td class="row1" colspan="3"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
-</tr>
-
-<tr>
-	<th colspan="2">{L_GROUP_DETAILS}</th>
-	<th>{L_SELECT}</th>
-</tr>
-
-<!-- BEGIN leader -->
-	<!-- IF leader.S_FIRST_ROW -->
-		<tr>
-			<td class="row3" colspan="3"><b class="gensmall">{L_GROUP_LEADER}</b></td>
-		</tr>
-	<!-- ENDIF -->
-
-	<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td width="6%" align="center" nowrap="nowrap"><!-- IF S_CHANGE_DEFAULT --><input type="radio" class="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}" /><!-- ENDIF --></td>
-		<td>
-			<b class="genmed"><a href="{leader.U_VIEW_GROUP}"<!-- IF leader.GROUP_COLOUR --> style="color: #{leader.GROUP_COLOUR};"<!-- ENDIF -->>{leader.GROUP_NAME}</a></b>
-			<!-- IF leader.GROUP_DESC --><br /><span class="genmed">{leader.GROUP_DESC}</span><!-- ENDIF -->
-			<!-- IF not leader.GROUP_SPECIAL --><br /><i class="gensmall">{leader.GROUP_STATUS}</i><!-- ENDIF -->
-		</td>
-		<td width="6%" align="center" nowrap="nowrap"><!-- IF not leader.GROUP_SPECIAL --><input type="radio" class="radio" name="selected" value="{leader.GROUP_ID}" /><!-- ENDIF --></td>
-	</tr>
-<!-- END leader -->
-
-<!-- BEGIN member -->
-	<!-- IF member.S_FIRST_ROW -->
-		<tr>
-			<td class="row3" colspan="3"><b class="gensmall">{L_GROUP_MEMBER}</b></td>
-		</tr>
-	<!-- ENDIF -->
-
-	<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td width="6%" align="center" nowrap="nowrap"><!-- IF S_CHANGE_DEFAULT --><input type="radio" class="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}" /><!-- ENDIF --></td>
-		<td>
-			<b class="genmed"><a href="{member.U_VIEW_GROUP}"<!-- IF member.GROUP_COLOUR --> style="color: #{member.GROUP_COLOUR};"<!-- ENDIF -->>{member.GROUP_NAME}</a></b>
-			<!-- IF member.GROUP_DESC --><br /><span class="genmed">{member.GROUP_DESC}</span><!-- ENDIF -->
-			<!-- IF not member.GROUP_SPECIAL --><br /><i class="gensmall">{member.GROUP_STATUS}</i><!-- ENDIF -->
-		</td>
-		<td width="6%" align="center" nowrap="nowrap"><!-- IF not member.GROUP_SPECIAL --><input type="radio" class="radio" name="selected" value="{member.GROUP_ID}" /><!-- ENDIF --></td>
-	</tr>
-<!-- END member -->
-
-<!-- BEGIN pending -->
-	<!-- IF pending.S_FIRST_ROW -->
-		<tr>
-			<td class="row3" colspan="3"><b class="gensmall">{L_GROUP_PENDING}</b></td>
-		</tr>
-	<!-- ENDIF -->
-
-	<!-- IF pending.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td width="6%" align="center" nowrap="nowrap">&nbsp;</td>
-		<td>
-			<b class="genmed"><a href="{pending.U_VIEW_GROUP}"<!-- IF pending.GROUP_COLOUR --> style="color: #{pending.GROUP_COLOUR};"<!-- ENDIF -->>{pending.GROUP_NAME}</a></b>
-			<!-- IF pending.GROUP_DESC --><br /><span class="genmed">{pending.GROUP_DESC}</span><!-- ENDIF -->
-			<!-- IF not pending.GROUP_SPECIAL --><br /><i class="gensmall">{pending.GROUP_STATUS}</i><!-- ENDIF -->
-		</td>
-		<td width="6%" align="center" nowrap="nowrap"><!-- IF not pending.GROUP_SPECIAL --><input type="radio" class="radio" name="selected" value="{pending.GROUP_ID}" /><!-- ENDIF --></td>
-	</tr>
-<!-- END pending -->
-
-<!-- BEGIN nonmember -->
-	<!-- IF nonmember.S_FIRST_ROW -->
-		<tr>
-			<td class="row3" colspan="3"><b class="gensmall">{L_GROUP_NONMEMBER}</b></td>
-		</tr>
-	<!-- ENDIF -->
-
-	<!-- IF nonmember.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td width="6%" align="center" nowrap="nowrap">&nbsp;</td>
-		<td>
-			<b class="genmed"><a href="{nonmember.U_VIEW_GROUP}"<!-- IF nonmember.GROUP_COLOUR --> style="color: #{nonmember.GROUP_COLOUR};"<!-- ENDIF -->>{nonmember.GROUP_NAME}</a></b>
-			<!-- IF nonmember.GROUP_DESC --><br /><span class="genmed">{nonmember.GROUP_DESC}</span><!-- ENDIF -->
-			<!-- IF not nonmember.GROUP_SPECIAL --><br /><i class="gensmall">{nonmember.GROUP_STATUS}</i><!-- ENDIF -->
-		</td>
-		<td width="6%" align="center" nowrap="nowrap"><!-- IF nonmember.S_CAN_JOIN --><input type="radio" class="radio" name="selected" value="{nonmember.GROUP_ID}" /><!-- ENDIF --></td>
-	</tr>
-<!-- END nonmember -->
-
-<tr>
-	<td class="cat" colspan="3"><!-- IF S_CHANGE_DEFAULT --><div style="float: {S_CONTENT_FLOW_BEGIN};"><input class="btnlite" type="submit" name="change_default" value="{L_CHANGE_DEFAULT_GROUP}" /></div><!-- ENDIF --><div style="float: {S_CONTENT_FLOW_END};"><span class="genmed">{L_SELECT}{L_COLON} </span><select name="action"><option value="join">{L_JOIN_SELECTED}</option><option value="resign">{L_RESIGN_SELECTED}</option><option value="demote">{L_DEMOTE_SELECTED}</option></select>&nbsp;<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;</div></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html
deleted file mode 100644
index e3aaef6943..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_header.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-
-<!-- IF S_SHOW_PM_BOX and S_POST_ACTION -->
-	<form action="{S_POST_ACTION}" method="post" name="postform"{S_FORM_ENCTYPE}>
-<!-- ENDIF -->
-<table width="100%" cellspacing="0" cellpadding="0" border="0">
-<tr>
-	<td width="20%" valign="top">
-
-<!-- IF S_SHOW_PM_BOX and S_POST_ACTION -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{L_PM_TO}</th>
-	</tr>
-	<!-- IF not S_ALLOW_MASS_PM -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</td>
-	</tr>
-	
-	<tr>
-		<td class="row2"><input class="post" type="text" name="username_list" size="20" value="" />&nbsp;<input class="post" type="submit" name="add_to" value="{L_ADD}" /></td>
-	</tr>
-	<!-- ELSE -->
-		<tr>
-			<td class="row1"><b class="genmed">{L_USERNAMES}{L_COLON}</b></td>
-		</tr>
-		<tr>
-			<td class="row2"><textarea name="username_list" rows="5" cols="22" tabindex="1"></textarea><br />
-				[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]
-			</td>
-		</tr>
-	<!-- ENDIF -->
-	<!-- IF S_GROUP_OPTIONS -->
-		<tr>
-			<td class="row1"><b class="genmed">{L_USERGROUPS}{L_COLON}</b></td>
-		</tr>
-		<tr>
-			<td class="row2"><select name="group_list[]" multiple="multiple" size="5" style="width:150px">{S_GROUP_OPTIONS}</select></td>
-		</tr>
-	<!-- ENDIF -->
-	<!-- IF S_ALLOW_MASS_PM -->
-		<tr>
-			<td class="row1"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<input class="post" type="submit" name="add_bcc" value="{L_ADD_BCC}" tabindex="1" />&nbsp;</div><div style="float: {S_CONTENT_FLOW_END};">&nbsp;<input class="post" type="submit" name="add_to" value="{L_ADD_TO}" tabindex="1" />&nbsp;</div></td>
-		</tr>
-	<!-- ENDIF -->
-	</table>
-	<div style="padding: 2px;"></div>
-<!-- ENDIF -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th>{L_OPTIONS}</th>
-</tr>
-
-<!-- BEGIN l_block1 -->
-	<tr>
-		<!-- IF l_block1.S_SELECTED -->
-			<td class="row1"><b class="nav">{l_block1.L_TITLE}</b>
-
-			<!-- IF S_PRIVMSGS -->
-
-				<!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 (it gets parsed separately) -->
-				<!-- BEGIN !folder -->
-					<!-- IF folder.S_FIRST_ROW -->
-						<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
-					<!-- ENDIF -->
-
-					<!-- IF folder.S_CUR_FOLDER -->
-						<li class="row2" style="padding: 1px 0;">&#187; <a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}<!-- IF folder.S_UNREAD_MESSAGES --> ({folder.UNREAD_MESSAGES})<!-- ENDIF --></a></li>
-					<!-- ELSE -->
-						<li>&#187; <a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}<!-- IF folder.S_UNREAD_MESSAGES --> ({folder.UNREAD_MESSAGES})<!-- ENDIF --></a></li>
-					<!-- ENDIF -->
-
-					<!-- IF folder.S_LAST_ROW -->
-						</ul>
-						<hr />
-					<!-- ENDIF -->
-				<!-- END !folder -->
-
-			<!-- ENDIF -->
-
-			<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
-			<!-- BEGIN l_block2 -->
-				<li>&#187; <!-- IF l_block1.l_block2.S_SELECTED --><b>{l_block1.l_block2.L_TITLE}</b><!-- ELSE --><a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a><!-- ENDIF --></li>
-			<!-- END l_block2 -->
-			</ul>
-		<!-- ELSE -->
-			<td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href=this.firstChild.href;"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a>
-		<!-- ENDIF -->
-		</td>
-	</tr>
-<!-- END l_block1 -->
-</table>
-
-<div style="padding: 2px;"></div>
-
-<!-- IF S_SHOW_COLOUR_LEGEND -->
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-	<tr>
-		<th colspan="2">{L_MESSAGE_COLOURS}</th>
-	</tr>
-	<!-- BEGIN pm_colour_info -->
-		<tr>
-			<!-- IF not pm_colour_info.IMG -->
-				<td class="row1 {pm_colour_info.CLASS}" width="5"><img src="images/spacer.gif" width="5" alt="{pm_colour_info.LANG}" /></td>
-			<!-- ELSE -->
-				<td class="row1" width="25" align="center">{pm_colour_info.IMG}</td>
-			<!-- ENDIF -->
-			<td class="row1"><span class="genmed">{pm_colour_info.LANG}</span></td>
-		</tr>
-	<!-- END pm_colour_info -->
-	</table>
-
-	<div style="padding: 2px;"></div>
-<!-- ENDIF -->
-
-<!-- IF S_ZEBRA_ENABLED and S_ZEBRA_FRIENDS_ENABLED -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{L_FRIENDS}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center">
-		
-			<b class="genmed online">{L_FRIENDS_ONLINE}</b>
-
-			<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
-			<!-- BEGIN friends_online -->
-				<li>{friends_online.USERNAME_FULL}
-				<!-- IF S_SHOW_PM_BOX -->
-					&nbsp;[ <input class="post" style="font-size: 90%;" type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" /> ]
-				<!-- ENDIF -->
-				</li>
-			<!-- BEGINELSE -->
-				<li>{L_NO_FRIENDS_ONLINE}</li>
-			<!-- END friends_online -->
-			</ul>
-
-			<hr />
-
-			<b class="genmed offline">{L_FRIENDS_OFFLINE}</b>
-
-			<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
-			<!-- BEGIN friends_offline -->
-				<li>{friends_offline.USERNAME_FULL}
-				<!-- IF S_SHOW_PM_BOX -->
-					&nbsp;[ <input class="post" style="font-size: 90%;" type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" /> ]
-				<!-- ENDIF -->
-				</li>
-			<!-- BEGINELSE -->
-				<li>{L_NO_FRIENDS_OFFLINE}</li>
-			<!-- END friends_offline -->
-			</ul>
-
-		</td>
-	</tr>
-	</table>
-<!-- ENDIF -->
-
-</td>
-<td><img src="images/spacer.gif" width="4" alt="" /></td>
-<td width="80%" valign="top"><!-- IF not S_PRIVMSGS or S_SHOW_DRAFTS --><form name="ucp" id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/ucp_login_link.html b/phpBB/styles/subsilver2/template/ucp_login_link.html
deleted file mode 100644
index 5d8e3ee27b..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_login_link.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th>{SITENAME} - {L_LOGIN_LINK}</th>
-	</tr>
-
-	<tr>
-		<td class="row1" align="center"><span class="genmed">{L_LOGIN_LINK_EXPLAIN}</span></td>
-	</tr>
-
-	<!-- IF LOGIN_LINK_ERROR -->
-		<tr>
-			<td class="row1" align="center"><span class="genmed error">{LOGIN_LINK_ERROR}</span></td>
-		</tr>
-	<!-- ENDIF -->
-
-	<tr>
-		<td class="row1">
-			<form action="{REGISTER_ACTION}" method="post" id="register">
-				<table width="100%" cellspacing="1">
-					<tr>
-						<th colspan="2">{L_REGISTER}</th>
-					</tr>
-
-					<tr>
-						<td>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1" /></td>
-					</tr>
-				</table>
-			</form>
-		</td>
-	</tr>
-
-	<tr>
-		<td class="row1">
-			<form action="{LOGIN_ACTION}" method="post" id="login">
-				<table width="100%" cellspacing="1">
-					<tr>
-						<th colspan="2">{L_LOGIN}</th>
-					</tr>
-
-					<!-- IF LOGIN_ERROR -->
-						<tr>
-							<td class="row1" align="center" colspan="2"><span class="genmed error">{LOGIN_ERROR}</span></td>
-						</tr>
-					<!-- ENDIF -->
-
-					<tr>
-						<td><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></td>
-						<td><input type="text" tabindex="2" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth" /></td>
-					</tr>
-
-					<tr>
-						<td><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></td>
-						<td><input type="password" tabindex="3" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></td>
-					</tr>
-
-					<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
-						<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
-						<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
-					<!-- ENDIF -->
-
-					{S_LOGIN_REDIRECT}
-					<tr>
-						<td>&nbsp;</td>
-						<td>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></td>
-					</tr>
-				</table>
-			</form>
-		</td>
-	</tr>
-</table>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html
deleted file mode 100644
index e91417503f..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="4">{L_UCP}</th>
-</tr>
-<tr>
-	<td class="row1" colspan="4" align="center"><span class="genmed">{L_BOOKMARKS_EXPLAIN}</span></td>
-</tr>
-<!-- IF .topicrow -->
-<tr>
-	<th colspan="4">{L_BOOKMARKS}</th>
-</tr>
-<!-- ENDIF -->
-
-<!-- IF S_NO_DISPLAY_BOOKMARKS -->
-	<tr class="row1">
-		<td colspan="4" align="center"><b class="genmed">{L_BOOKMARKS_DISABLED}</b></td>
-	</tr>
-<!-- ELSE -->
-
-	<!-- IF TOTAL_TOPICS -->
-		<tr>
-			<td class="row3" colspan="4">
-				<table width="100%" cellspacing="1">
-				<tr>
-					<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-					<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]&nbsp;</td>
-					<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-	<!-- ENDIF -->
-
-	<!-- BEGIN topicrow -->
-
-		<!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-		<!-- IF topicrow.S_DELETED_TOPIC -->
-			<td class="postdetails" style="padding: 4px" width="100%" colspan="2">{L_DELETED_TOPIC}</td>
-		<!-- ELSE -->
-			<td style="padding: 4px;" width="100%" valign="top">
-				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
-				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}{L_COLON} </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->
-				<!-- IF .topicrow.pagination -->
-					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON} 
-					<!-- BEGIN pagination -->
-						<!-- IF topicrow.pagination.S_IS_PREV -->
-						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong>
-						<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
-						<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
-						<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>
-						<!-- ENDIF -->
-					<!-- END pagination -->
-					] </p>
-				<!-- ENDIF -->
-			</td>
-			<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap">
-				<p class="topicdetails">{topicrow.LAST_POST_TIME}</p>
-				<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a>
-				</p>
-			</td>
-		<!-- ENDIF -->
-			<td style="padding: 4px;"> <input type="checkbox" class="radio" name="t[{topicrow.TOPIC_ID}]" /> </td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row1">
-			<td colspan="4" align="center"><b class="genmed">{L_NO_BOOKMARKS}</b></td>
-		</tr>
-	<!-- END topicrow -->
-
-		<!-- IF .topicrow -->
-			<tr>
-				<td class="cat" colspan="5" align="{S_CONTENT_FLOW_END}"><input class="btnlite" type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" />&nbsp;</td>
-			</tr>
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-</table>
-
-<!-- IF not S_NO_DISPLAY_BOOKMARKS and .topicrow -->
-	<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="marklist('ucp', 't', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 't', false); return false;">{L_UNMARK_ALL}</a></b></div>
-<!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
deleted file mode 100644
index d63d678250..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="4">{L_UCP}</th>
-</tr>
-<tr>
-	<td class="row1" colspan="4" align="center"><span class="genmed">{L_DRAFTS_EXPLAIN}</span></td>
-</tr>
-
-<!-- IF ERROR -->
-	<tr>
-		<td class="row1" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF not S_EDIT_DRAFT -->
-
-	<!-- IF S_DRAFT_ROWS -->
-	<tr>
-		<th>{L_SAVE_DATE}</th>
-		<th>{L_DRAFT_TITLE}</th>
-		<th>{L_OPTIONS}</th>
-		<th>{L_DELETE}</th>
-	</tr>
-	<!-- ENDIF -->
-
-	<!-- BEGIN draftrow -->
-
-		<!-- IF draftrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td class="postdetails" style="padding: 4px;" nowrap="nowrap">{draftrow.DATE}</td>
-		<td style="padding: 4px;" valign="top" width="100%">
-			<p class="topictitle">{draftrow.DRAFT_SUBJECT}</p>
-			<!-- IF draftrow.S_LINK_TOPIC --><span class="gensmall">{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>
-			<!-- ELSEIF draftrow.S_LINK_FORUM --><span class="gensmall">{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>
-			<!-- ELSEIF draftrow.S_LINK_PM --><span class="gensmall">{L_PRIVATE_MESSAGE}</span>
-			<!-- ELSE --><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF -->
-		</td>
-		<td style="padding: 4px;" align="center" nowrap="nowrap"><span class="genmed"><!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a><br /><!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></span></td>
-		<td style="padding: 4px;" align="center"><input type="checkbox" class="radio" name="d[{draftrow.DRAFT_ID}]" /></td>
-	</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="4" align="center"><b class="genmed">{L_NO_SAVED_DRAFTS}</b></td>
-		</tr>
-	<!-- END draftrow -->
-
-	<!-- IF S_DRAFT_ROWS -->
-		<tr>
-			<td class="cat" colspan="4" align="{S_CONTENT_FLOW_END}"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" />&nbsp;</td>
-		</tr>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_EDIT_DRAFT -->
-	<tr>
-		<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>
-		<td class="row2"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="64" tabindex="2" value="{DRAFT_SUBJECT}" /></td>
-	</tr>
-	<tr> 
-		<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}{L_COLON} </b><br /><span class="gensmall">{L_EDIT_DRAFT_EXPLAIN}</span></td>
-		<td class="row2">
-			<script type="text/javascript">
-			// <![CDATA[
-				var form_name = 'ucp';
-				var text_name = 'message';
-			// ]]>
-			</script>
-			<table cellspacing="0" cellpadding="2" border="0">
-			<!-- INCLUDE posting_buttons.html -->
-			<tr>
-				<td colspan="9"><textarea class="post" name="message" rows="10" cols="70" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{DRAFT_MESSAGE}</textarea></td>
-			</tr>
-			<tr>
-				<td colspan="9">
-					<table cellspacing="0" cellpadding="0" border="0" width="100%">
-					<tr>
-						<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="11" data-height="10" data-bbcode="true">
-						</td>
-					</tr>
-					</table>
-				</td>
-			</tr>			
-			</table>
-		</td>
-	</tr>
-	<tr class="row1">
-		<td colspan="9" align="{S_CONTENT_FLOW_BEGIN}"><p class="topictitle"><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></p></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-	</tr>
-<!-- ENDIF -->
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_main_front.html b/phpBB/styles/subsilver2/template/ucp_main_front.html
deleted file mode 100644
index 5dea2b4f03..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_main_front.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="3">{L_UCP}</th>
-</tr>
-<tr>
-	<td class="row1" colspan="3" align="center"><p class="genmed">{L_UCP_WELCOME}</p></td>
-</tr>
-<tr>
-	<th colspan="3">{L_IMPORTANT_NEWS}</th>
-</tr>
-
-<!-- BEGIN topicrow -->
-
-	<!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
-		<td class="row1" width="100%">
-			<p class="topictitle"><!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><p class="gensmall">{topicrow.GOTO_PAGE}</p>
-		</td>
-		<td class="row1" width="120" align="center" nowrap="nowrap">
-			<p class="topicdetails">{topicrow.LAST_POST_TIME}</p>
-			<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
-				<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a>
-			</p>
-		</td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr class="row1">
-		<td align="center" colspan="3"><b class="gen">{L_NO_IMPORTANT_NEWS}</b></td>
-	</tr>
-<!-- END topicrow -->
-
-<tr>
-	<th colspan="3">{L_YOUR_DETAILS}</th>
-</tr>
-<tr>
-	<td class="row1" colspan="3">
-		<table width="100%" cellspacing="1" cellpadding="4">
-		<tr> 
-			<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_JOINED}{L_COLON} </b></td>
-			<td width="100%"><b class="gen">{JOINED}</b></td>
-		</tr>
-		<tr> 
-			<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}{L_COLON} </b></td>
-			<td><!-- IF POSTS_PCT --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<!-- IF S_DISPLAY_SEARCH --><br /><a href="{U_SEARCH_SELF}">{L_SEARCH_YOUR_POSTS}</a><!-- ENDIF --></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>
-		</tr>
-		<!-- IF S_SHOW_ACTIVITY -->
-			<tr>
-				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_FORUM}{L_COLON} </b></td>
-				<td><!-- IF ACTIVE_FORUM != '' --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
-			</tr>
-			<tr>
-				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}{L_COLON} </b></td>
-				<td><!-- IF ACTIVE_TOPIC != '' --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF WARNINGS -->
-			<tr>
-				<td align="{S_CONTENT_FLOW_END}" valign="middle" nowrap="nowrap"><b class="genmed">{L_YOUR_WARNINGS}{L_COLON} </b></td>
-				<td class="genmed">{WARNING_IMG} [ <b>{WARNINGS}</b> ]</td>
-			</tr>
-		<!-- ENDIF -->
-		</table>
-	</td>
-</tr>
-<tr>
-	<td class="cat" colspan="3">&nbsp;</td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
deleted file mode 100644
index c6ae1b6cab..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="4">{L_UCP}</th>
-</tr>
-<tr>
-	<td class="row1" colspan="4" align="center"><span class="genmed">{L_WATCHED_EXPLAIN}</span></td>
-</tr>
-<!-- IF S_FORUM_NOTIFY -->
-	<tr>
-		<th colspan="4">{L_WATCHED_FORUMS}</th>
-	</tr>
-
-	<!-- BEGIN forumrow -->
-
-		<!-- IF forumrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="padding: 4px;" width="20" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
-			<td style="padding: 4px;" width="100%"><p class="topictitle"><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></p></td>
-			<td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br />{forumrow.LAST_POST_AUTHOR_FULL} <a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td>
-			<td style="padding: 4px;"> <input type="checkbox" class="radio" name="f[{forumrow.FORUM_ID}]" /> </td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row1">
-			<td colspan="4" align="center"><b class="genmed">{L_NO_WATCHED_FORUMS}</b></td>
-		</tr>
-	<!-- END forumrow -->
-<!-- ENDIF -->
-<!-- IF S_TOPIC_NOTIFY -->
-	<tr>
-		<th colspan="4">{L_WATCHED_TOPICS}</th>
-	</tr>
-
-	<!-- IF TOTAL_TOPICS -->
-		<tr>
-			<td class="row3" colspan="4">
-				<table width="100%" cellspacing="1">
-				<tr>
-					<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-					<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]&nbsp;</td>
-					<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-	<!-- ENDIF -->
-
-	<!-- BEGIN topicrow -->
-
-		<!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-			<td style="padding: 4px;" width="100%" valign="top">
-				<p class="topictitle">
-					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a>
-				</p>
-				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}{L_COLON} </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->
-				<!-- IF .topicrow.pagination -->
-					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON}
-					<!-- BEGIN pagination -->
-						<!-- IF topicrow.pagination.S_IS_PREV -->
-						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong>
-						<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS}
-						<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
-						<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>
-						<!-- ENDIF -->
-					<!-- END pagination -->
-					] </p>
-				<!-- ENDIF -->
-			</td>
-			<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap">
-				<p class="topicdetails">{topicrow.LAST_POST_TIME}</p>
-				<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a>
-				</p>
-			</td>
-			<td style="padding: 4px;"> <input type="checkbox" class="radio" name="t[{topicrow.TOPIC_ID}]" /> </td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row1">
-			<td colspan="4" align="center"><b class="genmed">{L_NO_WATCHED_TOPICS}</b></td>
-		</tr>
-	<!-- END topicrow -->
-<!-- ENDIF -->
-
-<!-- IF .topicrow or .forumrow -->
-<tr>
-	<td class="cat" colspan="4" align="{S_CONTENT_FLOW_END}"><input class="btnlite" type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" />&nbsp;</td>
-</tr>
-<!-- ENDIF -->
-</table>
-<!-- IF .topicrow or .forumrow -->
-<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="marklist('ucp', 't', true); marklist('ucp', 'f', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 't', false);marklist('ucp', 'f', false); return false;">{L_UNMARK_ALL}</a></b></div>
-<!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
deleted file mode 100644
index b0d2925b68..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<!-- IF MODE == 'notification_options' -->
-	<table width="100%" cellspacing="1">
-	<tr>
-		<th colspan="{NOTIFICATION_TYPES_COLS}">{TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1" colspan="{NOTIFICATION_TYPES_COLS}" align="center"><span class="genmed">{TITLE_EXPLAIN}</span></td>
-	</tr>
-	<tr>
-		<th>{L_NOTIFICATION_TYPE}</th>
-		<th width="10%">{L_NOTIFICATIONS}</th>
-		<!-- BEGIN notification_methods -->
-			<th width="10%">{notification_methods.NAME}</th>
-		<!-- END notification_methods -->
-	</tr>
-
-	<!-- BEGIN notification_types -->
-		<!-- IF notification_types.GROUP_NAME -->
-			<tr>
-				<td class="row3" colspan="{NOTIFICATION_TYPES_COLS}">{notification_types.GROUP_NAME}</td>
-			</tr>
-		<!-- ELSE -->
-			<!-- IF notification_types.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td>
-					{notification_types.NAME}
-					<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
-				</td>
-				<td align="center"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
-				<!-- BEGIN notification_methods -->
-					<td align="center"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
-				<!-- END notification_methods -->
-			</tr>
-		<!-- ENDIF -->
-	<!-- END notification_types -->
-	<tr>
-		<td class="cat" colspan="{NOTIFICATION_TYPES_COLS}" align="center">
-			<input type="hidden" name="form_time" value="{FORM_TIME}" />
-			{S_HIDDEN_FIELDS}
-			<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;
-			<input class="btnlite" type="reset" value="{L_RESET}" name="reset" />
-			{S_FORM_TOKEN}
-		</td>
-	</tr>
-	</table>
-<!-- ELSE -->
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-		<tr>
-			<td class="row1">
-				<table border="0" cellspacing="0" cellpadding="0" width="100%">
-					<tr>
-						<td align="{S_CONTENT_FLOW_BEGIN}">
-							<!-- IF TOTAL_COUNT -->
-								<table width="100%" cellspacing="1">
-									<tr>
-										<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}</td>
-										<td class="gensmall" nowrap="nowrap" width="100%">&nbsp;{L_NOTIFICATIONS} [ <b>{TOTAL_COUNT}</b> ]&nbsp;</td>
-									</tr>
-								</table>
-							<!-- ENDIF -->
-						</td>
-						<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE pagination.html --></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
-
-	<div class="notification_list">
-		<table class="tablebg" width="100%" cellspacing="1">
-			<tr>
-				<td class="cat" colspan="3">
-					<table width="100%" cellspacing="0">
-						<tr class="nav">
-							<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a><!-- ENDIF --></td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<th colspan="2">{L_NOTIFICATIONS}</th>
-				<th width="15%">{L_MARK_READ}</th>
-			</tr>
-			<!-- BEGIN notification_list -->
-				<tr class="row<!-- IF notification_list.UNREAD -->3<!-- ELSEIF notification_list.S_ROW_COUNT is even -->1<!-- ELSE -->2<!-- ENDIF -->">
-					<td width="50">
-						<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
-					</td>
-					<td valign="top">
-						<span class="gen">
-						<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
-							{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF -->
-						<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
-						<!-- IF notification_list.FORUM --><span class="notifications_forum">{notification_list.FORUM}</span><br /><!-- ENDIF -->
-						<!-- IF notification_list.REASON --><span class="notifications_reason">{notification_list.REASON}</span><br /><!-- ENDIF -->
-							<span class="notifications_time">{notification_list.TIME}</span>
-						</span>
-					</td>
-					<td align="center">
-						<input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}"<!-- IF not notification_list.UNREAD --> disabled="disabled"<!-- ENDIF --> />
-					</td>
-				</tr>
-			<!-- END notification_list -->
-			<tr>
-				<td class="cat" colspan="3" align="center">
-					<input type="hidden" name="form_time" value="{FORM_TIME}" />
-					{S_HIDDEN_FIELDS}
-					<input class="btnmain" type="submit" name="submit" value="{L_MARK_READ}" />
-					{S_FORM_TOKEN}
-				</td>
-			</tr>
-		</table>
-	</div>
-
-	<!-- IF .pagination -->
-		<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-			<tr>
-				<td class="row1">
-					<table border="0" cellspacing="0" cellpadding="0" width="100%">
-					<tr>
-						<td align="{S_CONTENT_FLOW_BEGIN}">
-							<!-- INCLUDE pagination.html -->
-						</td>
-					</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-	<!-- ENDIF -->
-<!-- ENDIF -->
-
-<!-- IF .notifications -->
-<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></b></div>
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html
deleted file mode 100644
index c07edb0f68..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_pm_history.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<script type="text/javascript">
-// <![CDATA[
-	bbcodeEnabled = {S_BBCODE_ALLOWED};
-// ]]>
-</script>
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th align="center">{L_MESSAGE_HISTORY}</th>
-</tr>
-<tr>
-	<td class="row1"><div style="overflow: auto; width: 100%; height: 300px;">
-
-		<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<th width="22%">{L_AUTHOR}</th>
-			<th>{L_MESSAGE}</th>
-		</tr>
-	<!-- BEGIN history_row -->
-			<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a name="{history_row.MSG_ID}" class="anchor"></a>
-				<table width="150" cellspacing="0">
-				<tr>
-					<td align="center" colspan="2"><span class="postauthor">{history_row.MESSAGE_AUTHOR_FULL}</span></td>
-				</tr>
-				</table>
-			</td>
-			<td width="100%"<!-- IF history_row.S_CURRENT_MSG --> class="current"<!-- ENDIF -->>
-				<div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};"><b>{L_PM_SUBJECT}{L_COLON}</b>&nbsp;{history_row.SUBJECT}</div><div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><b>{L_FOLDER}{L_COLON}</b>&nbsp;{history_row.FOLDER}</div>
-			</td>
-		</tr>
-
-		<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td valign="top">
-				<table width="100%" cellspacing="0">
-				<tr>
-					<td valign="top">
-						<table width="100%" cellspacing="0" cellpadding="2">
-						<tr>
-							<td><div class="postbody"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div><div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div></td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<table width="100%" cellspacing="0">
-						<tr valign="middle">
-							<td width="100%">&nbsp;</td>
-							<td width="10" nowrap="nowrap">{history_row.MINI_POST_IMG}</td>
-							<td class="gensmall" nowrap="nowrap"><b>{L_SENT_AT}{L_COLON}</b> {history_row.SENT_DATE}</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-
-		<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td class="gensmall"><a href="{history_row.U_VIEW_MESSAGE}">{L_VIEW_PM}</a></td>
-			<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF history_row.U_PROFILE --><a href="{history_row.U_PROFILE}" class="imageset">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_EMAIL --><a href="{history_row.U_EMAIL}" class="imageset">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE --><a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}'); return false;"<!-- ENDIF --> class="imageset">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_POST_REPLY_PM --><a href="{history_row.U_POST_REPLY_PM}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
-		</tr>
-		<tr>
-			<td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-		</tr>
-	<!-- END history_row -->
-		</table>
-	</div></td>
-</tr>
-</table>
-
-<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
deleted file mode 100644
index 20c5c7fe9f..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-<!-- IF not S_VIEW_MESSAGE -->
-	{S_FORM_TOKEN}
-	</form>
-<!-- ENDIF -->
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-<tr>
-	<td class="row1">
-		<table border="0" cellspacing="0" cellpadding="0" width="100%">
-		<tr>
-			<td align="{S_CONTENT_FLOW_BEGIN}"><!-- INCLUDE pagination.html -->
-				<!-- IF S_VIEW_MESSAGE -->
-					<span class="gensmall">
-						<!-- IF U_PRINT_PM --><a href="{U_PRINT_PM}" title="{L_PRINT_PM}">{L_PRINT_PM}</a><!-- IF U_FORWARD_PM --> | <!-- ENDIF --><!-- ENDIF -->
-						<!-- IF U_FORWARD_PM --><a href="{U_FORWARD_PM}" title="{L_FORWARD_PM}">{L_FORWARD_PM}</a><!-- ENDIF -->
-						<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><!-- IF U_PRINT_PM or U_FORWARD_PM --> | <!-- ENDIF --><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a><!-- ENDIF -->
-					</span>
-				<!-- ENDIF -->
-			</td>
-			<td align="{S_CONTENT_FLOW_END}" nowrap="nowrap">
-				<!-- IF S_VIEW_MESSAGE -->
-					<!-- IF not S_SPECIAL_FOLDER -->
-						<form name="movepm" method="post" action="{S_PM_ACTION}" style="margin:0px">
-							<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />
-							<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
-							<input type="hidden" name="p" value="{MSG_ID}" />
-							<select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="move_pm" value="{L_MOVE_TO_FOLDER}" />
-						{S_FORM_TOKEN}
-						</form>
-					<!-- ENDIF -->
-				<!-- ELSE -->
-					<form name="sortmsg" method="post" action="{S_PM_ACTION}" style="margin:0px">
-						<span class="gensmall">{L_DISPLAY_MESSAGES}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" />
-					{S_FORM_TOKEN}
-					</form>
-				<!-- ENDIF -->
-			</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<!-- IF not S_VIEW_MESSAGE -->
-	<div style="float: {S_CONTENT_FLOW_END};"><b class="gensmall"><a href="#" onclick="marklist('viewfolder', 'marked_msg_id', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('viewfolder', 'marked_msg_id', false); return false;">{L_UNMARK_ALL}</a></b></div>
-<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_header.html b/phpBB/styles/subsilver2/template/ucp_pm_message_header.html
deleted file mode 100644
index 370fa673dd..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_pm_message_header.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-<tr>
-	<td class="row1">
-		<table border="0" cellspacing="0" cellpadding="0" width="100%">
-		<tr>
-			<td align="{S_CONTENT_FLOW_BEGIN}">
-			<!-- IF TOTAL_MESSAGES -->
-				<table width="100%" cellspacing="1">
-				<tr>
-					<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-					<!-- IF FOLDER_MAX_MESSAGES neq 0 -->
-						<td class="gensmall" nowrap="nowrap" width="100%">&nbsp;[ <b>{FOLDER_CUR_MESSAGES}</b>/{FOLDER_MAX_MESSAGES} {L_MESSAGES} ({FOLDER_PERCENT}%) ]&nbsp;</td>
-					<!-- ELSE -->
-						<td class="gensmall" nowrap="nowrap" width="100%">&nbsp;[ <b>{FOLDER_CUR_MESSAGES}</b> {L_MESSAGES} ]&nbsp;</td>					
-					<!-- ENDIF -->
-				</tr>
-				</table>
-			<!-- ENDIF -->
-	
-			<!-- IF S_VIEW_MESSAGE -->
-				<span class="gensmall">
-				<!-- IF S_DISPLAY_HISTORY -->
-					<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}">{L_VIEW_PREVIOUS_HISTORY}</a> | <!-- ENDIF --><!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}">{L_VIEW_NEXT_HISTORY}</a> | <!-- ENDIF -->
-				<!-- ENDIF --><a href="{U_PREVIOUS_PM}">{L_VIEW_PREVIOUS_PM}</a> | <a href="{U_NEXT_PM}">{L_VIEW_NEXT_PM}</a>&nbsp;
-				</span>
-			<!-- ENDIF -->
-			</td>
-			<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE pagination.html --></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html
deleted file mode 100644
index beb867c75a..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_pm_options.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<!-- IF ERROR_MESSAGE or NOTIFICATION_MESSAGE -->
-	<table border="0" cellspacing="0" cellpadding="0" width="100%">
-	<tr>
-		<td class="row3" align="center">
-			<!-- IF ERROR_MESSAGE --><span class="genmed error">{ERROR_MESSAGE}</span><!-- ENDIF -->
-			<!-- IF NOTIFICATION_MESSAGE --><span class="genmed error">{NOTIFICATION_MESSAGE}</span><!-- ENDIF -->
-		</td>
-	</tr>
-	</table>
-	<div style="padding: 2px;"></div>
-<!-- ENDIF -->
-
-<form name="ucp" method="post" action="{S_UCP_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="3">{L_ADD_NEW_RULE}</th>
-</tr>
-<!-- IF S_CHECK_DEFINED -->
-	<tr>
-		<td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><b class="gen">{L_IF}{L_COLON}</b></td>
-		<td class="row2" align="center" valign="top"><!-- IF S_CHECK_SELECT --><select name="check_option">{S_CHECK_OPTIONS}</select><!-- ELSE --><b class="gen">{CHECK_CURRENT}</b><input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF --></td>
-		<td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_CHECK_SELECT --><input type="submit" name="next" value="{L_NEXT_STEP}" class="btnlite" /><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-	</tr>
-<!-- ENDIF -->
-<!-- IF S_RULE_DEFINED -->
-	<tr>
-		<td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS_STEP}" class="btnlite" /><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-		<td class="row2" align="center" valign="top"><!-- IF S_RULE_SELECT --><select name="rule_option">{S_RULE_OPTIONS}</select><!-- ELSE --><b class="gen">{RULE_CURRENT}</b><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></td>
-		<td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_RULE_SELECT --><input type="submit" name="next" value="{L_NEXT_STEP}" class="btnlite" /><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-	</tr>
-<!-- ENDIF -->
-	
-<!-- IF S_COND_DEFINED -->
-	<!-- IF S_COND_SELECT or COND_CURRENT -->
-		<tr>
-			<td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS_STEP}" class="btnlite" /><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-			<td class="row2" align="center" valign="top">
-				<!-- IF S_COND_SELECT -->
-					<!-- IF S_TEXT_CONDITION -->
-						<input type="text" name="rule_string" value="{CURRENT_STRING}" size="30" maxlength="250" class="post" />
-					<!-- ELSEIF S_USER_CONDITION -->
-						<input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" size="20" />&nbsp;<span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
-					<!-- ELSEIF S_GROUP_CONDITION -->
-						<input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF -->
-					<!-- ENDIF -->
-				<!-- ELSE -->
-					<b class="gen">{COND_CURRENT}</b>
-						<input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><input type="hidden" name="rule_user_id" value="{CURRENT_USER_ID}" /><input type="hidden" name="rule_group_id" value="{CURRENT_GROUP_ID}" />
-				<!-- ENDIF -->
-			</td>
-			<td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="next" value="{L_NEXT_STEP}" class="btnlite" /><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-		</tr>
-	<!-- ENDIF -->
-	<input type="hidden" name="cond_option" value="{COND_OPTION}" />
-<!-- ENDIF -->
-
-<!-- IF NONE_CONDITION --><input type="hidden" name="cond_option" value="none" /><!-- ENDIF -->
-
-<!-- IF S_ACTION_DEFINED -->
-	<tr>
-		<td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS_STEP}" class="btnlite" /><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-		<td class="row2" align="center" valign="top"><!-- IF S_ACTION_SELECT --><select name="action_option">{S_ACTION_OPTIONS}</select><!-- ELSE --><b class="gen">{ACTION_CURRENT}</b><input type="hidden" name="action_option" value="{ACTION_OPTION}" /><!-- ENDIF --></td>
-		<td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_ACTION_SELECT --><input type="submit" name="add_rule" value="{L_ADD_RULE}" class="btnlite" /><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-	</tr>
-<!-- ENDIF -->
-</table>
-
-<div style="padding: 2px;"></div>
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="6">{L_DEFINED_RULES}</th>
-</tr>
-<!-- BEGIN rule -->
-	<tr>
-		<td class="row1" width="25" align="center"><span class="gen">#{rule.COUNT}</span></td>
-		<td class="row2" width="120"><span class="gen"><strong>{L_IF}</strong> {rule.CHECK}</span></td>
-		<td class="row1" width="120"><span class="gen">{rule.RULE}</span></td>
-		<td class="row2" width="120"><span class="gen"><!-- IF rule.STRING -->{rule.STRING}<!-- ENDIF --></span></td>
-		<td class="row1"><span class="gen">{rule.ACTION}<!-- IF rule.FOLDER --> -&gt; {rule.FOLDER}<!-- ENDIF --></span></td>
-		<td class="row2" width="25"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="btnlite" /></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td colspan="6" class="row3" align="center"><span class="gen">{L_NO_RULES_DEFINED}</span></td>
-	</tr>
-<!-- END rule -->
-</table>
-
-<div style="padding: 2px;"></div>
-
-<!-- IF S_FOLDER_OPTIONS -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="2">{L_RENAME_FOLDER}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="200"><b class="gen">{L_RENAME_FOLDER}{L_COLON} </b></td>
-		<td class="row1"><select name="rename_folder_id">{S_FOLDER_OPTIONS}</select></td>
-	</tr>
-	<tr>
-		<td class="row1" width="200"><b class="gen">{L_NEW_FOLDER_NAME}{L_COLON} </b></td>
-		<td class="row1"><input type="text" class="post" name="new_folder_name" size="30" maxlength="30" /></td>
-	</tr>
-	<tr>
-		<td class="row1" align="{S_CONTENT_FLOW_END}" colspan="2"><input class="btnlite" style="width:150px" type="submit" name="rename_folder" value="{L_RENAME}" /></td>
-	</tr>
-	</table>
-
-	<div style="padding: 2px;"></div>
-<!-- ENDIF -->
-
-<!-- IF not S_MAX_FOLDER_ZERO -->
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2">{L_ADD_FOLDER}</th>
-</tr>
-<!-- IF S_MAX_FOLDER_REACHED -->
-	<tr>
-		<td colspan="2">{L_MAX_FOLDER_REACHED}</td>
-	</tr>
-<!-- ELSE -->
-	<tr>
-		<td class="row1" width="200"><b class="gen">{L_ADD_FOLDER}{L_COLON} </b></td>
-		<td class="row1"><input type="text" class="post" name="foldername" size="30" maxlength="30" /></td>
-	</tr>
-	<tr>
-		<td class="row1" align="{S_CONTENT_FLOW_END}" colspan="2"><input class="btnlite" style="width:150px" type="submit" name="addfolder" value="{L_ADD}" /></td>
-	</tr>
-<!-- ENDIF -->
-</table>
-<!-- ENDIF -->
-
-<div style="padding: 2px;"></div>
-
-<!-- IF S_FOLDER_OPTIONS -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="3">{L_REMOVE_FOLDER}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="200"><b class="gen">{L_REMOVE_FOLDER}{L_COLON} </b></td>
-		<td class="row1"><select name="remove_folder_id">{S_FOLDER_OPTIONS}</select></td>
-		<td class="row1"><b class="genmed">{L_AND}</b></td>
-	</tr>
-	<tr>
-		<td class="row2" width="200">&nbsp;</td>
-		<td class="row2" colspan="2"><input type="radio" class="radio" name="remove_action" value="1" checked="checked" />&nbsp;<span class="genmed">{L_MOVE_DELETED_MESSAGES_TO} </span>&nbsp;<select name="move_to">{S_TO_FOLDER_OPTIONS}</select></td>
-	</tr>
-	<tr>
-		<td class="row2" width="200">&nbsp;</td>
-		<td class="row2" colspan="2"><input type="radio" class="radio" name="remove_action" value="2" />&nbsp;<span class="genmed">{L_DELETE_MESSAGES_IN_FOLDER}</span></td>
-	</tr>
-	<tr>
-		<td class="row2" width="200">&nbsp;</td>
-		<td class="row2" colspan="2" align="{S_CONTENT_FLOW_END}"><input class="btnlite" style="width:150px" type="submit" name="remove_folder" value="{L_REMOVE}" /></td>
-	</tr>
-	</table>
-
-	<div style="padding: 2px;"></div>
-<!-- ENDIF -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2">{L_FOLDER_OPTIONS}</th>
-</tr>
-<tr>
-	<td class="row1" width="200"><span><b class="genmed">{L_IF_FOLDER_FULL}{L_COLON} </b></span></td>
-	<td class="row1"><input type="radio" class="radio" name="full_action" value="1"{S_DELETE_CHECKED} />&nbsp;<span class="genmed">{L_DELETE_OLDEST_MESSAGES}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="200">&nbsp;</td>
-	<td class="row1"><input type="radio" class="radio" name="full_action" value="2"{S_MOVE_CHECKED} />&nbsp;<span class="genmed">{L_MOVE_TO_FOLDER}{L_COLON} </span><select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></td>
-</tr>
-<tr>
-	<td class="row1" width="200">&nbsp;</td>
-	<td class="row1"><input type="radio" class="radio" name="full_action" value="3"{S_HOLD_CHECKED} />&nbsp;<span class="genmed">{L_HOLD_NEW_MESSAGES}</span></td>
-</tr>
-<tr>
-	<td class="row2" width="200"><b class="genmed">{L_DEFAULT_ACTION}{L_COLON} </b><br /><span class="gensmall">{L_DEFAULT_ACTION_EXPLAIN}</span></td>
-	<td class="row2"><span class="genmed">{DEFAULT_ACTION}</span></td>
-</tr>
-<tr>
-	<td class="row1" colspan="2" align="{S_CONTENT_FLOW_END}"><input class="btnlite" style="width:150px" type="submit" name="fullfolder" value="{L_CHANGE}" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
deleted file mode 100644
index edcf553b84..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<div id="pagecontent">
-
-<!-- IF not PROMPT -->
-	<!-- INCLUDE ucp_pm_message_header.html -->
-<!-- ENDIF -->
-
-<div style="padding: 2px;"></div>
-
-<!-- IF S_PM_ICONS -->
-	<!-- DEFINE $COLSPAN = 6 -->
-<!-- ELSE -->
-	<!-- DEFINE $COLSPAN = 5 -->
-<!-- ENDIF -->
-
-<form name="viewfolder" method="post" action="{S_PM_ACTION}" style="margin:0px">
-
-<!-- IF PROMPT -->
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" border="0">
-	<tr>
-		<th colspan="2" valign="middle">{L_OPTIONS}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="35%">{L_DELIMITER}{L_COLON} </td>
-		<td class="row2"><input class="post" type="text" name="delimiter" value="," /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="35%">{L_ENCLOSURE}{L_COLON} </td>
-		<td class="row2"><input class="post" type="text" name="enclosure" value="&#034;" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="hidden" name="export_option" value="CSV" /><input class="btnmain" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="Reset" name="reset" /></td>
-	</tr>
-	</table>
-	{S_FORM_TOKEN}
-
-</form>
-<!-- ELSE -->
-
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" border="0">
-	<!-- IF NUM_NOT_MOVED or NUM_REMOVED -->
-		<tr>
-			<td class="row3" colspan="{$COLSPAN}" align="center"><span class="gen">
-				<!-- IF NUM_REMOVED -->
-				{RULE_REMOVED_MESSAGES}
-					<!-- IF NUM_NOT_MOVED --><br /><!-- ENDIF -->
-				<!-- ENDIF -->
-				<!-- IF NUM_NOT_MOVED -->
-				{NOT_MOVED_MESSAGES}<br />{RELEASE_MESSAGE_INFO}
-				<!-- ENDIF -->
-			</span></td>
-		</tr>
-	<!-- ENDIF -->
-	<tr>
-		<th colspan="<!-- IF S_PM_ICONS -->3<!-- ELSE -->2<!-- ENDIF -->">&nbsp;{L_SUBJECT}&nbsp;</th>
-		<th>&nbsp;<!-- IF S_SHOW_RECIPIENTS -->{L_RECIPIENTS}<!-- ELSE -->{L_AUTHOR}<!-- ENDIF -->&nbsp;</th>
-		<th>&nbsp;{L_SENT_AT}&nbsp;</th>
-		<th>&nbsp;{L_MARK}&nbsp;</th>
-	</tr>
-
-	<!-- BEGIN messagerow -->
-		<tr>
-			<td class="row1" width="25" align="center" nowrap="nowrap">{messagerow.FOLDER_IMG}</td>
-		<!-- IF S_PM_ICONS -->
-			<td class="row1" width="25" align="center">{messagerow.PM_ICON_IMG}</td>
-		<!-- ENDIF -->
-
-		<!-- IF messagerow.S_PM_DELETED --><td class="row3"><!-- ELSE --><td class="row1"><!-- ENDIF -->
-			<!-- IF not messagerow.PM_IMG and messagerow.PM_CLASS -->
-				<span class="{messagerow.PM_CLASS}" style="float: {S_CONTENT_FLOW_BEGIN};"><img src="images/spacer.gif" width="10" height="10" alt="" /></span>&nbsp;
-			<!-- ELSEIF messagerow.PM_IMG -->
-				{messagerow.PM_IMG}&nbsp;
-			<!-- ENDIF -->
-
-			<span class="topictitle">
-				{messagerow.ATTACH_ICON_IMG}
-				<!-- IF messagerow.S_PM_DELETED -->
-					{L_MESSAGE_REMOVED_FROM_OUTBOX}<br />
-					<a href="{messagerow.U_REMOVE_PM}" style="float: {S_CONTENT_FLOW_END};">{L_DELETE_MESSAGE}</a>
-				<!-- ELSE -->
-					<a href="{messagerow.U_VIEW_PM}">{messagerow.SUBJECT}</a>
-				<!-- ENDIF -->
-				<!-- IF messagerow.S_PM_REPORTED -->
-					<a href="{messagerow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
-				<!-- ENDIF -->
-				<!-- IF messagerow.S_AUTHOR_DELETED -->
-					<br /><em class="gensmall">{L_PM_FROM_REMOVED_AUTHOR}</em>
-				<!-- ENDIF -->
-			</span></td>
-
-			<td class="row1" width="100" align="center"><p class="topicauthor"><!-- IF S_SHOW_RECIPIENTS -->{messagerow.RECIPIENTS}<!-- ELSE -->{messagerow.MESSAGE_AUTHOR_FULL}<!-- ENDIF --></p></td>
-			<td class="row1" width="120" align="center"><p class="topicdetails">{messagerow.SENT_TIME}</p></td>
-			<td class="row1" width="20" align="center"><p class="topicdetails"><input type="checkbox" class="radio" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></p></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="{$COLSPAN}" height="30" align="center" valign="middle"><span class="gen">
-			<!-- IF S_COMPOSE_PM_VIEW and S_NO_AUTH_SEND_MESSAGE -->
-				<!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_AUTH_SEND_MESSAGE}<!-- ENDIF -->
-			<!-- ELSE -->
-				{L_NO_MESSAGES}
-			<!-- ENDIF -->
-			</span></td>
-		</tr>
-	<!-- END messagerow -->
-</table>
-
-<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
-
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-	<td class="cat">
-<!-- IF .messagerow -->
-	<div style="float: {S_CONTENT_FLOW_BEGIN};"><select name="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select>&nbsp;<input class="btnlite" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" /></div>
-	<div style="float: {S_CONTENT_FLOW_END};"><select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="submit_mark" value="{L_GO}" />&nbsp;</div>
-<!-- ENDIF -->
-	</td>
-</tr>
-</table>
-
-<div style="padding: 2px;"></div>
-<!-- INCLUDE ucp_pm_message_footer.html -->
-
-<!-- ENDIF -->
-
-<br clear="all" />
-
-</div>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
deleted file mode 100644
index 9536b1f8c5..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<div id="pagecontent">
-
-<!-- INCLUDE ucp_pm_message_header.html -->
-<div style="padding: 2px;"></div>
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="4">
-
-<tr class="row1">
-	<td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_SUBJECT}{L_COLON}</b></td>
-	<td class="gen">{SUBJECT}</td>
-</tr>
-
-<tr class="row1">
-	<td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_FROM}{L_COLON}</b></td>
-	<td class="gen">{MESSAGE_AUTHOR_FULL}</td>
-</tr>
-
-<tr class="row1">
-	<td class="genmed" nowrap="nowrap" width="150"><b>{L_SENT_AT}{L_COLON}</b></td>
-	<td class="gen">{SENT_DATE}</td>
-</tr>
-
-<!-- IF S_TO_RECIPIENT -->
-	<tr class="row1">
-		<td class="genmed" nowrap="nowrap" width="150"><b>{L_TO}{L_COLON}</b></td>
-		<td class="gen">
-		<!-- BEGIN to_recipient -->
-			<!-- IF to_recipient.IS_GROUP --><span class="sep"><a href="{to_recipient.U_VIEW}">{to_recipient.NAME}</a></span><!-- ELSE -->{to_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-		<!-- END to_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_BCC_RECIPIENT -->
-	<tr class="row1">
-		<td class="genmed" nowrap="nowrap" width="150"><b>{L_BCC}{L_COLON}</b></td>
-		<td class="gen">
-		<!-- BEGIN bcc_recipient -->
-			<!-- IF bcc_recipient.IS_GROUP --><span class="sep"><a href="{bcc_recipient.U_VIEW}">{bcc_recipient.NAME}</a></span><!-- ELSE -->{bcc_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-		<!-- END bcc_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-</table>
-
-<div style="padding: 2px;"></div>
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-
-<tr>
-	<th nowrap="nowrap">{L_MESSAGE}</th>
-</tr>
-
-<tr>
-	<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-</tr>
-
-<tr class="row1">
-	<td valign="top">
-		<table width="100%" cellspacing="5">
-		<tr>
-			<td>
-				<div class="postbody">{MESSAGE}</div>
-
-				<!-- IF S_HAS_ATTACHMENTS -->
-					<br clear="all" /><br />
-							
-					<table class="tablebg" width="100%" cellspacing="1">
-					<tr>
-						<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>
-					</tr>
-					<!-- BEGIN attachment -->
-						<tr>
-							<td class="row2">{attachment.DISPLAY_ATTACHMENT}</td>
-						</tr>
-					<!-- END attachment -->
-					</table>
-				<!-- ENDIF -->
-
-				<!-- IF S_DISPLAY_NOTICE -->
-					<span class="gensmall error"><br /><br />{L_DOWNLOAD_NOTICE}</span>
-				<!-- ENDIF -->
-				<!-- IF SIGNATURE -->
-					<span class="postbody"><br />_________________<br />{SIGNATURE}</span>
-				<!-- ENDIF -->
-				<!-- IF EDITED_MESSAGE -->
-					<span class="gensmall">{EDITED_MESSAGE}</span>
-				<!-- ENDIF -->
-
-				<!-- IF not S_HAS_ATTACHMENTS --><br clear="all" /><br /><!-- ENDIF -->
-
-				<table width="100%" cellspacing="0">
-				<tr valign="middle">
-					<td class="gensmall" align="{S_CONTENT_FLOW_END}"> <!-- IF U_REPORT --><a href="{U_REPORT}" class="imageset">{REPORT_IMG}</a> <!-- ENDIF --><!-- IF U_DELETE --><a href="{U_DELETE}" class="imageset">{DELETE_IMG}</a> <!-- ENDIF --></td>
-				</tr>
-				</table>
-
-			</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-
-<tr class="row1">
-	<td>
-		<div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">
-			&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}" class="imageset">{PROFILE_IMG}</a> <!-- ENDIF -->
-			<!-- IF U_EMAIL --><a href="{U_EMAIL}" class="imageset">{EMAIL_IMG}</a> <!-- ENDIF -->
-		&nbsp;</div>
-		<div class="gensmall" style="float: {S_CONTENT_FLOW_END};">
-			<!-- EVENT ucp_pm_viewmessage_post_buttons_before -->
-			<!-- IF U_EDIT --><a href="{U_EDIT}" class="imageset">{EDIT_IMG}</a> <!-- ENDIF -->
-			<!-- IF U_QUOTE --><a href="{U_QUOTE}" class="imageset">{QUOTE_IMG}</a> <!-- ENDIF -->
-			<!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->
-			<!-- EVENT ucp_pm_viewmessage_post_buttons_after -->
-		&nbsp;</div>
-	</td>
-</tr>
-
-<tr>
-	<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-</tr>
-</table>
-
-<div style="padding: 2px;"></div>
-<!-- INCLUDE ucp_pm_message_footer.html -->
-
-<br clear="all" />
-
-</div>
-
-<!-- IF S_DISPLAY_HISTORY --><!-- INCLUDE ucp_pm_history.html --><!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
deleted file mode 100644
index f70f39f9d8..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
-<head>
-<meta charset="utf-8">
-<meta name="robots" content="noindex" />
-<title>{SITENAME} :: {PAGE_TITLE}</title>
-
-<style type="text/css">
-<!--
-
-body {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-}
-
-td {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-	line-height: 150%;
-}
-
-.code,
-.quote {
-	font-size: smaller;
-	border: black solid 1px;
-}
-
-.forum {
-	font-family: Arial,Helvetica,sans-serif;
-	font-weight: bold;
-	font-size: 18pt;
-}
-
-.topic {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 14pt;
-	font-weight: bold;
-}
-
-.gensmall {
-	font-size: 8pt;
-}
-
-hr {
-	color: #888;
-	height: 3px;
-	border-style: solid;
-}
-
-hr.sep {
-	color: #aaa;
-	height: 1px;
-	border-style: dashed;
-}
-//-->
-</style>
-<!-- EVENT ucp_pm_viewmessage_print_head_append -->
-</head>
-<body>
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</span></td>
-</tr>
-<tr>
-	<td colspan="2"><br /></td>
-</tr>
-<tr>
-	<td><span class="topic">{SUBJECT}</span><br /></td>
-	<td align="{S_CONTENT_FLOW_END}" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td>
-</tr>
-</table>
-
-<hr width="85%" />
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td width="10%" nowrap="nowrap">{L_PM_FROM}{L_COLON}&nbsp;</td>
-	<td><b>{MESSAGE_AUTHOR}</b> [ {SENT_DATE} ]</td>
-</tr>
-	
-<!-- IF S_TO_RECIPIENT -->
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_TO}{L_COLON}</td>
-		<td>
-		<!-- BEGIN to_recipient -->
-			<span<!-- IF to_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->>{to_recipient.NAME}</span>&nbsp;
-		<!-- END to_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_BCC_RECIPIENT -->
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_BCC}{L_COLON}</td>
-		<td>
-		<!-- BEGIN bcc_recipient -->
-			<!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp;
-		<!-- END bcc_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td colspan="2"><hr class="sep" />{MESSAGE}</td>
-</tr>
-</table>
-
-<hr width="85%" />
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td><span class="gensmall">{PAGE_NUMBER}</span></td>
-	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
-</tr>
-<tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</span></td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
deleted file mode 100644
index 1c76e3226d..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
-// ]]>
-</script>
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_TITLE}</th>
-</tr>
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- EVENT ucp_prefs_personal_prepend -->
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_SHOW_EMAIL}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="viewemail" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="viewemail" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_ADMIN_EMAIL}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="massemail" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="massemail" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_ALLOW_PM}{L_COLON}</b><br /><span class="gensmall">{L_ALLOW_PM_EXPLAIN}</span></td>
-	<td class="row2"><input type="radio" class="radio" name="allowpm" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="allowpm" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
-</tr>
-<!-- IF S_CAN_HIDE_ONLINE -->
-	<tr>
-		<td class="row1" width="50%"><b class="genmed">{L_HIDE_ONLINE}{L_COLON}</b><br /><span class="gensmall">{L_HIDE_ONLINE_EXPLAIN}</span></td>
-		<td class="row2"><input type="radio" class="radio" name="hideonline" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="hideonline" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- IF S_SELECT_NOTIFY -->
-	<tr>
-		<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_METHOD}{L_COLON}</b><br /><span class="gensmall">{L_NOTIFY_METHOD_EXPLAIN}</span></td>
-		<td class="row2"><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_EMAIL}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_IM}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_BOTH}</span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- IF S_MORE_LANGUAGES -->
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}{L_COLON}</b></td>
-	<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>
-</tr>
-<!-- ENDIF -->
-<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}{L_COLON}</b></td>
-	<td class="row2"><select name="user_style">{S_STYLE_OPTIONS}</select></td>
-</tr>
-<!-- ENDIF -->
-<!-- INCLUDE timezone_option.html -->
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}{L_COLON}</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>
-	<td class="row2">
-		<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
-			{S_DATEFORMAT_OPTIONS}
-		</select>
-		<div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="post" style="margin-top: 3px;" /></div>
-	</td>
-</tr>
-<!-- EVENT ucp_prefs_personal_append -->
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_post.html b/phpBB/styles/subsilver2/template/ucp_prefs_post.html
deleted file mode 100644
index 0a558b863c..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_prefs_post.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_TITLE}</th>
-</tr>
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- EVENT ucp_prefs_post_prepend -->
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_BBCODE}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="bbcode" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="bbcode" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_SMILIES}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="smilies" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="smilies" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_ADD_SIG}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="sig" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="sig" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_NOTIFY}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="notify" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="notify" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<!-- EVENT ucp_prefs_post_append -->
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_view.html b/phpBB/styles/subsilver2/template/ucp_prefs_view.html
deleted file mode 100644
index c10c458627..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_prefs_view.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_TITLE}</th>
-</tr>
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- EVENT ucp_prefs_view_radio_buttons_prepend -->
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_IMAGES}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="images" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="images" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_FLASH}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="flash" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="flash" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_SMILIES}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="smilies" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="smilies" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_SIGS}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="sigs" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="sigs" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_AVATARS}{L_COLON}</b></td>
-	<td class="row2"><input type="radio" class="radio" name="avatars" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="avatars" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-</tr>
-<!-- IF S_CHANGE_CENSORS -->
-	<tr>
-		<td class="row1" width="50%"><b class="genmed">{L_DISABLE_CENSORS}{L_COLON}</b></td>
-		<td class="row2"><input type="radio" class="radio" name="wordcensor" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="wordcensor" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- EVENT ucp_prefs_view_radio_buttons_append -->
-<tr>
-	<td colspan="2" class="spacer"></td>
-</tr>
-<!-- EVENT ucp_prefs_view_select_menu_prepend -->
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_DAYS}{L_COLON}</b></td>
-	<td class="row2">{S_TOPIC_SORT_DAYS}</td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_KEY}{L_COLON}</b></td>
-	<td class="row2">{S_TOPIC_SORT_KEY}</td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_DIR}{L_COLON}</b></td>
-	<td class="row2">{S_TOPIC_SORT_DIR}</td>
-</tr>
-<tr>
-	<td colspan="2" class="spacer"></td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_DAYS}{L_COLON}</b></td>
-	<td class="row2">{S_POST_SORT_DAYS}</td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_KEY}{L_COLON}</b></td>
-	<td class="row2">{S_POST_SORT_KEY}</td>
-</tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_DIR}{L_COLON}</b></td>
-	<td class="row2">{S_POST_SORT_DIR}</td>
-</tr>
-<!-- EVENT ucp_prefs_view_select_menu_append -->
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
deleted file mode 100644
index 3f63319b59..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="4">{L_TITLE}</th>
-</tr>
-
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="4" align="center"><span class="genmed error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-
-<tr>
-	<td colspan="4" class="row1">{L_PROFILE_AUTOLOGIN_KEYS}</td>
-</tr>
-<tr>
-	<th>{L_LOGIN_KEY}</th>
-	<th>{L_IP}</th>
-	<th>{L_LOGIN_TIME}</th>
-	<th>{L_MARK}</th>
-</tr>
-<!-- BEGIN sessions -->
-	<!-- IF sessions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td class="genmed"><label for="{sessions.KEY}">{sessions.KEY}</label></td>
-		<td class="genmed" style="text-align: center">{sessions.IP}</td>
-		<td class="genmed" style="text-align: center">{sessions.LOGIN_TIME}</td>
-		<td class="genmed" style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td colspan="4" class="row1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td>
-	</tr>
-<!-- END sessions -->
-
-<!-- IF .sessions -->
-	<tr>
-		<td class="cat" colspan="4" align="{S_CONTENT_FLOW_END}">
-			{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" name="submit" value="{L_DELETE_MARKED}" />
-			{S_FORM_TOKEN}
-		</td>
-	</tr>
-<!-- ENDIF -->
-</table>
-
-<!-- IF .sessions -->
-	<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="marklist('ucp', 'keys', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 'keys', false); return false;">{L_UNMARK_ALL}</a></b></div>
-<!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
deleted file mode 100644
index fc52c149c6..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_TITLE}</th>
-</tr>
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}{L_COLON} </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
-	<td class="row2" align="center"><br />
-		<!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="avatar_delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span>
-		<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" />
-		<!-- ENDIF --></td>
-</tr>
-<!-- IF not S_AVATARS_ENABLED -->
-	<tr>
-		<td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td>
-	</tr>
-<!-- ENDIF -->
-	<tr>
-		<th colspan="2">{L_AVATAR_SELECT}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
-		<td class="row2">
-			<select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-				<option value="">{L_NO_AVATAR}</option>
-				<!-- BEGIN avatar_drivers -->
-				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting=".avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
-				<!-- END avatar_drivers -->
-			</select></td>
-	</tr>
-<!-- BEGIN avatar_drivers -->
-	<tr class="avatar_option_{avatar_drivers.DRIVER}">
-		<td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td>
-	</tr>
-	<tr class="avatar_option_{avatar_drivers.DRIVER}">
-		<td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td>
-	</tr>
-<!-- END avatar_drivers -->
-
-	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<!-- IF S_IN_AVATAR_GALLERY --><input class="btnlite" type="submit" name="cancel" value="{L_CANCEL}" /><!-- ELSE --><input class="btnlite" type="reset" value="{L_RESET}" name="reset" /><!-- ENDIF --></td>
-	</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
deleted file mode 100644
index 2d0140a15d..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_TITLE}</th>
-</tr>
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row1" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
-</tr>
-<!-- IF S_JABBER_ENABLED -->
-<tr>
-	<td class="row1" width="35%"><b class="genmed">{L_UCP_JABBER}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{JABBER}" /></td>
-</tr>
-<!-- ENDIF -->
-<!-- IF S_BIRTHDAYS_ENABLED -->
-	<tr>
-		<td class="row1" width="35%"><b class="genmed">{L_BIRTHDAY}{L_COLON} </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td>
-		<td class="row2"><span class="genmed">{L_DAY}{L_COLON}</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="genmed">{L_MONTH}{L_COLON}</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="genmed">{L_YEAR}{L_COLON}</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td>
-	</tr>
-<!-- ENDIF -->
-<!-- BEGIN profile_fields -->
-	<tr>
-		<td class="row1" width="35%">
-			<b class="genmed">{profile_fields.LANG_NAME}{L_COLON} </b>
-			<!-- IF profile_fields.S_REQUIRED --><b>*</b><!-- ENDIF -->
-			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span class="gensmall">{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->
-		</td>
-		<td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall error">{profile_fields.ERROR}</span><!-- ENDIF --></td>
-	</tr>
-<!-- END profile_fields -->
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
deleted file mode 100644
index d8fe84bf79..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_TITLE}</th>
-</tr>
-<!-- IF S_FORCE_PASSWORD -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{L_FORCE_PASSWORD_EXPLAIN}</span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row1" width="35%"><b class="genmed">{L_USERNAME}{L_COLON} </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>
-	<td class="row2"><!-- IF S_CHANGE_USERNAME --><input type="text" class="post" name="username" size="30" value="{USERNAME}" /><!-- ELSE --><b class="gen">{USERNAME}</b><!-- ENDIF --></td>
-</tr>
-<tr>
-	<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b></td>
-	<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="email" class="post" name="email" size="30" maxlength="100" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>
-</tr>
-<!-- IF S_CHANGE_PASSWORD -->
-	<tr>
-		<td class="row1" width="35%"><b class="genmed">{L_NEW_PASSWORD}{L_COLON} </b><br /><span class="gensmall">{L_CHANGE_PASSWORD_EXPLAIN}</span></td>
-		<td class="row2"><input type="password" class="post" name="new_password" size="30" maxlength="255" value="{NEW_PASSWORD}" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><b class="genmed">{L_CONFIRM_PASSWORD}{L_COLON} </b><br /><span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td>
-		<td class="row2"><input type="password" class="post" name="password_confirm" size="30" maxlength="255" value="{PASSWORD_CONFIRM}" /></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<th colspan="2">{L_CONFIRM_CHANGES}</th>
-</tr>
-<tr>
-	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}{L_COLON} </b><br /><span class="gensmall"><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></td>
-	<td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td>
-</tr>
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html
deleted file mode 100644
index 5a2690edda..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	var form_name = 'ucp';
-	var text_name = 'signature';
-// ]]>
-</script>
-
-<!-- DEFINE $S_SIGNATURE = 1 -->
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2">{L_TITLE}</th>
-</tr>
-<!-- IF not S_SMILIES_ALLOWED -->
-<tr>
-	<td colspan="2" class="row1">{L_SIGNATURE_EXPLAIN}</td>
-</tr>
-<!-- ENDIF -->
-
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-
-<tr>
-	<!-- IF S_SMILIES_ALLOWED -->
-	<td class="row1" width="22%" valign="top">
-		{L_SIGNATURE_EXPLAIN}
-		<table width="100%" cellspacing="5" cellpadding="0" border="0" align="center">
-			<tr>
-				<td class="gensmall" align="center"><b>{L_SMILIES}</b></td>
-			</tr>
-			<tr>
-				<td align="center">
-				<!-- BEGIN smiley -->
-					<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a>
-				<!-- END smiley -->
-				</td>
-			</tr>
-			<!-- IF S_SHOW_SMILEY_LINK -->
-			<tr>
-				<td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a></td>
-			</tr>
-			<!-- ENDIF -->
-		</table>
-	</td>
-	<td class="row2">
-	<!-- ELSE -->
-	<td class="row2" colspan="2">
-	<!-- ENDIF -->
-
-		<table cellspacing="0" cellpadding="2" border="0" width="99%">
-		<!-- INCLUDE posting_buttons.html -->
-		<tr>
-			<td colspan="2"><textarea class="post" name="signature" rows="10" cols="76" style="width: 90%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></td>
-		</tr>
-		<!-- IF S_BBCODE_ALLOWED -->
-		<tr>
-			<td colspan="2">
-				<table cellspacing="0" cellpadding="0" border="0" width="100%">
-				<tr>
-					<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="11" data-height="10">
-					</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<!-- ENDIF -->
-		</table>
-	</td>
-</tr>
-<tr>
-	<td class="row1" valign="top"><b class="genmed">{L_OPTIONS}</b><br />
-		<table cellspacing="2" cellpadding="0" border="0">
-		<tr>
-			<td class="gensmall">{BBCODE_STATUS}</td>
-		</tr>
-		<tr>
-			<td class="gensmall">{IMG_STATUS}</td>
-		</tr>
-		<tr>
-			<td class="gensmall">{FLASH_STATUS}</td>
-		</tr>
-		<tr>
-			<td class="gensmall">{URL_STATUS}</td>
-		</tr>
-		<tr>
-			<td class="gensmall">{SMILIES_STATUS}</td>
-		</tr>
-		</table>
-	</td>
-	<td class="row2" valign="top">
-		<table cellspacing="0" cellpadding="1" border="0">
-		<!-- IF S_BBCODE_ALLOWED -->
-			<tr>
-				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
-				<td class="gen">{L_DISABLE_BBCODE}</td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF S_SMILIES_ALLOWED -->
-			<tr>
-				<td><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /></td>
-				<td class="gen">{L_DISABLE_SMILIES}</td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF S_LINKS_ALLOWED -->
-			<tr>
-				<td><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /></td>
-				<td class="gen">{L_DISABLE_MAGIC_URL}</td>
-			</tr>
-		<!-- ENDIF -->
-		</table>
-	</td>
-</tr>
-
-<!-- IF SIGNATURE_PREVIEW != '' -->
-	<tr>
-		<th colspan="2" valign="middle">{L_SIGNATURE_PREVIEW}</th>
-	</tr>
-	<tr> 
-		<td class="row1" colspan="2"><div class="postbody" style="padding: 6px;">{SIGNATURE_PREVIEW}</div></td>
-	</tr>
-<!-- ENDIF -->
-
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" name="preview" value="{L_PREVIEW}" />&nbsp;&nbsp;<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
deleted file mode 100644
index 162fa2a020..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	/**
-	* Change language
-	*/
-	function change_language(lang_iso)
-	{
-		document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}';
-		document.forms['register'].change_lang.value = lang_iso;
-		document.forms['register'].submit.click();
-	}
-
-// ]]>
-</script>
-
-<form name="register" method="post" action="{S_UCP_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_REGISTRATION}</th>
-</tr>
-
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF L_REG_COND -->
-	<tr>
-		<td class="row2" colspan="2"><span class="gensmall">{L_REG_COND}</span></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- EVENT ucp_register_credentials_before -->
-<tr>
-	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}{L_COLON} </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>
-	<td class="row2"><input class="post" type="text" name="username" size="25" value="{USERNAME}" /></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="email" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_PASSWORD}{L_COLON} </b><br /><span class="gensmall">{L_PASSWORD_EXPLAIN}</span></td>
-	<td class="row2"><input class="post" type="password" name="new_password" size="25" value="{PASSWORD}" /></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="password" name="password_confirm" size="25" value="{PASSWORD_CONFIRM}" /></td>
-</tr>
-<!-- EVENT ucp_register_credentials_after -->
-<!-- EVENT ucp_register_options_before -->
-<tr>
-	<td class="row1"><b class="genmed">{L_LANGUAGE}{L_COLON} </b></td>
-	<td class="row2"><select name="lang" onchange="change_language(this.value); return false;">{S_LANG_OPTIONS}</select></td>
-</tr>
-
-<!-- INCLUDE timezone_option.html -->
-
-<!-- EVENT ucp_register_profile_fields_before -->
-<!-- IF .profile_fields -->
-	<tr>
-		<td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
-	</tr>
-<!-- BEGIN profile_fields -->
-	<tr>
-		<td class="row1" width="35%">
-			<b class="genmed">{profile_fields.LANG_NAME}{L_COLON} </b>
-			<!-- IF profile_fields.S_REQUIRED --><b>*</b><!-- ENDIF -->
-			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span class="gensmall">{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->
-		</td>
-		<td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall error">{profile_fields.ERROR}</span><!-- ENDIF --></td>
-	</tr>
-	
-<!-- END profile_fields -->
-<!-- ENDIF -->
-<!-- EVENT ucp_register_profile_fields_after -->
-		<!-- IF CAPTCHA_TEMPLATE -->
-		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
-		<!-- ENDIF -->
-
-<!-- IF S_COPPA -->
-	<tr>
-		<th colspan="2" valign="middle">{L_COPPA_COMPLIANCE}</th>
-	</tr>
-	<tr>
-		<td class="row3" colspan="2"><span class="gensmall">{L_COPPA_EXPLAIN}</span></td>
-	</tr>
-<!-- ENDIF -->
-
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" id="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_remind.html b/phpBB/styles/subsilver2/template/ucp_remind.html
deleted file mode 100644
index f7fde4b3be..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_remind.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div align="center">
-
-<form action="{S_PROFILE_ACTION}" method="post">
-
-<table class="tablebg" width="50%" cellspacing="1" cellpadding="4" border="0">
-<tr> 
-	<th colspan="2">{L_SEND_PASSWORD}</th>
-</tr>
-<tr> 
-	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}{L_COLON} </b></td>
-	<td class="row2"><input type="text" class="post" name="username" size="25" value="{USERNAME}" /></td>
-</tr>
-<tr> 
-	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td>
-	<td class="row2"><input type="email" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
-</tr>
-<tr> 
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" name="reset" class="btnlite" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-</form>
-
-</div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_resend.html b/phpBB/styles/subsilver2/template/ucp_resend.html
deleted file mode 100644
index 62e7e96d6b..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_resend.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div align="center">
-
-<form action="{S_PROFILE_ACTION}" method="post">
-
-<table class="tablebg" width="50%" cellspacing="1" cellpadding="4" border="0">
-<tr>
-	<th colspan="2">{L_UCP_RESEND}</th>
-</tr>
-<tr>
-	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}{L_COLON} </b></td>
-	<td class="row2"><input type="text" class="post" name="username" size="25" value="{USERNAME}" /></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td>
-	<td class="row2"><input type="email" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
-</tr>
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" name="reset" class="btnlite" /></td>
-</tr>
-</table>
-{S_FORM_TOKEN}
-
-</form>
-
-</div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html b/phpBB/styles/subsilver2/template/ucp_zebra_foes.html
deleted file mode 100644
index 6149a80e69..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_TITLE}</th>
-</tr>
-<tr>
-	<td class="row3" colspan="2"><span class="gensmall">{L_FOES_EXPLAIN}</span></td>
-</tr>
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row1" width="40%"><b class="genmed">{L_YOUR_FOES}{L_COLON}</b><br /><span class="gensmall">{L_YOUR_FOES_EXPLAIN}</span></td>
-	<td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FOES}</b><!-- ENDIF --></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_ADD_FOES}{L_COLON}</b><br /><span class="gensmall">{L_ADD_FOES_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>
-	<td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td>
-</tr>
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html b/phpBB/styles/subsilver2/template/ucp_zebra_friends.html
deleted file mode 100644
index 3e18af9969..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th colspan="2" valign="middle">{L_TITLE}</th>
-</tr>
-<!-- EVENT ucp_friend_list_before -->
-<tr>
-	<td class="row3" colspan="2"><span class="gensmall">{L_FRIENDS_EXPLAIN}</span></td>
-</tr>
-<!-- IF ERROR -->
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td class="row1" width="40%"><b class="genmed">{L_YOUR_FRIENDS}{L_COLON}</b><br /><span class="gensmall">{L_YOUR_FRIENDS_EXPLAIN}</span></td>
-	<td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FRIENDS}</b><!-- ENDIF --></td>
-</tr>
-<!-- EVENT ucp_friend_list_after -->
-<tr>
-	<td class="row1"><b class="genmed">{L_ADD_FRIENDS}{L_COLON}</b><br /><span class="gensmall">{L_ADD_FRIENDS_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>
-	<td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td>
-</tr>
-<tr>
-	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
-</tr>
-</table>
-
-<!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
deleted file mode 100644
index e34d1807e6..0000000000
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ /dev/null
@@ -1,359 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<!-- IF S_FORUM_RULES -->
-	<div class="forumrules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">
-		<!-- IF U_FORUM_RULES -->
-			<h3>{L_FORUM_RULES}</h3><br />
-			<a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a>
-		<!-- ELSE -->
-			<h3>{L_FORUM_RULES}</h3><br />
-			{FORUM_RULES}
-		<!-- ENDIF -->
-	</div>
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_ACTIVE -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><span class="nav">{L_ACTIVE_TOPICS}</span></td>
-	</tr>
-
-	<tr>
-		<!-- IF S_TOPIC_ICONS -->
-			<th colspan="3">&nbsp;{L_TOPICS}&nbsp;</th>
-		<!-- ELSE -->
-			<th colspan="2">&nbsp;{L_TOPICS}&nbsp;</th>
-		<!-- ENDIF -->
-		<th>&nbsp;{L_AUTHOR}&nbsp;</th>
-		<th>&nbsp;{L_REPLIES}&nbsp;</th>
-		<th>&nbsp;{L_VIEWS}&nbsp;</th>
-		<th>&nbsp;{L_LAST_POST}&nbsp;</th>
-	</tr>
-
-	<!-- BEGIN topicrow -->
-
-		<tr>
-			<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
-			<!-- IF S_TOPIC_ICONS -->
-				<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
-			<!-- ENDIF -->
-			<td class="row1">
-				<!-- EVENT topiclist_row_prepend -->
-				<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
-				{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}"class="topictitle">{topicrow.TOPIC_TITLE}</a>
-				<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
-					<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
-				<!-- ENDIF -->
-				<!-- IF topicrow.S_TOPIC_DELETED -->
-					<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{DELETED_IMG}</a>&nbsp;
-				<!-- ENDIF -->
-				<!-- IF topicrow.S_TOPIC_REPORTED -->
-					<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
-				<!-- ENDIF -->
-				<!-- IF .topicrow.pagination -->
-					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON}
-					<!-- BEGIN pagination -->
-						<!-- IF topicrow.pagination.S_IS_PREV -->
-						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong>
-						<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS}
-						<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
-						<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>
-						<!-- ENDIF -->
-					<!-- END pagination -->
-					] </p>
-				<!-- ENDIF -->
-				<!-- EVENT topiclist_row_append -->
-			</td>
-			<td class="row2" width="130" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR_FULL}</p></td>
-			<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
-			<td class="row2" width="50" align="center"><p class="topicdetails">{topicrow.VIEWS}</p></td>
-			<td class="row1" width="140" align="center">
-				<p class="topicdetails" style="white-space: nowrap;">{topicrow.LAST_POST_TIME}</p>
-				<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
-					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-				</p>
-			</td>
-		</tr>
-
-	<!-- BEGINELSE -->
-
-		<tr>
-			<!-- IF S_TOPIC_ICONS -->
-				<td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
-			<!-- ELSE -->
-				<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
-			<!-- ENDIF -->
-		</tr>
-	<!-- END topicrow -->
-
-	<tr align="center">
-		<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->">&nbsp;</td>
-	</tr>
-	</table>
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-<!-- IF S_HAS_SUBFORUM -->
-	<!-- INCLUDE forumlist_body.html -->
-	<br clear="all" />
-<!-- ENDIF -->
-
-<!-- IF S_IS_POSTABLE or S_NO_READ_ACCESS -->
-	<div id="pageheader">
-		<h2><!-- EVENT viewforum_forum_name_prepend --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- EVENT viewforum_forum_name_append --></h2>
-
-		<!-- IF MODERATORS -->
-			<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>
-		<!-- ENDIF -->
-		<!-- IF U_MCP -->
-			<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
-		<!-- ENDIF -->
-	</div>
-
-	<br clear="all" /><br />
-<!-- ENDIF -->
-
-<div id="pagecontent">
-
-<!-- IF S_NO_READ_ACCESS -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row1" height="30" align="center" valign="middle"><span class="gen">{L_NO_READ_ACCESS}</span></td>
-	</tr>
-	</table>
-
-	<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
-
-		<br /><br />
-
-		<form method="post" action="{S_LOGIN_ACTION}">
-
-		<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td>
-		</tr>
-		<tr>
-			<td class="row1" align="center"><span class="genmed">{L_USERNAME}{L_COLON}</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="genmed">{L_PASSWORD}{L_COLON}</span> <input class="post" type="password" name="password" size="10" /><!-- IF S_AUTOLOGIN_ENABLED -->&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input type="checkbox" class="radio" name="autologin" /><!-- ENDIF -->&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
-		</tr>
-		</table>
-		{S_LOGIN_REDIRECT}
-		</form>
-
-	<!-- ENDIF -->
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-	<!-- IF S_DISPLAY_POST_INFO or TOTAL_TOPICS -->
-		<table width="100%" cellspacing="1">
-		<tr>
-			<!-- IF S_DISPLAY_POST_INFO and not S_IS_BOT -->
-				<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle"><a href="{U_POST_NEW_TOPIC}" class="imageset">{POST_IMG}</a></td>
-			<!-- ENDIF -->
-			<!-- IF TOTAL_TOPICS -->
-				<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-				<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]&nbsp;</td>
-				<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-			<!-- ENDIF -->
-		</tr>
-		</table>
-	<!-- ENDIF -->
-
-	<!-- IF not S_DISPLAY_ACTIVE and (S_IS_POSTABLE or .topicrow) -->
-		<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->">
-				<table width="100%" cellspacing="0">
-				<tr class="nav">
-					<td valign="middle">&nbsp;<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --><a href="{U_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td>
-					<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF -->&nbsp;</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-
-		<tr>
-			<!-- IF S_TOPIC_ICONS -->
-				<th colspan="3">&nbsp;{L_TOPICS}&nbsp;</th>
-			<!-- ELSE -->
-				<th colspan="2">&nbsp;{L_TOPICS}&nbsp;</th>
-			<!-- ENDIF -->
-			<th>&nbsp;{L_AUTHOR}&nbsp;</th>
-			<th>&nbsp;{L_REPLIES}&nbsp;</th>
-			<th>&nbsp;{L_VIEWS}&nbsp;</th>
-			<th>&nbsp;{L_LAST_POST}&nbsp;</th>
-		</tr>
-
-		<!-- BEGIN topicrow -->
-
-			<!-- IF topicrow.S_TOPIC_TYPE_SWITCH eq 1 -->
-				<tr>
-					<td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_ANNOUNCEMENTS}</b></td>
-				</tr>
-			<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH eq 0 -->
-				<tr>
-					<td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_TOPICS}</b></td>
-				</tr>
-			<!-- ENDIF -->
-
-			<tr>
-				<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
-				<!-- IF S_TOPIC_ICONS -->
-					<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
-				<!-- ENDIF -->
-				<td class="row1">
-					<!-- EVENT topiclist_row_prepend -->
-					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
-					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF -->
-					<a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
-						<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
-					<!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_DELETED -->
-						<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{DELETED_IMG}</a>&nbsp;
-					<!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED -->
-						<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
-					<!-- ENDIF -->
-					<!-- IF .topicrow.pagination -->
-						<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON}
-						<!-- BEGIN pagination -->
-							<!-- IF topicrow.pagination.S_IS_PREV -->
-							<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong>
-							<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS}
-							<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
-							<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>
-							<!-- ENDIF -->
-						<!-- END pagination -->
-						] </p>
-					<!-- ENDIF -->
-					<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><p class="gensmall">{L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></p><!-- ENDIF -->
-					<!-- EVENT topiclist_row_append -->
-				</td>
-				<td class="row2" width="130" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR_FULL}</p></td>
-				<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
-				<td class="row2" width="50" align="center"><p class="topicdetails">{topicrow.VIEWS}</p></td>
-				<td class="row1" width="140" align="center">
-					<p class="topicdetails" style="white-space: nowrap;">{topicrow.LAST_POST_TIME}</p>
-					<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
-						<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-					</p>
-				</td>
-			</tr>
-
-		<!-- BEGINELSE -->
-			<!-- IF S_IS_POSTABLE -->
-			<tr>
-				<!-- IF S_TOPIC_ICONS -->
-					<td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
-				<!-- ELSE -->
-					<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
-				<!-- ENDIF -->
-			</tr>
-			<!-- ENDIF -->
-		<!-- END topicrow -->
-
-		<!-- IF not S_IS_BOT -->
-		<tr align="center">
-			<!-- IF S_TOPIC_ICONS -->
-				<td class="cat" colspan="7">
-			<!-- ELSE -->
-				<td class="cat" colspan="6">
-			<!-- ENDIF -->
-					<form method="post" action="{S_FORUM_ACTION}"><span class="gensmall">{L_DISPLAY_TOPICS}{L_COLON}</span>&nbsp;{S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></form>
-				</td>
-		</tr>
-		<!-- ENDIF -->
-		</table>
-	<!-- ENDIF -->
-
-	<!-- IF S_DISPLAY_POST_INFO or TOTAL_TOPICS -->
-		<table width="100%" cellspacing="1">
-		<tr>
-			<!-- IF S_DISPLAY_POST_INFO and not S_IS_BOT -->
-				<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle"><a href="{U_POST_NEW_TOPIC}" class="imageset">{POST_IMG}</a></td>
-			<!-- ENDIF -->
-			<!-- IF TOTAL_TOPICS -->
-				<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-				<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]&nbsp;</td>
-				<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-			<!-- ENDIF -->
-		</tr>
-		</table>
-	<!-- ENDIF -->
-
-		<br clear="all" />
-</div>
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<!-- IF S_DISPLAY_ONLINE_LIST -->
-	<br clear="all" />
-
-	<table class="tablebg stat-block online-list" width="100%" cellspacing="1">
-	<tr>
-		<td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td>
-	</tr>
-	<tr>
-		<td class="row1"><p class="gensmall">{LOGGED_IN_USER_LIST}</p></td>
-	</tr>
-	</table>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_POST_INFO -->
-	<br clear="all" />
-
-	<table width="100%" cellspacing="0">
-	<tr>
-		<td align="{S_CONTENT_FLOW_BEGIN}" valign="top">
-			<table cellspacing="3" cellpadding="0" border="0">
-			<tr>
-				<td width="20" style="text-align: center;">{FOLDER_UNREAD_IMG}</td>
-				<td class="gensmall">{L_UNREAD_POSTS}</td>
-				<td>&nbsp;&nbsp;</td>
-				<td width="20" style="text-align: center;">{FOLDER_IMG}</td>
-				<td class="gensmall">{L_NO_UNREAD_POSTS}</td>
-				<td>&nbsp;&nbsp;</td>
-				<td width="20" style="text-align: center;">{FOLDER_ANNOUNCE_IMG}</td>
-				<td class="gensmall">{L_ICON_ANNOUNCEMENT}</td>
-			</tr>
-			<tr>
-				<td style="text-align: center;">{FOLDER_HOT_UNREAD_IMG}</td>
-				<td class="gensmall">{L_UNREAD_POSTS_HOT}</td>
-				<td>&nbsp;&nbsp;</td>
-				<td style="text-align: center;">{FOLDER_HOT_IMG}</td>
-				<td class="gensmall">{L_NO_UNREAD_POSTS_HOT}</td>
-				<td>&nbsp;&nbsp;</td>
-				<td style="text-align: center;">{FOLDER_STICKY_IMG}</td>
-				<td class="gensmall">{L_ICON_STICKY}</td>
-			</tr>
-			<tr>
-				<td style="text-align: center;">{FOLDER_LOCKED_UNREAD_IMG}</td>
-				<td class="gensmall">{L_UNREAD_POSTS_LOCKED}</td>
-				<td>&nbsp;&nbsp;</td>
-				<td style="text-align: center;">{FOLDER_LOCKED_IMG}</td>
-				<td class="gensmall">{L_NO_UNREAD_POSTS_LOCKED}</td>
-				<td>&nbsp;&nbsp;</td>
-				<td style="text-align: center;">{FOLDER_MOVED_IMG}</td>
-				<td class="gensmall">{L_TOPIC_MOVED}</td>
-			</tr>
-			</table>
-		</td>
-		<td align="{S_CONTENT_FLOW_END}"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td>
-	</tr>
-	</table>
-<!-- ENDIF -->
-
-<br clear="all" />
-
-<table width="100%" cellspacing="0">
-<tr>
-	<td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td>
-	<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></td>
-</tr>
-</table>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/viewonline_body.html b/phpBB/styles/subsilver2/template/viewonline_body.html
deleted file mode 100644
index 70b8b52efa..0000000000
--- a/phpBB/styles/subsilver2/template/viewonline_body.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h4>{TOTAL_REGISTERED_USERS_ONLINE}</h4>
-<h4>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> [ <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a> ]<!-- ENDIF --></h4>
-<br />
-
-<!-- IF .pagination -->
-	<table width="100%" cellspacing="1">
-	<tr>
-		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-		<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-	</tr>
-	</table>
-<!-- ENDIF -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr>
-	<th width="40%"><a href="{U_SORT_USERNAME}">{L_USERNAME}</a></th>
-	<th width="20%"><a href="{U_SORT_UPDATED}">{L_LAST_UPDATED}</a></th>
-	<th width="40%"><a href="{U_SORT_LOCATION}">{L_FORUM_LOCATION}</a></th>
-</tr>
-<!-- BEGIN user_row -->
-	<tr>
-		<td class="row1"><p class="gen">{user_row.USERNAME_FULL}</p><!-- IF user_row.USER_IP --><p class="gensmall">{L_IP}{L_COLON} <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> &#187; <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></p><!-- ENDIF -->
-			<!-- IF user_row.USER_BROWSER -->{user_row.USER_BROWSER}<!-- ENDIF --></td>
-		<td class="row2" align="center" nowrap="nowrap"><p class="genmed">&nbsp;{user_row.LASTUPDATE}</p></td>
-		<td class="row1"><p class="genmed"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></p></td>
-	</tr>
-<!-- END user_row -->
-
-<!-- IF LEGEND -->
-	<tr>
-		<td class="row1" colspan="3"><b class="gensmall">{L_LEGEND} :: {LEGEND}</b></td>
-	</tr>
-<!-- ENDIF -->
-</table>
-
-<!-- IF .pagination -->
-	<table width="100%" cellspacing="1">
-	<tr>
-		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-		<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-	</tr>
-	</table>
-<!-- ENDIF -->
-
-<div class="gensmall" align="{S_CONTENT_FLOW_END}">{L_ONLINE_EXPLAIN}</div>
-
-<br clear="all" />
-
-<!-- INCLUDE breadcrumbs.html -->
-
-<br clear="all" />
-
-<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/viewonline_whois.html b/phpBB/styles/subsilver2/template/viewonline_whois.html
deleted file mode 100644
index ca5b326df8..0000000000
--- a/phpBB/styles/subsilver2/template/viewonline_whois.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<table class="tablebg" width="100%" cellspacing="1">
-<tr> 
-	<th>{L_WHOIS}</th>
-</tr>
-<tr>
-	<td class="row1"><pre>{WHOIS}</pre><br /><a class="nav" href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></td>
-</tr>
-</table>
-
-<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
deleted file mode 100644
index 0f34b50950..0000000000
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ /dev/null
@@ -1,440 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<!-- IF S_FORUM_RULES -->
-	<div class="forumrules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">
-		<!-- IF U_FORUM_RULES -->
-			<h3>{L_FORUM_RULES}</h3><br />
-			<a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a>
-		<!-- ELSE -->
-			<h3>{L_FORUM_RULES}</h3><br />
-			{FORUM_RULES}
-		<!-- ENDIF -->
-	</div>
-
-	<br clear="all" />
-<!-- ENDIF -->
-
-<div id="pageheader">
-	<h2><!-- EVENT viewtopic_topic_title_prepend --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT viewtopic_topic_title_append --></h2>
-
-<!-- IF MODERATORS -->
-	<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>
-<!-- ENDIF -->
-<!-- IF U_MCP -->
-	<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
-<!-- ENDIF -->
-</div>
-
-<br clear="all" /><br />
-
-<div id="pagecontent">
-
-	<table width="100%" cellspacing="1">
-	<tr>
-		<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle" nowrap="nowrap">
-		<!-- IF not S_IS_BOT -->
-			<!-- IF S_DISPLAY_POST_INFO --><a href="{U_POST_NEW_TOPIC}" class="imageset">{POST_IMG}</a>&nbsp;<!-- ENDIF -->
-			<!-- IF S_DISPLAY_REPLY_INFO --><a href="{U_POST_REPLY_TOPIC}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->
-		<!-- ENDIF -->
-		</td>
-		<!-- IF TOTAL_POSTS -->
-			<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-			<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_POSTS} ]&nbsp;</td>
-			<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-		<!-- ENDIF -->
-	</tr>
-	</table>
-
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="cat">
-			<table width="100%" cellspacing="0">
-			<tr>
-				<td class="nav" nowrap="nowrap">&nbsp;
-				<!-- IF not S_IS_BOT -->
-					<!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}">{S_WATCH_TOPIC_TITLE}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC or U_BOOKMARK_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
-					<!-- IF U_BOOKMARK_TOPIC --><a href="{U_BOOKMARK_TOPIC}" title="{S_BOOKMARK_TOPIC}">{S_BOOKMARK_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
-					<!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">{L_PRINT_TOPIC}</a><!-- IF U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
-					<!-- IF U_EMAIL_TOPIC --><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a><!-- IF U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
-					<!-- IF U_BUMP_TOPIC --><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a><!-- ENDIF -->
-				<!-- ENDIF -->
-				</td>
-				<td class="nav" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><a href="{U_VIEW_OLDER_TOPIC}">{L_VIEW_PREVIOUS_TOPIC}</a><!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --> | <a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a><!-- ENDIF --> | <a href="{U_VIEW_NEWER_TOPIC}">{L_VIEW_NEXT_TOPIC}</a>&nbsp;</td>
-			</tr>
-			</table>
-		</td>
-	</tr>
-<!-- IF S_HAS_POLL -->
-	<tr>
-		<td class="row2" colspan="2" align="center"><br clear="all" />
-
-			<form method="post" action="{S_POLL_ACTION}">
-
-			<table cellspacing="0" cellpadding="4" border="0" align="center">
-			<tr>
-				<td align="center"><span class="gen"><!-- EVENT viewtopic_body_poll_question_prepend --><b>{POLL_QUESTION}</b><!-- EVENT viewtopic_body_poll_question_append --></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
-			</tr>
-			<tr>
-				<td align="{S_CONTENT_FLOW_BEGIN}">
-					<table cellspacing="0" cellpadding="2" border="0">
-				<!-- BEGIN poll_option -->
-					<tr>
-					<!-- EVENT viewtopic_body_poll_option_before -->
-					<!-- IF S_CAN_VOTE -->
-						<td<!-- IF poll_option.POLL_OPTION_MOST_VOTES --> class="most-votes"<!-- ENDIF -->>
-							<!-- IF S_IS_MULTI_CHOICE -->
-								<input type="checkbox" class="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> />
-							<!-- ELSE -->
-								<input type="radio" class="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> />
-							<!-- ENDIF -->
-						</td>
-					<!-- ENDIF -->
-						<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
-						<!-- IF S_DISPLAY_RESULTS -->
-							<td dir="ltr">{POLL_LEFT_CAP_IMG}<span class="imageset poll_center" style="width: {poll_option.POLL_OPTION_WIDTH}px; background-repeat: repeat-x;">{poll_option.POLL_OPTION_PERCENT}</span>{POLL_RIGHT_CAP_IMG}</td>
-							<td class="gen" align="{S_CONTENT_FLOW_END}"><b>&nbsp;{poll_option.POLL_OPTION_PERCENT}&nbsp;</b></td>
-							<td class="gen" align="center">[ {poll_option.POLL_OPTION_RESULT} ]</td>
-							<!-- IF poll_option.POLL_OPTION_VOTED -->
-								<td class="gensmall" valign="top"><b title="{L_POLL_VOTED_OPTION}">x</b></td>
-							<!-- ENDIF -->
-						<!-- ENDIF -->
-					<!-- EVENT viewtopic_body_poll_option_after -->
-					</tr>
-				<!-- END poll_option -->
-					</table>
-				</td>
-			</tr>
-		<!-- IF S_CAN_VOTE -->
-			<tr>
-				<td align="center"><span class="gensmall">{L_MAX_VOTES}</span><br /><br /><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="btnlite" /></td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_RESULTS -->
-			<tr>
-				<td class="gensmall" colspan="4" align="center"><b>{L_TOTAL_VOTES}{L_COLON} {TOTAL_VOTES}</b></td>
-			</tr>
-		<!-- ELSE -->
-			<tr>
-				<td align="center"><span class="gensmall"><b><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></b></span></td>
-			</tr>
-		<!-- ENDIF -->
-			</table>
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			</form>
-
-		</td>
-	</tr>
-<!-- ENDIF -->
-	</table>
-
-<!-- BEGIN postrow -->
-	<!-- EVENT viewtopic_body_postrow_post_before -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<!-- IF postrow.S_FIRST_ROW -->
-		<tr>
-			<th>{L_AUTHOR}</th>
-			<th>{L_MESSAGE}</th>
-		</tr>
-	<!-- ENDIF -->
-	<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-	<!-- IF postrow.S_POST_HIDDEN -->
-			<td class="gensmall" colspan="2" height="25" align="center">
-				<!-- IF postrow.S_FIRST_UNREAD --><a id="unread" class="anchor" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF -->
-				<a name="p{postrow.POST_ID}" class="anchor"></a>
-				<!-- IF postrow.S_POST_HIDDEN -->
-					<!-- IF postrow.S_POST_DELETED -->
-						{postrow.L_POST_DELETED_MESSAGE}
-					<!-- ELSEIF postrow.S_IGNORE_POST -->
-						{postrow.L_IGNORE_POST}
-					<!-- ENDIF -->
-					<br />{postrow.L_POST_DISPLAY}
-				<!-- ENDIF -->
-			</td>
-	<!-- ELSE -->
-
-			<td align="center" valign="middle">
-				<!-- IF postrow.S_FIRST_UNREAD -->
-					<a id="unread" class="anchor"<!-- IF S_UNREAD_VIEW --> data-url="{postrow.U_MINI_POST}"<!-- ENDIF -->></a>
-				<!-- ENDIF -->
-				<a name="p{postrow.POST_ID}" class="anchor"></a>
-				<b class="postauthor"<!-- IF postrow.POST_AUTHOR_COLOUR --> style="color: {postrow.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{postrow.POST_AUTHOR}</b>
-			</td>
-			<td width="100%" height="25">
-				<table width="100%" cellspacing="0">
-				<tr>
-				<!-- IF postrow.POST_ICON_IMG -->
-					<td><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" title="" /></td>
-				<!-- ENDIF -->
-					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<b>{L_POST_SUBJECT}{L_COLON}</b> <a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}" class="imageset">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}{L_COLON}</b> {postrow.POST_DATE}&nbsp;</div></td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-
-		<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-			<td valign="top" class="profile">
-				<table cellspacing="4" align="center" width="150">
-			<!-- IF postrow.ONLINE_IMG -->
-				<tr>
-					<td>{postrow.ONLINE_IMG}</td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- IF postrow.RANK_TITLE -->
-				<tr>
-					<td class="postdetails">{postrow.RANK_TITLE}</td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- IF postrow.RANK_IMG -->
-				<tr>
-					<td>{postrow.RANK_IMG}</td>
-				</tr>
-			<!-- ENDIF -->
-
-			<!-- EVENT viewtopic_body_avatar_before -->
-			<!-- IF postrow.POSTER_AVATAR -->
-				<tr>
-					<td>{postrow.POSTER_AVATAR}</td>
-				</tr>
-			<!-- ENDIF -->
-			<!-- EVENT viewtopic_body_avatar_after -->
-
-			<!-- IF not (postrow.ONLINE_IMG or postrow.RANK_TITLE or postrow.RANK_IMG or postrow.POSTER_AVATAR) -->
-				<tr>
-					<td></td>
-				</tr>
-			<!-- ENDIF -->
-				</table>
-
-				<span class="postdetails">
-					<!-- IF postrow.POSTER_JOINED --><br /><b>{L_JOINED}{L_COLON}</b> {postrow.POSTER_JOINED}<!-- ENDIF -->
-					<!-- IF postrow.POSTER_POSTS != '' --><br /><b>{L_POSTS}{L_COLON}</b> {postrow.POSTER_POSTS}<!-- ENDIF -->
-					<!-- IF postrow.POSTER_WARNINGS --><br /><b>{L_WARNINGS}{L_COLON}</b> {postrow.POSTER_WARNINGS}<!-- ENDIF -->
-
-					<!-- IF postrow.S_PROFILE_FIELD1 -->
-						<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-						<br /><b>{postrow.PROFILE_FIELD1_NAME}{L_COLON}</b> {postrow.PROFILE_FIELD1_VALUE}
-					<!-- ENDIF -->
-
-					<!-- EVENT viewtopic_body_postrow_custom_fields_before -->
-					<!-- BEGIN custom_fields -->
-						<!-- IF not postrow.custom_fields.S_PROFILE_CONTACT -->
-						<br /><b>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</b> {postrow.custom_fields.PROFILE_FIELD_VALUE}
-						<!-- ENDIF -->
-					<!-- END custom_fields -->
-					<!-- EVENT viewtopic_body_postrow_custom_fields_after -->
-				</span>
-
-			</td>
-			<td valign="top">
-				<table width="100%" cellspacing="5">
-				<tr>
-					<td>
-					<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_DELETED or postrow.S_POST_REPORTED -->
-						<table width="100%" cellspacing="0">
-						<tr>
-							<td class="gensmall">
-								<!-- IF postrow.S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span><br /> <!-- ENDIF -->
-								<!-- IF postrow.S_POST_DELETED --><span class="postapprove">{DELETED_IMG} <a href="{postrow.U_MCP_RESTORE}">{L_POST_DELETED}</a></span><br /> <!-- ENDIF -->
-								<!-- IF postrow.S_POST_REPORTED --><span class="postreported">{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF -->
-							</td>
-						</tr>
-						</table>
-
-						<br clear="all" />
-					<!-- ENDIF -->
-
-						<div class="postbody">{postrow.MESSAGE}</div>
-
-					<!-- IF postrow.S_HAS_ATTACHMENTS -->
-						<br clear="all" /><br />
-
-						<table class="tablebg" width="100%" cellspacing="1">
-						<tr>
-							<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>
-						</tr>
-						<!-- BEGIN attachment -->
-							<tr>
-								<!-- IF postrow.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{postrow.attachment.DISPLAY_ATTACHMENT}</td>
-							</tr>
-						<!-- END attachment -->
-						</table>
-					<!-- ENDIF -->
-
-					<!-- IF postrow.S_DISPLAY_NOTICE -->
-						<span class="gensmall error"><br /><br />{L_DOWNLOAD_NOTICE}</span>
-					<!-- ENDIF -->
-					<!-- IF postrow.SIGNATURE -->
-						<div class="postbody"><br />_________________<br />{postrow.SIGNATURE}</div>
-					<!-- ENDIF -->
-
-					<!-- EVENT viewtopic_body_postrow_post_notices_before -->
-					<!-- IF postrow.DELETED_MESSAGE or postrow.DELETE_REASON -->
-						<!-- IF postrow.DELETE_REASON -->
-							<br /><br />
-							<table class="tablebg" width="100%" cellspacing="1">
-							<tr>
-								<td class="row3"><span class="gensmall">{postrow.DELETED_MESSAGE}</span></td>
-							</tr>
-							<tr>
-								<td class="row2"><span class="genmed">{postrow.DELETE_REASON}</span></td>
-							</tr>
-							</table>
-						<!-- ELSE -->
-							<br /><br />
-							<span class="gensmall">{postrow.DELETED_MESSAGE}</span>
-						<!-- ENDIF -->
-					<!-- ELSEIF postrow.EDITED_MESSAGE or postrow.EDIT_REASON -->
-						<!-- IF postrow.EDIT_REASON -->
-							<br /><br />
-							<table class="tablebg" width="100%" cellspacing="1">
-							<tr>
-								<td class="row3"><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
-							</tr>
-							<tr>
-								<td class="row2"><span class="genmed">{postrow.EDIT_REASON}</span></td>
-							</tr>
-							</table>
-						<!-- ELSE -->
-							<br /><br />
-							<span class="gensmall">{postrow.EDITED_MESSAGE}</span>
-						<!-- ENDIF -->
-					<!-- ENDIF -->
-
-					<!-- IF postrow.BUMPED_MESSAGE -->
-						<span class="gensmall"><br /><br />{postrow.BUMPED_MESSAGE}</span>
-					<!-- ENDIF -->
-					<!-- EVENT viewtopic_body_postrow_post_notices_after -->
-
-					<!-- IF not postrow.S_HAS_ATTACHMENTS --><br clear="all" /><br /><!-- ENDIF -->
-
-						<table width="100%" cellspacing="0">
-						<tr valign="middle">
-							<td class="gensmall" align="{S_CONTENT_FLOW_END}">
-							<!-- IF not S_IS_BOT -->
-								<!-- IF postrow.U_REPORT --><a href="{postrow.U_REPORT}" class="imageset">{REPORT_IMG}</a> <!-- ENDIF -->
-								<!-- IF postrow.U_INFO --><a href="{postrow.U_INFO}" class="imageset">{INFO_IMG}</a> <!-- ENDIF -->
-								<!-- IF postrow.U_WARN --><a href="{postrow.U_WARN}" class="imageset">{WARN_IMG}</a> <!-- ENDIF -->
-								<!-- IF postrow.U_DELETE --><a href="{postrow.U_DELETE}" class="imageset">{DELETE_IMG}</a> <!-- ENDIF -->
-							<!-- ENDIF -->
-							</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-
-		<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-			<td class="profile"><strong><a href="#wrapheader">{L_BACK_TO_TOP}</a></strong></td>
-			<td>
-				<div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">
-					&nbsp;<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}" class="imageset">{PROFILE_IMG}</a><!-- ENDIF -->
-					<!-- IF postrow.U_PM --><a href="{postrow.U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF -->
-					<!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}" class="imageset">{EMAIL_IMG}</a><!-- ENDIF -->
-				&nbsp;</div>
-				<div class="gensmall" style="float: {S_CONTENT_FLOW_END};">
-					<!-- EVENT viewtopic_body_post_buttons_before -->
-					<!-- IF not S_IS_BOT -->
-						<!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}" class="imageset">{EDIT_IMG}</a><!-- ENDIF -->
-						<!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}" class="imageset">{QUOTE_IMG}</a><!-- ENDIF -->
-					<!-- ENDIF -->
-					<!-- EVENT viewtopic_body_post_buttons_after -->
-				&nbsp;</div>
-			</td>
-	<!-- ENDIF -->
-		</tr>
-
-	<tr>
-		<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-	</tr>
-	</table>
-	<!-- EVENT viewtopic_body_postrow_post_after -->
-<!-- END postrow -->
-
-	<!-- IF not S_IS_BOT -->
-	<table width="100%" cellspacing="1" class="tablebg">
-	<tr align="center">
-		<td class="cat"><form name="viewtopic" method="post" action="{S_TOPIC_ACTION}"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></form></td>
-	</tr>
-	</table>
-	<!-- ENDIF -->
-
-	<!-- EVENT viewtopic_body_topic_actions_before -->
-
-	<table width="100%" cellspacing="1">
-	<tr>
-		<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle" nowrap="nowrap">
-		<!-- IF not S_IS_BOT -->
-			<!-- IF S_DISPLAY_POST_INFO --><a href="{U_POST_NEW_TOPIC}" class="imageset">{POST_IMG}</a>&nbsp;<!-- ENDIF -->
-			<!-- IF S_DISPLAY_REPLY_INFO --><a href="{U_POST_REPLY_TOPIC}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->
-		<!-- ENDIF -->
-		</td>
-		<!-- IF TOTAL_POSTS -->
-			<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-			<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_POSTS} ]&nbsp;</td>
-			<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-		<!-- ENDIF -->
-	</tr>
-	</table>
-
-</div>
-
-<div id="pagefooter"></div>
-
-<br clear="all" />
-<!-- IF S_QUICK_REPLY -->
-<!-- INCLUDE quickreply_editor.html -->
-<!-- ENDIF -->
-
-<!-- EVENT viewtopic_body_footer_before -->
-<!-- INCLUDE breadcrumbs.html -->
-
-<!-- IF S_DISPLAY_ONLINE_LIST -->
-	<br clear="all" />
-
-	<table class="tablebg stat-block online-list" width="100%" cellspacing="1">
-	<tr>
-		<td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td>
-	</tr>
-	<tr>
-		<td class="row1"><p class="gensmall">{LOGGED_IN_USER_LIST}</p></td>
-	</tr>
-	</table>
-<!-- ENDIF -->
-
-<br clear="all" />
-
-<table width="100%" cellspacing="1">
-<tr>
-	<td width="40%" valign="top" nowrap="nowrap" align="{S_CONTENT_FLOW_BEGIN}">
-	<!-- IF .quickmod -->
-		<form method="post" action="{S_MOD_ACTION}">
-			<span class="gensmall">{L_QUICK_MOD}{L_COLON}</span>
-			<select name="action" id="quick-mod-select">
-				<!-- BEGIN quickmod -->
-				<option value="{quickmod.VALUE}">{quickmod.TITLE}</option>
-				<!-- END quickmod -->
-			</select>
-			<input class="btnlite" type="submit" value="{L_GO}" />
-		</form>
-	<!-- ENDIF -->
-	</td>
-	<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td>
-</tr>
-</table>
-
-<br clear="all" />
-
-<table width="100%" cellspacing="0">
-<tr>
-	<td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td>
-	<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></td>
-</tr>
-</table>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
deleted file mode 100644
index a99d807cf2..0000000000
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
-<head>
-<meta charset="utf-8">
-<meta name="robots" content="noindex" />
-<title>{SITENAME} :: {PAGE_TITLE}</title>
-
-<style type="text/css">
-<!--
-
-body {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-}
-
-img {
-	border: 0;
-}
-
-td {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-	line-height: 150%;
-}
-
-.code, .codecontent, 
-.quote, .quotecontent {
-	margin: 0 5px 0 5px;
-	padding: 5px;
-	font-size: smaller;
-	border: black solid 1px;
-}
-
-.quotetitle {
-	color: black;
-	display : block;
-	font-weight: bold;
-}
-
-.forum {
-	font-family: Arial,Helvetica,sans-serif;
-	font-weight: bold;
-	font-size: 18pt;
-}
-
-.topic {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 14pt;
-	font-weight: bold;
-}
-
-.gensmall {
-	font-size: 8pt;
-}
-
-hr {
-	color: #888;
-	height: 3px;
-	border-style: solid;
-}
-
-hr.sep {
-	color: #aaa;
-	height: 1px;
-	border-style: dashed;
-}
-//-->
-</style>
-<!-- EVENT viewtopic_print_head_append -->
-</head>
-<body>
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall"><a href="{U_FORUM}">{U_FORUM}</a></span></td>
-</tr>
-<tr>
-	<td colspan="2"><br /></td>
-</tr>
-<tr>
-	<td><span class="topic">{TOPIC_TITLE}</span><br /><span class="gensmall"><a href="{U_TOPIC}">{U_TOPIC}</a></span></td>
-	<td align="{S_CONTENT_FLOW_END}" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td>
-</tr>
-</table>
-
-<!-- BEGIN postrow -->
-
-	<hr width="85%" />
-
-	<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_AUTHOR}{L_COLON}&nbsp;</td>
-		<td><b>{postrow.POST_AUTHOR}</b> [ {postrow.POST_DATE} ]</td>
-	</tr>
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_POST_SUBJECT}{L_COLON}&nbsp;</td>
-		<td><b>{postrow.POST_SUBJECT}</b></td>
-	</tr>
-	<tr>
-		<td colspan="2"><hr class="sep" />{postrow.MESSAGE}
-
-		<!-- IF postrow.S_HAS_ATTACHMENTS -->
-			<br clear="all" /><br />
-
-			<table class="tablebg" width="100%" cellspacing="1">
-			<tr>
-				<td><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>
-			</tr>
-			<!-- BEGIN attachment -->
-				<tr>
-					<td>{postrow.attachment.DISPLAY_ATTACHMENT}</td>
-				</tr>
-			<!-- END attachment -->
-			</table>
-		<!-- ENDIF -->
-
-		</td>
-	</tr>
-	</table>
-<!-- END postrow -->
-
-<hr width="85%" />
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td><span class="gensmall">{PAGE_NUMBER}</span></td>
-	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
-</tr>
-<tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</span></td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/phpBB/styles/subsilver2/theme/en/button_pm_new.gif b/phpBB/styles/subsilver2/theme/en/button_pm_new.gif
deleted file mode 100644
index 07df748d3a..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/button_pm_new.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_pm_reply.gif b/phpBB/styles/subsilver2/theme/en/button_pm_reply.gif
deleted file mode 100644
index c476f06a44..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/button_pm_reply.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_topic_locked.gif b/phpBB/styles/subsilver2/theme/en/button_topic_locked.gif
deleted file mode 100644
index 124a2d4a7d..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/button_topic_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_topic_new.gif b/phpBB/styles/subsilver2/theme/en/button_topic_new.gif
deleted file mode 100644
index 66e1007129..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/button_topic_new.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_topic_reply.gif b/phpBB/styles/subsilver2/theme/en/button_topic_reply.gif
deleted file mode 100644
index e8fe5115a0..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/button_topic_reply.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_aim.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_aim.gif
deleted file mode 100644
index c6533e2817..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_contact_aim.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_email.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_email.gif
deleted file mode 100644
index f126a1960d..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_contact_email.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_icq.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_icq.gif
deleted file mode 100644
index ba3fa12436..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_contact_icq.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_jabber.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_jabber.gif
deleted file mode 100644
index be2e53f9c2..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_contact_jabber.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_msnm.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_msnm.gif
deleted file mode 100644
index 1bf681e9a2..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_contact_msnm.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_pm.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_pm.gif
deleted file mode 100644
index 26ac558c2f..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_contact_pm.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_www.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_www.gif
deleted file mode 100644
index 14a33b36a5..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_contact_www.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_yahoo.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_yahoo.gif
deleted file mode 100644
index d11711789f..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_contact_yahoo.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_delete.gif b/phpBB/styles/subsilver2/theme/en/icon_post_delete.gif
deleted file mode 100644
index e008e5ff9f..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_post_delete.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_edit.gif b/phpBB/styles/subsilver2/theme/en/icon_post_edit.gif
deleted file mode 100644
index 1511ee34d3..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_post_edit.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_info.gif b/phpBB/styles/subsilver2/theme/en/icon_post_info.gif
deleted file mode 100644
index 166de2724f..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_post_info.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_quote.gif b/phpBB/styles/subsilver2/theme/en/icon_post_quote.gif
deleted file mode 100644
index 4cf103280c..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_post_quote.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_report.gif b/phpBB/styles/subsilver2/theme/en/icon_post_report.gif
deleted file mode 100644
index 9a3f65b1e3..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_post_report.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_offline.gif b/phpBB/styles/subsilver2/theme/en/icon_user_offline.gif
deleted file mode 100644
index 3065f4d7fe..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_user_offline.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_online.gif b/phpBB/styles/subsilver2/theme/en/icon_user_online.gif
deleted file mode 100644
index b950612c57..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_user_online.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_profile.gif b/phpBB/styles/subsilver2/theme/en/icon_user_profile.gif
deleted file mode 100644
index d9cf7f4c4a..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_user_profile.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_search.gif b/phpBB/styles/subsilver2/theme/en/icon_user_search.gif
deleted file mode 100644
index 46475fbf4c..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_user_search.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_warn.gif b/phpBB/styles/subsilver2/theme/en/icon_user_warn.gif
deleted file mode 100644
index 44cbcc953a..0000000000
Binary files a/phpBB/styles/subsilver2/theme/en/icon_user_warn.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css
deleted file mode 100644
index 57f9fce26d..0000000000
--- a/phpBB/styles/subsilver2/theme/en/stylesheet.css
+++ /dev/null
@@ -1,116 +0,0 @@
-/* EN Language Pack */
-.imageset.phpbb_aol-icon, .imageset.icon_contact_aim {
-	background-image: url("./icon_contact_aim.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_contact_email {
-	background-image: url("./icon_contact_email.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.phpbb_icq-icon, .imageset.icon_contact_icq {
-	background-image: url("./icon_contact_icq.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_contact_jabber {
-	background-image: url("./icon_contact_jabber.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.phpbb_wlm-icon, .imageset.icon_contact_msnm {
-	background-image: url("./icon_contact_msnm.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_contact_pm {
-	background-image: url("./icon_contact_pm.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.phpbb_yahoo-icon, .imageset.icon_contact_yahoo {
-	background-image: url("./icon_contact_yahoo.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.phpbb_website-icon, .imageset.icon_contact_www {
-	background-image: url("./icon_contact_www.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_post_delete {
-	background-image: url("./icon_post_delete.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
-.imageset.icon_post_edit {
-	background-image: url("./icon_post_edit.gif");
-	padding-left: 90px;
-	padding-top: 20px;
-}
-.imageset.icon_post_info {
-	background-image: url("./icon_post_info.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
-.imageset.icon_post_quote {
-	background-image: url("./icon_post_quote.gif");
-	padding-left: 90px;
-	padding-top: 20px;
-}
-.imageset.icon_post_report {
-	background-image: url("./icon_post_report.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
-.imageset.icon_user_online {
-	background-image: url("./icon_user_online.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_user_offline {
-	background-image: url("./icon_user_offline.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_user_profile {
-	background-image: url("./icon_user_profile.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_user_search {
-	background-image: url("./icon_user_search.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_user_warn {
-	background-image: url("./icon_user_warn.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
-.imageset.button_pm_new {
-	background-image: url("./button_pm_new.gif");
-	padding-left: 97px;
-	padding-top: 27px;
-}
-.imageset.button_pm_reply {
-	background-image: url("./button_pm_reply.gif");
-	padding-left: 90px;
-	padding-top: 20px;
-}
-.imageset.button_topic_locked {
-	background-image: url("./button_topic_locked.gif");
-	padding-left: 97px;
-	padding-top: 27px;
-}
-.imageset.button_topic_new {
-	background-image: url("./button_topic_new.gif");
-	padding-left: 97px;
-	padding-top: 27px;
-}
-.imageset.button_topic_reply {
-	background-image: url("./button_topic_reply.gif");
-	padding-left: 97px;
-	padding-top: 27px;
-}
diff --git a/phpBB/styles/subsilver2/theme/images/announce_read.gif b/phpBB/styles/subsilver2/theme/images/announce_read.gif
deleted file mode 100644
index 0589feb14f..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/announce_read.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_read_locked.gif b/phpBB/styles/subsilver2/theme/images/announce_read_locked.gif
deleted file mode 100644
index a738616e06..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/announce_read_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_read_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/announce_read_locked_mine.gif
deleted file mode 100644
index f7ffe7f8dd..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/announce_read_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_read_mine.gif b/phpBB/styles/subsilver2/theme/images/announce_read_mine.gif
deleted file mode 100644
index 636d353867..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/announce_read_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_unread.gif b/phpBB/styles/subsilver2/theme/images/announce_unread.gif
deleted file mode 100644
index 56b2702b17..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/announce_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_unread_locked.gif b/phpBB/styles/subsilver2/theme/images/announce_unread_locked.gif
deleted file mode 100644
index 37033da653..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/announce_unread_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_unread_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/announce_unread_locked_mine.gif
deleted file mode 100644
index d91f2520ca..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/announce_unread_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_unread_mine.gif b/phpBB/styles/subsilver2/theme/images/announce_unread_mine.gif
deleted file mode 100644
index e1dd23a0bf..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/announce_unread_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/background.gif b/phpBB/styles/subsilver2/theme/images/background.gif
deleted file mode 100644
index 5c731e4fc2..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/background.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/cellpic.gif b/phpBB/styles/subsilver2/theme/images/cellpic.gif
deleted file mode 100644
index 47457ef5f7..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/cellpic.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/cellpic1.gif b/phpBB/styles/subsilver2/theme/images/cellpic1.gif
deleted file mode 100644
index 715b8d4aa8..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/cellpic1.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/cellpic2.jpg b/phpBB/styles/subsilver2/theme/images/cellpic2.jpg
deleted file mode 100644
index a0ca7e89d3..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/cellpic2.jpg and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/cellpic2_rtl.jpg b/phpBB/styles/subsilver2/theme/images/cellpic2_rtl.jpg
deleted file mode 100644
index 201e063725..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/cellpic2_rtl.jpg and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/cellpic3.gif b/phpBB/styles/subsilver2/theme/images/cellpic3.gif
deleted file mode 100644
index ecf70e1fd1..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/cellpic3.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/created_by.jpg b/phpBB/styles/subsilver2/theme/images/created_by.jpg
deleted file mode 100644
index f27472781e..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/created_by.jpg and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_link.gif b/phpBB/styles/subsilver2/theme/images/forum_link.gif
deleted file mode 100644
index d5e86d47d7..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/forum_link.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_read.gif b/phpBB/styles/subsilver2/theme/images/forum_read.gif
deleted file mode 100644
index 9b2bc47c67..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/forum_read.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_read_locked.gif b/phpBB/styles/subsilver2/theme/images/forum_read_locked.gif
deleted file mode 100644
index 436f3d21c8..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/forum_read_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_read_subforum.gif b/phpBB/styles/subsilver2/theme/images/forum_read_subforum.gif
deleted file mode 100644
index 9179303e7f..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/forum_read_subforum.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_unread.gif b/phpBB/styles/subsilver2/theme/images/forum_unread.gif
deleted file mode 100644
index 5eec565b38..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/forum_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_unread_locked.gif b/phpBB/styles/subsilver2/theme/images/forum_unread_locked.gif
deleted file mode 100644
index 58a79c376c..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/forum_unread_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_unread_subforum.gif b/phpBB/styles/subsilver2/theme/images/forum_unread_subforum.gif
deleted file mode 100644
index af3c93b1a1..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/forum_unread_subforum.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_faq.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_faq.gif
deleted file mode 100644
index fc50e7ca30..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_faq.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_groups.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_groups.gif
deleted file mode 100644
index a4d1c7bb70..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_groups.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_login.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_login.gif
deleted file mode 100644
index c7590a423f..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_login.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_members.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_members.gif
deleted file mode 100644
index d636089b38..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_members.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_message.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_message.gif
deleted file mode 100644
index b8aea1eafb..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_message.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_notification.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_notification.gif
deleted file mode 100644
index f165d3cb27..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_notification.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_profile.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_profile.gif
deleted file mode 100644
index 1ec7c649e9..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_profile.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_register.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_register.gif
deleted file mode 100644
index b49ac31ec9..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_register.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_search.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_search.gif
deleted file mode 100644
index 2bd1a648c0..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_search.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_post_target.gif b/phpBB/styles/subsilver2/theme/images/icon_post_target.gif
deleted file mode 100644
index d172abb060..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_post_target.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_post_target_unread.gif b/phpBB/styles/subsilver2/theme/images/icon_post_target_unread.gif
deleted file mode 100644
index 8ec44a1787..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_post_target_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_attach.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_attach.gif
deleted file mode 100644
index 1c9c89bc70..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_topic_attach.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_deleted.png b/phpBB/styles/subsilver2/theme/images/icon_topic_deleted.png
deleted file mode 100644
index 494b4fb563..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_topic_deleted.png and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_latest.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_latest.gif
deleted file mode 100644
index b45e57aedb..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_topic_latest.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_newest.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_newest.gif
deleted file mode 100644
index eca2861836..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_topic_newest.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_reported.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_reported.gif
deleted file mode 100644
index 026092854a..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_topic_reported.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_unapproved.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_unapproved.gif
deleted file mode 100644
index 2ccaf19c23..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/icon_topic_unapproved.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/index.htm b/phpBB/styles/subsilver2/theme/images/index.htm
deleted file mode 100644
index 29531416fe..0000000000
--- a/phpBB/styles/subsilver2/theme/images/index.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<title>subSilver created by subBlue Design</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<table width="100%" height="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr>
-		<td align="center" valign="middle"><a href="http://www.subblue.com/" target="_new"><img src="created_by.jpg" width="400" height="300" alt="Created by subBlue Design" /></a></td>
-	</tr>
-</table>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/phpBB/styles/subsilver2/theme/images/no_avatar.gif b/phpBB/styles/subsilver2/theme/images/no_avatar.gif
deleted file mode 100644
index ad73330e71..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/no_avatar.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/poll_center.gif b/phpBB/styles/subsilver2/theme/images/poll_center.gif
deleted file mode 100644
index 99473151ec..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/poll_center.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/poll_left.gif b/phpBB/styles/subsilver2/theme/images/poll_left.gif
deleted file mode 100644
index 269088b81d..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/poll_left.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/poll_right.gif b/phpBB/styles/subsilver2/theme/images/poll_right.gif
deleted file mode 100644
index f9584e23a1..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/poll_right.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/site_logo.gif b/phpBB/styles/subsilver2/theme/images/site_logo.gif
deleted file mode 100644
index abce3cd51d..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/site_logo.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/spacer.gif b/phpBB/styles/subsilver2/theme/images/spacer.gif
deleted file mode 100644
index 5bfd67a2d6..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/spacer.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_read.gif b/phpBB/styles/subsilver2/theme/images/sticky_read.gif
deleted file mode 100644
index 09861a996c..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/sticky_read.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_read_locked.gif b/phpBB/styles/subsilver2/theme/images/sticky_read_locked.gif
deleted file mode 100644
index 24bca303d6..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/sticky_read_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_read_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/sticky_read_locked_mine.gif
deleted file mode 100644
index 3fd04ec3a9..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/sticky_read_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_read_mine.gif b/phpBB/styles/subsilver2/theme/images/sticky_read_mine.gif
deleted file mode 100644
index 381634c364..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/sticky_read_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_unread.gif b/phpBB/styles/subsilver2/theme/images/sticky_unread.gif
deleted file mode 100644
index dd2e366543..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/sticky_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_unread_locked.gif b/phpBB/styles/subsilver2/theme/images/sticky_unread_locked.gif
deleted file mode 100644
index 608f4822e3..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/sticky_unread_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_unread_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/sticky_unread_locked_mine.gif
deleted file mode 100644
index fe5e115312..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/sticky_unread_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_unread_mine.gif b/phpBB/styles/subsilver2/theme/images/sticky_unread_mine.gif
deleted file mode 100644
index b5fc3b3627..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/sticky_unread_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_moved.gif b/phpBB/styles/subsilver2/theme/images/topic_moved.gif
deleted file mode 100644
index fe758f02ca..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_moved.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read.gif b/phpBB/styles/subsilver2/theme/images/topic_read.gif
deleted file mode 100644
index c16bfa75d5..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_read.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_hot.gif b/phpBB/styles/subsilver2/theme/images/topic_read_hot.gif
deleted file mode 100644
index a7a7e8fc78..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_read_hot.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_hot_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_read_hot_mine.gif
deleted file mode 100644
index 853452a74b..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_read_hot_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_locked.gif b/phpBB/styles/subsilver2/theme/images/topic_read_locked.gif
deleted file mode 100644
index 10eb776972..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_read_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_read_locked_mine.gif
deleted file mode 100644
index 3f24928b48..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_read_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_read_mine.gif
deleted file mode 100644
index 560927aa06..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_read_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread.gif b/phpBB/styles/subsilver2/theme/images/topic_unread.gif
deleted file mode 100644
index 4e56157dce..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_hot.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_hot.gif
deleted file mode 100644
index ceef4919d5..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_unread_hot.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_hot_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_hot_mine.gif
deleted file mode 100644
index 1c748f708a..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_unread_hot_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_locked.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_locked.gif
deleted file mode 100644
index 720e210289..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_unread_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_locked_mine.gif
deleted file mode 100644
index 90873431ef..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_unread_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_mine.gif
deleted file mode 100644
index 34fd2ec179..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/topic_unread_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/upload_bar.gif b/phpBB/styles/subsilver2/theme/images/upload_bar.gif
deleted file mode 100644
index 75cf61c59e..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/upload_bar.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/images/whosonline.gif b/phpBB/styles/subsilver2/theme/images/whosonline.gif
deleted file mode 100644
index b450927432..0000000000
Binary files a/phpBB/styles/subsilver2/theme/images/whosonline.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
deleted file mode 100644
index 3c7ff23db5..0000000000
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ /dev/null
@@ -1,1242 +0,0 @@
-/*  phpBB3 Style Sheet
-    --------------------------------------------------------------
-	Style name:			subsilver2
-	Based on style:		subSilver (the default phpBB 2.0.x style)
-	Original author:	Tom Beddard ( http://www.subblue.com/ )
-	Modified by:		phpBB Limited ( https://www.phpbb.com/ )
-    --------------------------------------------------------------
-*/
-
-/* Layout
- ------------ */
-* {
-	/* Reset browsers default margin, padding and font sizes */
-	margin: 0;
-	padding: 0;
-}
-
-html {
-	font-size: 100%;
-}
-
-body {
-	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	color: #323D4F;
-	background-color: #FFFFFF;
-	font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */
-	margin: 0;
-}
-
-#wrapheader {
-	height: auto !important;
-	padding: 0;
-}
-
-#wrapcentre {
-	margin: 15px 25px 0 25px;
-}
-
-#wrapfooter {
-	text-align: center;
-	clear: both;
-}
-
-#wrapnav {
-	width: 100%;
-	margin: 0;
-	background-color: #ECECEC;
-	border-width: 1px;
-	border-style: solid;
-	border-color: #A9B8C2;
-}
-
-#logodesc {
-	background-color: #C1CAD2;
-	background-image: url('./images/background.gif');
-	background-repeat: repeat-x;
-	background-position: center bottom;
-	padding: 0 25px 15px 25px;
-}
-
-#menubar {
-	margin: 0 25px;
-}
-
-#datebar {
-	margin: 10px 25px 0 25px;
-}
-
-#findbar {
-	width: 100%;
-	margin: 0;
-	padding: 0;
-	border: 0;
-}
-
-.forumrules {
-	background-color: #F9CC79;
-	border-width: 1px;
-	border-style: solid;
-	border-color: #BB9860;
-	padding: 4px;
-	font-weight: normal;
-	font-size: 1.1em;
-	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-}
-
-.forumrules h3 {
-	color: red;
-}
-
-#pageheader { }
-#pagecontent { }
-#pagefooter { }
-
-#poll { }
-#postrow { }
-#postdata { }
-
-
-/*  Text
- --------------------- */
-h1 {
-	color: black;
-	font-family: "Lucida Grande", "Trebuchet MS", Verdana, sans-serif;
-	font-weight: bold;
-	font-size: 1.8em;
-	text-decoration: none;
-}
-
-h2 {
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 1.5em;
-	text-decoration: none;
-	line-height: 120%;
-}
-
-h3 {
-	font-size: 1.3em;
-	font-weight: bold;
-	font-family: Arial, Helvetica, sans-serif;
-	line-height: 120%;
-}
-
-h4 {
-	margin: 0;
-	font-size: 1.1em;
-	font-weight: bold;
-}
-
-p {
-	font-size: 1.1em;
-}
-
-p.moderators {
-	margin: 0;
-	float: left;
-	color: black;
-	font-weight: bold;
-}
-
-.rtl p.moderators {
-	float: right;
-}
-
-p.linkmcp {
-	margin: 0;
-	float: right;
-	white-space: nowrap;
-}
-
-.rtl p.linkmcp {
-	float: left;
-}
-
-p.breadcrumbs {
-	margin: 0;
-	float: left;
-	color: black;
-	font-weight: bold;
-	white-space: normal;
-	font-size: 1em;
-}
-
-.rtl p.breadcrumbs {
-	float: right;
-}
-
-p.datetime {
-	margin: 0;
-	float: right;
-	white-space: nowrap;
-	font-size: 1em;
-}
-
-.rtl p.datetime {
-	float: left;
-}
-
-p.searchbar {
-	padding: 2px 0;
-	white-space: nowrap;
-}
-
-p.searchbarreg {
-	margin: 0;
-	float: right;
-	white-space: nowrap;
-}
-
-.rtl p.searchbarreg {
-	float: left;
-}
-
-p.forumdesc {
-	padding-bottom: 4px;
-}
-
-p.topicauthor {
-	margin: 1px 0;
-}
-
-p.topicdetails {
-	margin: 1px 0;
-}
-
-.postreported, .postreported a:link, .postreported a:visited, .postreported a:hover, .postreported a:active {
-	margin: 1px 0;
-	color: red;
-	font-weight:bold;
-}
-
-.postapprove, .postapprove a:link, .postapprove a:visited, .postapprove a:hover, .postapprove a:active {
-	color: green;
-	font-weight:bold;
-}
-
-.postapprove img, .postreported img {
-	vertical-align: bottom;
-	padding-top: 5px;
-}
-
-.postauthor {
-	color: #000000;
-}
-
-.postdetails {
-	color: #000000;
-}
-
-.postbody {
-	font-size: 1.3em;
-	line-height: 1.4em;
-	font-family: "Lucida Grande", "Trebuchet MS", Helvetica, Arial, sans-serif;
-}
-
-.postbody li, ol, ul {
-	margin: 0 0 0 1.5em;
-}
-
-.rtl .postbody li, .rtl ol, .rtl ul {
-	margin: 0 1.5em 0 0;
-}
-
-.posthilit {
-	background-color: yellow;
-}
-
-.nav {
-	margin: 0;
-	color: black;
-	font-weight: bold;
-}
-
-.pagination {
-	padding: 4px;
-	color: black;
-	font-size: 1em;
-	font-weight: bold;
-}
-
-.cattitle {
-
-}
-
-.gen {
-	margin: 1px 1px;
-	font-size: 1.2em;
-}
-
-.genmed {
-	margin: 1px 1px;
-	font-size: 1.1em;
-}
-
-.gensmall {
-	margin: 1px 1px;
-	font-size: 1em;
-}
-
-.copyright {
-	color: #444;
-	font-weight: normal;
-	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-}
-
-.titles {
-	font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 1.3em;
-	text-decoration: none;
-}
-
-.online {
-	color: green;
-}
-
-.offline, .error, .inactive {
-	color: red;
-}
-
-
-/* Tables
- ------------ */
-#color_palette_placeholder table {
-	border-collapse: separate;
-	border-spacing: 1px;
-}
-
-#color_palette_placeholder td {
-	padding: 0;
-}
-
-th {
-	color: #FFA34F;
-	font-size: 1.1em;
-	font-weight: bold;
-	background-color: #006699;
-	background-image: url('./images/cellpic3.gif');
-	white-space: nowrap;
-	padding: 7px 5px;
-}
-
-td {
-	padding: 2px;
-}
-td.profile {
-	padding: 4px;
-}
-
-.tablebg {
-	background-color: #A9B8C2;
-}
-
-.catdiv {
-	height: 28px;
-	margin: 0;
-	padding: 0;
-	border: 0;
-	background: white url('./images/cellpic2.jpg') repeat-y scroll top left;
-}
-.rtl .catdiv {
-	background: white url('./images/cellpic2_rtl.jpg') repeat-y scroll top right;
-}
-
-.cat {
-	height: 28px;
-	margin: 0;
-	padding: 0;
-	border: 0;
-	background-color: #C7D0D7;
-	background-image: url('./images/cellpic1.gif');
-	text-indent: 4px;
-}
-
-.row1 {
-	background-color: #ECECEC;
-	padding: 4px;
-}
-
-.row2 {
-	background-color: #DCE1E5;
-	padding: 4px;
-}
-
-.row3 {
-	background-color: #C0C8D0;
-	padding: 4px;
-}
-
-.spacer {
-	background-color: #D1D7DC;
-}
-
-.current {
-	background-color: lightblue;
-}
-
-hr {
-	height: 1px;
-	border-width: 0;
-	background-color: #D1D7DC;
-	color: #D1D7DC;
-}
-
-.legend {
-	text-align:center;
-	margin: 0 auto;
-}
-
-/* Links
- ------------ */
-
-/* Links adjustment to correctly display an order of rtl/ltr mixed content */
-.rtl a {
-	direction: rtl;
-	unicode-bidi: embed;
-}
-
-/* CSS spec requires a:link, a:visited, a:hover and a:active rules to be specified in this order. */
-/* See http://www.phpbb.com/bugs/phpbb3/59685 */
-a:link {
-	color: #006597;
-	text-decoration: none;
-}
-
-a:visited {
-	color: #005784;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #D46400;
-	text-decoration: underline;
-}
-
-a:active {
-	color: #005784;
-	text-decoration: none;
-}
-
-a.forumlink {
-	color: #069;
-	font-weight: bold;
-	font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
-	font-size: 1.2em;
-}
-
-a.topictitle {
-	margin: 1px 0;
-	font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 1.2em;
-}
-
-a.topictitle:visited {
-	color: #5493B4;
-	text-decoration: none;
-}
-
-a.lastsubject {
-	font-weight: bold;
-	text-decoration: none;
-}
-
-a.lastsubject:hover {
-	text-decoration: underline;
-}
-
-th a,
-th a:visited {
-	color: #FFA34F !important;
-	text-decoration: none;
-}
-
-th a:hover {
-	text-decoration: underline;
-}
-
-a.anchor {
-	display: block;
-}
-
-
-/* Form Elements
- ------------ */
-form {
-	margin: 0;
-	padding: 0;
-	border: 0;
-}
-
-input {
-	color: #333333;
-	font-family: "Lucida Grande", Verdana, Helvetica, sans-serif;
-	font-size: 1.1em;
-	font-weight: normal;
-	padding: 1px;
-	border: 1px solid #A9B8C2;
-	background-color: #FAFAFA;
-}
-
-textarea {
-	background-color: #FAFAFA;
-	color: #333333;
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1.3em;
-	line-height: 1.4em;
-	font-weight: normal;
-	border: 1px solid #A9B8C2;
-	padding: 2px;
-}
-
-select {
-	color: #333333;
-	background-color: #FAFAFA;
-	font-family: "Lucida Grande", Verdana, Helvetica, sans-serif;
-	font-size: 1.1em;
-	font-weight: normal;
-	border: 1px solid #A9B8C2;
-	padding: 1px;
-}
-
-option {
-	padding: 0 1em 0 0;
-}
-
-option.disabled-option {
-	color: graytext;
-}
-
-.rtl option {
-	padding: 0 0 0 1em;
-}
-
-input.radio {
-	border: none;
-	background-color: transparent;
-}
-
-.post {
-	background-color: white;
-	border-style: solid;
-	border-width: 1px;
-}
-
-.btnbbcode {
-	color: #000000;
-	font-weight: normal;
-	font-size: 1.1em;
-	font-family: "Lucida Grande", Verdana, Helvetica, sans-serif;
-	background-color: #EFEFEF;
-	border: 1px solid #666666;
-}
-
-.btnmain {
-	font-weight: bold;
-	background-color: #ECECEC;
-	border: 1px solid #A9B8C2;
-	cursor: pointer;
-	padding: 1px 5px;
-	font-size: 1.1em;
-}
-
-.btnlite {
-	font-weight: normal;
-	background-color: #ECECEC;
-	border: 1px solid #A9B8C2;
-	cursor: pointer;
-	padding: 1px 5px;
-	font-size: 1.1em;
-}
-
-.btnfile {
-	font-weight: normal;
-	background-color: #ECECEC;
-	border: 1px solid #A9B8C2;
-	padding: 1px 5px;
-	font-size: 1.1em;
-}
-
-.helpline {
-	background-color: #DEE3E7;
-	border-style: none;
-}
-
-input:focus, select:focus, textarea:focus {
-	outline-style: none;
-}
-
-/* BBCode
- ------------ */
-.quotetitle, .attachtitle {
-	margin: 10px 5px 0 5px;
-	padding: 4px;
-	border-width: 1px 1px 0 1px;
-	border-style: solid;
-	border-color: #A9B8C2;
-	color: #333333;
-	background-color: #A9B8C2;
-	font-size: 0.85em;
-	font-weight: bold;
-}
-
-.quotetitle .quotetitle {
-	font-size: 1em;
-}
-
-.quotecontent, .attachcontent {
-	margin: 0 5px 10px 5px;
-	padding: 5px;
-	border-color: #A9B8C2;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	font-weight: normal;
-	font-size: 1em;
-	line-height: 1.4em;
-	font-family: "Lucida Grande", "Trebuchet MS", Helvetica, Arial, sans-serif;
-	background-color: #FAFAFA;
-	color: #4B5C77;
-}
-
-.attachcontent {
-	font-size: 0.85em;
-}
-
-.codetitle {
-	margin: 10px 5px 0 5px;
-	padding: 2px 4px;
-	border-width: 1px 1px 0 1px;
-	border-style: solid;
-	border-color: #A9B8C2;
-	color: #333333;
-	background-color: #A9B8C2;
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 0.8em;
-}
-
-.codecontent {
-	direction: ltr;
-	margin: 0 5px 10px 5px;
-	padding: 5px;
-	border-color: #A9B8C2;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	font-weight: normal;
-	color: #006600;
-	font-size: 0.85em;
-	font-family: Monaco, 'Courier New', monospace;
-	background-color: #FAFAFA;
-}
-
-.postimage {
-	max-width: 100%;
-}
-
-.syntaxbg {
-	color: #FFFFFF;
-}
-
-.syntaxcomment {
-	color: #FF8000;
-}
-
-.syntaxdefault {
-	color: #0000BB;
-}
-
-.syntaxhtml {
-	color: #000000;
-}
-
-.syntaxkeyword {
-	color: #007700;
-}
-
-.syntaxstring {
-	color: #DD0000;
-}
-
-
-/* Private messages
- ------------------ */
-.pm_marked_colour {
-	background-color: #000000;
-}
-
-.pm_replied_colour {
-	background-color: #A9B8C2;
-}
-
-.pm_friend_colour {
-	background-color: #007700;
-}
-
-.pm_foe_colour {
-	background-color: #DD0000;
-}
-
-
-/* Misc
- ------------ */
-img {
-	border: none;
-}
-
-.sep {
-	color: black;
-	background-color: #FFA34F;
-}
-
-table.colortable td {
-	padding: 0;
-}
-
-pre {
-	font-size: 1.1em;
-	font-family: Monaco, 'Courier New', monospace;
-}
-
-.nowrap {
-	white-space: nowrap;
-}
-
-.username-coloured {
-	font-weight: bold;
-}
-
-
-/* Former imageset */
-span.imageset {
-	display: inline-block;
-	background: transparent none 0 0 no-repeat;
-	margin: 0;
-	padding: 0;
-	width: 0;
-	height: 0;
-	overflow: hidden;
-}
-a.imageset {
-	text-decoration: none !important;
-}
-
-/* Global imageset items */
-.imageset.site_logo {
-	background-image: url("./images/site_logo.gif");
-	padding-left: 170px;
-	padding-top: 94px;
-}
-.imageset.upload_bar {
-	background-image: url("./images/upload_bar.gif");
-	padding-left: 280px;
-	padding-top: 16px;
-}
-.imageset.poll_left {
-	background-image: url("./images/poll_left.gif");
-	padding-left: 4px;
-	padding-top: 12px;
-}
-.imageset.poll_center {
-	background-image: url("./images/poll_center.gif");
-	padding-left: 1px;
-	padding-top: 12px;
-}
-.imageset.poll_right {
-	background-image: url("./images/poll_right.gif");
-	padding-left: 4px;
-	padding-top: 12px;
-}
-.imageset.forum_link {
-	background-image: url("./images/forum_link.gif");
-	padding-left: 46px;
-	padding-top: 25px;
-}
-.imageset.forum_read {
-	background-image: url("./images/forum_read.gif");
-	padding-left: 46px;
-	padding-top: 25px;
-}
-.imageset.forum_read_locked {
-	background-image: url("./images/forum_read_locked.gif");
-	padding-left: 46px;
-	padding-top: 25px;
-}
-.imageset.forum_read_subforum {
-	background-image: url("./images/forum_read_subforum.gif");
-	padding-left: 46px;
-	padding-top: 25px;
-}
-.imageset.forum_unread {
-	background-image: url("./images/forum_unread.gif");
-	padding-left: 46px;
-	padding-top: 25px;
-}
-.imageset.forum_unread_locked {
-	background-image: url("./images/forum_unread_locked.gif");
-	padding-left: 46px;
-	padding-top: 25px;
-}
-.imageset.forum_unread_subforum {
-	background-image: url("./images/forum_unread_subforum.gif");
-	padding-left: 46px;
-	padding-top: 25px;
-}
-.imageset.topic_moved {
-	background-image: url("./images/topic_moved.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_read {
-	background-image: url("./images/topic_read.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_read_mine {
-	background-image: url("./images/topic_read_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_read_hot {
-	background-image: url("./images/topic_read_hot.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_read_hot_mine {
-	background-image: url("./images/topic_read_hot_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_read_locked {
-	background-image: url("./images/topic_read_locked.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_read_locked_mine {
-	background-image: url("./images/topic_read_locked_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_unread {
-	background-image: url("./images/topic_unread.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_unread_mine {
-	background-image: url("./images/topic_unread_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_unread_hot {
-	background-image: url("./images/topic_unread_hot.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_unread_hot_mine {
-	background-image: url("./images/topic_unread_hot_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_unread_locked {
-	background-image: url("./images/topic_unread_locked.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.topic_unread_locked_mine {
-	background-image: url("./images/topic_unread_locked_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.sticky_read {
-	background-image: url("./images/sticky_read.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.sticky_read_mine {
-	background-image: url("./images/sticky_read_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.sticky_read_locked {
-	background-image: url("./images/sticky_read_locked.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.sticky_read_locked_mine {
-	background-image: url("./images/sticky_read_locked_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.sticky_unread {
-	background-image: url("./images/sticky_unread.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.sticky_unread_mine {
-	background-image: url("./images/sticky_unread_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.sticky_unread_locked {
-	background-image: url("./images/sticky_unread_locked.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.sticky_unread_locked_mine {
-	background-image: url("./images/sticky_unread_locked_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.announce_read {
-	background-image: url("./images/announce_read.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.announce_read_mine {
-	background-image: url("./images/announce_read_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.announce_read_locked {
-	background-image: url("./images/announce_read_locked.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.announce_read_locked_mine {
-	background-image: url("./images/announce_read_locked_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.announce_unread {
-	background-image: url("./images/announce_unread.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.announce_unread_mine {
-	background-image: url("./images/announce_unread_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.announce_unread_locked {
-	background-image: url("./images/announce_unread_locked.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.announce_unread_locked_mine {
-	background-image: url("./images/announce_unread_locked_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.global_read {
-	background-image: url("./images/announce_read.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.global_read_mine {
-	background-image: url("./images/announce_read_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.global_read_locked {
-	background-image: url("./images/announce_read_locked.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.global_read_locked_mine {
-	background-image: url("./images/announce_read_locked_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.global_unread {
-	background-image: url("./images/announce_unread.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.global_unread_mine {
-	background-image: url("./images/announce_unread_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.global_unread_locked {
-	background-image: url("./images/announce_unread_locked.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.global_unread_locked_mine {
-	background-image: url("./images/announce_unread_locked_mine.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.pm_read {
-	background-image: url("./images/topic_read.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.pm_unread {
-	background-image: url("./images/topic_unread.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.icon_post_target {
-	background-image: url("./images/icon_post_target.gif");
-	padding-left: 12px;
-	padding-top: 9px;
-}
-.imageset.icon_post_target_unread {
-	background-image: url("./images/icon_post_target_unread.gif");
-	padding-left: 12px;
-	padding-top: 9px;
-}
-.imageset.icon_topic_attach {
-	background-image: url("./images/icon_topic_attach.gif");
-	padding-left: 14px;
-	padding-top: 18px;
-}
-.imageset.icon_topic_latest {
-	background-image: url("./images/icon_topic_latest.gif");
-	padding-left: 18px;
-	padding-top: 9px;
-}
-.imageset.icon_topic_newest {
-	background-image: url("./images/icon_topic_newest.gif");
-	padding-left: 18px;
-	padding-top: 9px;
-}
-.imageset.icon_topic_reported {
-	background-image: url("./images/icon_topic_reported.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.icon_topic_unapproved {
-	background-image: url("./images/icon_topic_unapproved.gif");
-	padding-left: 19px;
-	padding-top: 18px;
-}
-.imageset.icon_topic_deleted {
-	background-image: url("./images/icon_topic_deleted.png");
-	padding-left: 14px;
-	padding-top: 14px;
-}
-
-
-/* English images for fallback */
-.imageset.phpbb_aol-icon, .imageset.icon_contact_aim {
-	background-image: url("./en/icon_contact_aim.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_contact_email {
-	background-image: url("./en/icon_contact_email.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.phpbb_icq-icon, .imageset.icon_contact_icq {
-	background-image: url("./en/icon_contact_icq.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_contact_jabber {
-	background-image: url("./en/icon_contact_jabber.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.phpbb_wlm-icon, .imageset.icon_contact_msnm {
-	background-image: url("./en/icon_contact_msnm.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_contact_pm {
-	background-image: url("./en/icon_contact_pm.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.phpbb_yahoo-icon, .imageset.icon_contact_yahoo {
-	background-image: url("./en/icon_contact_yahoo.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.phpbb_website-icon, .imageset.icon_contact_www {
-	background-image: url("./en/icon_contact_www.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_post_delete {
-	background-image: url("./en/icon_post_delete.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
-.imageset.icon_post_edit {
-	background-image: url("./en/icon_post_edit.gif");
-	padding-left: 90px;
-	padding-top: 20px;
-}
-.imageset.icon_post_info {
-	background-image: url("./en/icon_post_info.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
-.imageset.icon_post_quote {
-	background-image: url("./en/icon_post_quote.gif");
-	padding-left: 90px;
-	padding-top: 20px;
-}
-.imageset.icon_post_report {
-	background-image: url("./en/icon_post_report.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
-.imageset.icon_user_online {
-	background-image: url("./en/icon_user_online.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_user_offline {
-	background-image: url("./en/icon_user_offline.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_user_profile {
-	background-image: url("./en/icon_user_profile.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_user_search {
-	background-image: url("./en/icon_user_search.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
-.imageset.icon_user_warn {
-	background-image: url("./en/icon_user_warn.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
-.imageset.button_pm_new {
-	background-image: url("./en/button_pm_new.gif");
-	padding-left: 97px;
-	padding-top: 27px;
-}
-.imageset.button_pm_reply {
-	background-image: url("./en/button_pm_reply.gif");
-	padding-left: 90px;
-	padding-top: 20px;
-}
-.imageset.button_topic_locked {
-	background-image: url("./en/button_topic_locked.gif");
-	padding-left: 97px;
-	padding-top: 27px;
-}
-.imageset.button_topic_new {
-	background-image: url("./en/button_topic_new.gif");
-	padding-left: 97px;
-	padding-top: 27px;
-}
-.imageset.button_topic_reply {
-	background-image: url("./en/button_topic_reply.gif");
-	padding-left: 97px;
-	padding-top: 27px;
-}
-
-/* RTL imageset entries */
-.rtl .imageset.site_logo {
-	padding-right: 170px;
-	padding-left: 0;
-}
-.rtl .imageset.upload_bar {
-	padding-right: 280px;
-	padding-left: 0;
-}
-.rtl .imageset.poll_left, .rtl .imageset.poll_right {
-	padding-right: 4px;
-	padding-left: 0;
-}
-.rtl .imageset.poll_center {
-	padding-right: 1px;
-	padding-left: 0;
-}
-.rtl .imageset.forum_link, .rtl .imageset.forum_read, .rtl .imageset.forum_read_locked, .rtl .imageset.forum_read_subforum, .rtl .imageset.forum_unread, .rtl .imageset.forum_unread_locked, .rtl .imageset.forum_unread_subforum {
-	padding-right: 46px;
-	padding-left: 0;
-}
-.rtl .imageset.topic_moved, .rtl .imageset.topic_read, .rtl .imageset.topic_read_mine, .rtl .imageset.topic_read_hot, .rtl .imageset.topic_read_hot_mine, .rtl .imageset.topic_read_locked, .rtl .imageset.topic_read_locked_mine, .rtl .imageset.topic_unread, .rtl .imageset.topic_unread_mine, .rtl .imageset.topic_unread_hot, .rtl .imageset.topic_unread_hot_mine, .rtl .imageset.topic_unread_locked, .rtl .imageset.topic_unread_locked_mine, .rtl .imageset.sticky_read, .rtl .imageset.sticky_read_mine, .rtl .imageset.sticky_read_locked, .rtl .imageset.sticky_read_locked_mine, .rtl .imageset.sticky_unread, .rtl .imageset.sticky_unread_mine, .rtl .imageset.sticky_unread_locked, .rtl .imageset.sticky_unread_locked_mine, .rtl .imageset.announce_read, .rtl .imageset.announce_read_mine, .rtl .imageset.announce_read_locked, .rtl .imageset.announce_read_locked_mine, .rtl .imageset.announce_unread, .rtl .imageset.announce_unread_mine, .rtl .imageset.announce_unread_locked, .rtl .imageset.announce_unread_locked_mine, .rtl .imageset.global_read, .rtl .imageset.global_read_mine, .rtl .imageset.global_read_locked, .rtl .imageset.global_read_locked_mine, .rtl .imageset.global_unread, .rtl .imageset.global_unread_mine, .rtl .imageset.global_unread_locked, .rtl .imageset.global_unread_locked_mine, .rtl .imageset.pm_read, .rtl .imageset.pm_unread, .rtl .imageset.icon_topic_reported, .rtl .imageset.icon_topic_unapproved {
-	padding-right: 19px;
-	padding-left: 0;
-}
-.rtl .imageset.icon_post_target, .rtl .imageset.icon_post_target_unread {
-	padding-right: 12px;
-	padding-left: 0;
-}
-.rtl .imageset.icon_topic_attach {
-	padding-right: 14px;
-	padding-left: 0;
-}
-.rtl .imageset.icon_topic_latest, .rtl .imageset.icon_topic_newest {
-	padding-right: 18px;
-	padding-left: 0;
-}
-
-#notification_list {
-	display: none;
-	position: absolute;
-	width: 310px;
-	z-index: 1;
-	box-shadow: 3px 3px 5px darkgray;
-}
-
-#notification_list .notification_scroll {
-	max-height: 350px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-#notification_list table {
-	width: 100%;
-}
-
-#notification_list .notification_title {
-	padding: 3px;
-}
-
-#notification_list .notification_title:after {
-	clear: both;
-	content: '';
-	display: block;
-}
-
-#notification_list .header {
-	padding: 5px;
-	font-weight: bold;
-	border: 1px solid #A9B8C2;
-	border-bottom: 0;
-}
-
-#notification_list > .header > .header_settings {
-	float: right;
-	font-weight: normal;
-	text-transform: none;
-}
-
-#notification_list .footer {
-	text-align: center;
-	font-size: 1.2em;
-	border: 1px solid #A9B8C2;
-	border-top: 0;
-}
-
-.notification_list img {
-	max-width: 50px;
-	max-height: 50px;
-}
-
-#notification_list .footer > a {
-	display: block;
-}
-
-#notification_list .notification-time {
-	font-size: 0.9em;
-	float: right;
-}
-
-.notification_list .notifications_time {
-	font-size: 0.8em;
-}