diff --git a/phpBB/templates/subSilver/bbcode.html b/phpBB/templates/subSilver/bbcode.html
index 99bf22404d..3fc002f073 100644
--- a/phpBB/templates/subSilver/bbcode.html
+++ b/phpBB/templates/subSilver/bbcode.html
@@ -5,37 +5,34 @@
 <!-- BEGIN olist_close --></ol><!-- END olist_close -->
 
 <!-- BEGIN listitem --><li><!-- END listitem -->
+<!-- BEGIN listitem_close --></li><!-- END listitem_close -->
 
-<!-- BEGIN quote_username_open --></span>
-<table width="90%" cellspacing="1" cellpadding="3" border="0" align="center">
-<tr> 
-	  <td><span class="genmed"><b>{USERNAME} {L_WROTE}:</b></span></td>
+<!-- BEGIN quote_username_open --><table width="90%" cellspacing="1" cellpadding="3" border="0" align="center">
+	<tr>
+		<td><b class="genmed">{USERNAME} {L_WROTE}:</b></td>
 	</tr>
 	<tr>
-	  <td class="quote"><!-- END quote_username_open -->
-<!-- BEGIN quote_open --></span>
-<table width="90%" cellspacing="1" cellpadding="3" border="0" align="center">
-<tr> 
-	  <td><span class="genmed"><b>{L_QUOTE}:</b></span></td>
+		<td class="quote"><!-- END quote_username_open -->
+<!-- BEGIN quote_open --><table width="90%" cellspacing="1" cellpadding="3" border="0" align="center">
+	<tr> 
+		<td><b class="genmed">{L_QUOTE}:</b></td>
 	</tr>
 	<tr>
-	  <td class="quote"><!-- END quote_open -->
+		<td class="quote"><!-- END quote_open -->
 <!-- BEGIN quote_close --></td>
 	</tr>
-</table>
-<span class="postbody"><!-- END quote_close -->
+</table><!-- END quote_close -->
 
-<!-- BEGIN code_open --></span>
+<!-- BEGIN code_open -->
 <table width="90%" cellspacing="1" cellpadding="3" border="0" align="center">
-<tr> 
-	  <td><span class="genmed"><b>{L_CODE}:</b></span></td>
+	<tr> 
+		<td><b class="genmed">{L_CODE}:</b></td>
 	</tr>
 	<tr>
-	  <td class="code"><!-- END code_open -->
+		<td class="code"><!-- END code_open -->
 <!-- BEGIN code_close --></td>
 	</tr>
-</table>
-<span class="postbody"><!-- END code_close -->
+</table><!-- END code_close -->
 
 
 <!-- BEGIN b_open --><span style="font-weight: bold"><!-- END b_open -->
@@ -47,16 +44,14 @@
 <!-- BEGIN i_open --><span style="font-style: italic"><!-- END i_open -->
 <!-- BEGIN i_close --></span><!-- END i_close -->
 
-<!-- BEGIN color_open --><span style="color: {COLOR}"><!-- END color_open -->
-<!-- BEGIN color_close --></span><!-- END color_close -->
+<!-- BEGIN color --><span style="color: {COLOR}">{TEXT}</span><!-- END color -->
 
-<!-- BEGIN size_open --><span style="font-size: {SIZE}px; line-height: normal"><!-- END size_open -->
-<!-- BEGIN size_close --></span><!-- END size_close -->
+<!-- BEGIN size --><span style="font-size: {SIZE}px; line-height: normal">{TEXT}</span><!-- END size -->
 
 <!-- BEGIN img --><img src="{URL}" border="0" /><!-- END img -->
 
 <!-- BEGIN url --><a href="{URL}" target="_blank" class="postlink">{DESCRIPTION}</a><!-- END url -->
 
-<!-- BEGIN email --><a href="mailto:{EMAIL}">{EMAIL}</a><!-- END email -->
+<!-- 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"><param name="movie" value="{URL}"><param name="play" value="1"><param name="loop" value="1"><param name="quality" value="high"><embed src="{URL}" play="1" loop="1" quality="high"></embed></object><!-- END flash -->
\ No newline at end of file